2 files changed, 39 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlMessageParser.java b/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlMessageParser.java
new file mode 100644
index 00000000..d77db0d4
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlMessageParser.java
@@ -0,0 +1,37 @@
+package de.thedevstack.conversationsplus.crypto.axolotl;
+
+import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.entities.Conversation;
+import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+
+/**
+ */
+public class AxolotlMessageParser {
+    public static Message parseAxolotlChat(Element axolotlMessage, Jid counterpart, Jid from, Conversation conversation) {
+        Jid origin;
+        if (conversation.getMode() == Conversation.MODE_MULTI) {
+            origin = conversation.getMucOptions().getTrueCounterpart(counterpart.getResourcepart());
+            if (origin == null) {
+                Logging.d(Config.LOGTAG,"axolotl message in non anonymous conference received");
+                return null;
+            }
+        } else {
+            origin = from;
+        }
+
+        Message finishedMessage = null;
+        AxolotlService service = conversation.getAccount().getAxolotlService();
+        XmppAxolotlMessage xmppAxolotlMessage = XmppAxolotlMessage.fromElement(axolotlMessage, from.toBareJid());
+        XmppAxolotlMessage.XmppAxolotlPlaintextMessage plaintextMessage = service.processReceivingPayloadMessage(xmppAxolotlMessage);
+        if(plaintextMessage != null) {
+            finishedMessage = new Message(conversation, plaintextMessage.getPlaintext(), Message.ENCRYPTION_AXOLOTL);
+            finishedMessage.setFingerprint(plaintextMessage.getFingerprint());
+            Logging.d(Config.LOGTAG, AxolotlServiceImpl.getLogprefix(finishedMessage.getConversation().getAccount())+" Received Message with session fingerprint: "+plaintextMessage.getFingerprint());
+        }
+
+        return finishedMessage;
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java b/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java
index 9cf540a3..3569a7a5 100644
--- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java
+++ b/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java
@@ -39,6 +39,7 @@ import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Contact;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.enums.MessageStatus;
 import de.thedevstack.conversationsplus.parser.IqParser;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
@@ -944,7 +945,7 @@ public class AxolotlServiceImpl implements OnAdvancedStreamFeaturesLoaded, Axolo
 			public void run() {
 				XmppAxolotlMessage axolotlMessage = encrypt(message);
 				if (axolotlMessage == null) {
-					MessageUtil.markMessage(message, Message.STATUS_SEND_FAILED);
+					MessageUtil.setAndSaveMessageStatus(message, MessageStatus.FAILED);
 					//mXmppConnectionService.updateConversationUi();
 				} else {
 					Log.d(Config.LOGTAG, AxolotlServiceImpl.getLogprefix(account) + "Generated message, caching: " + message.getUuid());