From 972326682035e03a6646cde4a02dc53aa731fe5a Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 1 Apr 2018 13:42:28 +0200
Subject: don't send messages in callback

---
 .../java/de/pixart/messenger/services/XmppConnectionService.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 5353e003c..19266764a 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -474,9 +474,7 @@ public class XmppConnectionService extends Service {
         return this.mAvatarService;
     }
 
-    public void attachLocationToConversation(final Conversation conversation,
-                                             final Uri uri,
-                                             final UiCallback<Message> callback) {
+    public void attachLocationToConversation(final Conversation conversation, final Uri uri, final UiCallback<Message> callback) {
         int encryption = conversation.getNextEncryption();
         if (encryption == Message.ENCRYPTION_PGP) {
             encryption = Message.ENCRYPTION_DECRYPTED;
@@ -488,6 +486,7 @@ public class XmppConnectionService extends Service {
         if (encryption == Message.ENCRYPTION_DECRYPTED) {
             getPgpEngine().encrypt(message, callback);
         } else {
+            sendMessage(message);
             callback.success(message);
         }
     }
@@ -553,6 +552,7 @@ public class XmppConnectionService extends Service {
                             callback.error(R.string.unable_to_connect_to_keychain, null);
                         }
                     } else {
+                        sendMessage(message);
                         callback.success(message);
                     }
                 } catch (final FileBackend.FileCopyException e) {
-- 
cgit v1.2.3