diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-05-09 21:10:11 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-05-09 21:10:11 +0200 |
commit | 2860088f0ea1cd5753756861c71cc7c118094f32 (patch) | |
tree | 6c6463253b830390c07932a28058b18a5da21acd /src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java | |
parent | be448291caf329896de4bff55da416001c173bb9 (diff) | |
parent | 10e607ac51dcc42fa1b54bacb698beed43750de7 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java index 281eb91f..3433a63b 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java @@ -33,6 +33,8 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import de.thedevstack.conversationsplus.utils.MessageUtil; + import eu.siacs.conversations.Config; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Contact; @@ -946,7 +948,7 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo public void run() { XmppAxolotlMessage axolotlMessage = encrypt(message); if (axolotlMessage == null) { - mXmppConnectionService.markMessage(message, Message.STATUS_SEND_FAILED); + MessageUtil.markMessage(message, Message.STATUS_SEND_FAILED); //mXmppConnectionService.updateConversationUi(); } else { Log.d(Config.LOGTAG, AxolotlServiceImpl.getLogprefix(account) + "Generated message, caching: " + message.getUuid()); |