From 51e27d7122c871c253b7a183da8ac8720f0f2ea7 Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Mon, 27 Nov 2017 20:48:55 +0300
Subject: jabber: omemo: "updated"(rollback) to latest version of
 https://xmpp.org/extensions/xep-0384.html

---
 protocols/JabberG/src/jabber_caps.h     | 4 ++--
 protocols/JabberG/src/jabber_omemo.cpp  | 8 ++++----
 protocols/JabberG/src/jabber_thread.cpp | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/protocols/JabberG/src/jabber_caps.h b/protocols/JabberG/src/jabber_caps.h
index 31c3aa1a16..18ffd15956 100755
--- a/protocols/JabberG/src/jabber_caps.h
+++ b/protocols/JabberG/src/jabber_caps.h
@@ -108,9 +108,9 @@ typedef unsigned __int64 JabberCapsBits;
 #define JABBER_CAPS_MIROTR                      ((JabberCapsBits)1<<42)
 #define JABBER_FEAT_NEWGPG                      L"http://miranda-ng.org/caps/new_gpg"
 #define JABBER_CAPS_NEWGPG                      ((JabberCapsBits)1<<43)
-#define JABBER_FEAT_OMEMO						L"urn:xmpp:omemo:0"
+#define JABBER_FEAT_OMEMO						L"eu.siacs.conversations.axolotl"
 #define JABBER_CAPS_OMEMO						((JabberCapsBits)1<<46)
-#define JABBER_FEAT_OMEMO_DEVICELIST_NOTIFY				JABBER_FEAT_OMEMO L":devicelist+notify"
+#define JABBER_FEAT_OMEMO_DEVICELIST_NOTIFY				JABBER_FEAT_OMEMO L".devicelist+notify"
 #define JABBER_CAPS_OMEMO_DEVICELIST_NOTIFY				((JabberCapsBits)1<<47)
 #define JABBER_CAPS_PLATFORMX86                 ((JabberCapsBits)1<<44)
 #define JABBER_CAPS_PLATFORMX64                 ((JabberCapsBits)1<<45)
diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp
index 48512b0da9..5d09ec7042 100755
--- a/protocols/JabberG/src/jabber_omemo.cpp
+++ b/protocols/JabberG/src/jabber_omemo.cpp
@@ -1965,7 +1965,7 @@ void CJabberProto::OmemoAnnounceDevice()
 	wchar_t szBareJid[JABBER_MAX_JID_LEN];
 	XmlNodeIq iq(L"set", SerialNext()); 
 	iq << XATTR(L"from", JabberStripJid(m_ThreadInfo->fullJID, szBareJid, _countof_portable(szBareJid)));
-	HXML publish_node = iq << XCHILDNS(L"pubsub", L"http://jabber.org/protocol/pubsub") << XCHILD(L"publish") << XATTR(L"node", JABBER_FEAT_OMEMO L":devicelist");
+	HXML publish_node = iq << XCHILDNS(L"pubsub", L"http://jabber.org/protocol/pubsub") << XCHILD(L"publish") << XATTR(L"node", JABBER_FEAT_OMEMO L".devicelist");
 	HXML list_node = publish_node << XCHILDNS(L"item") << XCHILDNS(L"list", JABBER_FEAT_OMEMO);
 
 	for (int i = 0; ; ++i) {
@@ -2012,7 +2012,7 @@ void CJabberProto::OmemoSendBundle()
 	HXML publish_node = iq << XCHILDNS(L"pubsub", L"http://jabber.org/protocol/pubsub") << XCHILD(L"publish");
 	{
 		wchar_t attr_val[128];
-		mir_snwprintf(attr_val, L"%s:bundles:%u", JABBER_FEAT_OMEMO, own_id);
+		mir_snwprintf(attr_val, L"%s.bundles:%u", JABBER_FEAT_OMEMO, own_id);
 		publish_node << XATTR(L"node", attr_val);
 	}
 	HXML bundle_node = publish_node << XCHILD(L"item") << XCHILDNS(L"bundle", JABBER_FEAT_OMEMO);
@@ -2104,7 +2104,7 @@ bool CJabberProto::OmemoCheckSession(MCONTACT hContact)
 			iq << XATTR(L"to", jid);
 			HXML items = iq << XCHILDNS(L"pubsub", L"http://jabber.org/protocol/pubsub") << XCHILD(L"items");
 			wchar_t bundle[64];
-			mir_snwprintf(bundle, 63, L"%s%s%u", JABBER_FEAT_OMEMO, L":bundles:", id);
+			mir_snwprintf(bundle, 63, L"%s%s%u", JABBER_FEAT_OMEMO, L".bundles:", id);
 			XmlAddAttr(items, L"node", bundle);
 			m_ThreadInfo->send(iq);
 			mir_free(jid);
@@ -2178,7 +2178,7 @@ void CJabberProto::OmemoOnIqResultGetBundle(HXML iqNode, CJabberIqInfo *pInfo)
 	HXML items = XmlGetChild(pubsub, L"items");
 	LPCTSTR items_node_val = XmlGetAttrValue(items, L"node");
 	LPCTSTR device_id = items_node_val;
-	device_id += mir_wstrlen(JABBER_FEAT_OMEMO L":bundles:");
+	device_id += mir_wstrlen(JABBER_FEAT_OMEMO L".bundles:");
 	HXML bundle = XmlGetChild(XmlGetChild(items, L"item"), L"bundle");
 	if (!bundle)
 	{
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 07f2b0209a..c9276754de 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -947,7 +947,7 @@ void CJabberProto::OnProcessPubsubEvent(HXML node)
 	HXML itemsNode;
 	if (m_options.UseOMEMO)
 	{
-		itemsNode = XmlGetChildByTag(eventNode, L"items", L"node", JABBER_FEAT_OMEMO L":devicelist");
+		itemsNode = XmlGetChildByTag(eventNode, L"items", L"node", JABBER_FEAT_OMEMO L".devicelist");
 		if (itemsNode)
 		{
 			OmemoHandleDeviceList(itemsNode);
-- 
cgit v1.2.3