Merge e200f2d into 7baf276

igniterealtime · Apr 15, 2018 · 43b6b32 · 43b6b32
2 parents 7baf276 + e200f2d
commit 43b6b32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...l/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java b/...l/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java
@@ -42,6 +42,8 @@ public enum ExplicitMessageEncryptionProtocol {
 
         otrV0("urn:xmpp:otr:0", "Off-the-Record Messaging (XEP-0364)"),
 
+        omemoVAxolotl("eu.siacs.conversations.axolotl", "OMEMO Multi End Message and Object Encryption (XEP-0384)"),
+
         legacyOpenPGP("jabber:x:encrypted", "Legacy OpenPGP for XMPP [DANGEROUS, DO NOT USE!]"),
         ;
 

diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
@@ -17,7 +17,6 @@
 package org.jivesoftware.smackx.omemo;
 
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.BODY_OMEMO_HINT;
-import static org.jivesoftware.smackx.omemo.util.OmemoConstants.OMEMO;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.OMEMO_NAMESPACE_V_AXOLOTL;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.PEP_NODE_DEVICE_LIST_NOTIFY;
 
@@ -42,7 +41,6 @@
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.util.Async;
-
 import org.jivesoftware.smackx.carbons.CarbonManager;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
@@ -474,7 +472,8 @@ Message finishMessage(OmemoVAxolotlElement encrypted) {
         }
 
         if (OmemoConfiguration.getAddEmeEncryptionHint()) {
-            chatMessage.addExtension(new ExplicitMessageEncryptionElement(OMEMO_NAMESPACE_V_AXOLOTL, OMEMO));
+            chatMessage.addExtension(new ExplicitMessageEncryptionElement(
+                    ExplicitMessageEncryptionElement.ExplicitMessageEncryptionProtocol.omemoVAxolotl));
         }
 
         return chatMessage;