aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-03 13:31:14 +0200
committerAndreas Straub <andy@strb.org>2015-07-19 21:32:27 +0200
commit69600502d217334031732cef2e80ebd4461e522d (patch)
treece6804ae4980afb5619865ca5f56a30a4f7d7475 /src/main/java/eu/siacs/conversations/services
parentec6870307e0ecee8184ddfef73444290e9d15828 (diff)
Fix asynchronous axolotl message sending
XmppConnectionService.sendMessage() now dispatches messages to the AxolotlService, where they only are prepared for sending and cached. AxolotlService now triggers a XmppConnectionService.resendMessage(), which then handles sending the cached message packet. This transparently fixes, e.g., handling of messages sent while we are offline.
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 8b7161210..3e443d75f 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -52,7 +52,6 @@ import de.duenndns.ssl.MemorizingTrustManager;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.crypto.PgpEngine;
-import eu.siacs.conversations.crypto.axolotl.NoSessionsCreatedException;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Blockable;
import eu.siacs.conversations.entities.Bookmark;
@@ -760,7 +759,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
break;
case Message.ENCRYPTION_AXOLOTL:
message.setStatus(Message.STATUS_WAITING);
- account.getAxolotlService().sendMessage(message);
+ packet = account.getAxolotlService().fetchPacketFromCache(message);
+ if (packet == null && account.isOnlineAndConnected()) {
+ account.getAxolotlService().prepareMessage(message);
+ }
break;
}