diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-11-27 20:48:55 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-11-27 20:50:20 +0300 |
| commit | 51e27d7122c871c253b7a183da8ac8720f0f2ea7 (patch) | |
| tree | 6ef7fdc7f1cad5e5be86e17e059eef9217333ba5 /protocols/JabberG/src/jabber_omemo.cpp | |
| parent | dc641cef2e4646f85067e0f3f9044499743e818f (diff) | |
jabber: omemo: "updated"(rollback) to latest version of https://xmpp.org/extensions/xep-0384.html
Diffstat (limited to 'protocols/JabberG/src/jabber_omemo.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_omemo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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)
{
|