From 57e19d1a4f0ab00fb158da33c4d4514540a7aba1 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Wed, 19 Jul 2017 13:59:11 +0200
Subject: [PATCH] Use Async.go() in OmemoCarbonCopyListener

to prevent a timeout exception since carbon copy listeners are
executed synchronously.
---
 .../smackx/omemo/OmemoService.java            | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index d3b6957c1..9138ca15f 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -50,6 +50,8 @@ import org.jivesoftware.smack.filter.StanzaFilter;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.XMPPError;
+import org.jivesoftware.smack.util.Async;
+
 import org.jivesoftware.smackx.carbons.CarbonCopyReceivedListener;
 import org.jivesoftware.smackx.carbons.CarbonManager;
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
@@ -1308,7 +1310,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         @Override
         public void onCarbonCopyReceived(CarbonExtension.Direction direction, Message carbonCopy, Message wrappingMessage) {
             if (filter.accept(carbonCopy)) {
-                OmemoDevice senderDevice = getSender(omemoManager, carbonCopy);
+                final OmemoDevice senderDevice = getSender(omemoManager, carbonCopy);
                 Message decrypted;
                 MultiUserChatManager mucm = MultiUserChatManager.getInstanceFor(omemoManager.getConnection());
                 OmemoElement omemoMessage = carbonCopy.getExtension(OmemoElement.ENCRYPTED, OMEMO_NAMESPACE_V_AXOLOTL);
@@ -1364,16 +1366,22 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                     LOGGER.log(Level.WARNING, "internal omemoMessageListener failed to decrypt incoming OMEMO carbon copy: "
                             + e.getMessage());
 
-                } catch (NoRawSessionException e) {
-                    try {
-                        LOGGER.log(Level.INFO, "Received OMEMO carbon copy message with invalid session from " +
-                                senderDevice + ". Send RatchetUpdateMessage.");
-                        service.sendOmemoRatchetUpdateMessage(omemoManager, senderDevice, true);
+                } catch (final NoRawSessionException e) {
+                    Async.go(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                LOGGER.log(Level.INFO, "Received OMEMO carbon copy message with invalid session from " +
+                                        senderDevice + ". Send RatchetUpdateMessage.");
+                                service.sendOmemoRatchetUpdateMessage(omemoManager, senderDevice, true);
+
+                            } catch (UndecidedOmemoIdentityException | CorruptedOmemoKeyException | CannotEstablishOmemoSessionException | CryptoFailedException e1) {
+                                LOGGER.log(Level.WARNING, "internal omemoMessageListener failed to establish a session for incoming OMEMO carbon message: "
+                                        + e.getMessage());
+                            }
+                        }
+                    });
 
-                    } catch (UndecidedOmemoIdentityException | CorruptedOmemoKeyException | CannotEstablishOmemoSessionException | CryptoFailedException e1) {
-                        LOGGER.log(Level.WARNING, "internal omemoMessageListener failed to establish a session for incoming OMEMO carbon message: "
-                                + e.getMessage());
-                    }
                 }
             }
         }