From 6b75f4ab3531273db2815798368a46336bdcb75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Tue, 18 Apr 2017 17:50:15 +0200 Subject: [PATCH] Choose MAM namespace and save it --- src/common/connection.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/common/connection.py b/src/common/connection.py index edce4ef56..29cd7b254 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -162,6 +162,7 @@ class CommonConnection: self.privacy_rules_supported = False self.vcard_supported = False self.private_storage_supported = False + self.archiving_namespace = None self.archiving_supported = False self.archiving_313_supported = False self.archiving_136_supported = False @@ -2008,7 +2009,14 @@ class Connection(CommonConnection, ConnectionHandlers): # Remove stored bookmarks accessible to everyone. self.send_pb_purge(our_jid, 'storage:bookmarks') self.send_pb_delete(our_jid, 'storage:bookmarks') - if nbxmpp.NS_MAM in obj.features: + if (nbxmpp.NS_MAM or nbxmpp.NS_MAM_1 or nbxmpp.NS_MAM_2) \ + in obj.features: + if nbxmpp.NS_MAM_2 in obj.features: + self.archiving_namespace = nbxmpp.NS_MAM_2 + elif nbxmpp.NS_MAM_1 in obj.features: + self.archiving_namespace = nbxmpp.NS_MAM_1 + else: + self.archiving_namespace = nbxmpp.NS_MAM self.archiving_supported = True self.archiving_313_supported = True get_action(self.name + '-archive').set_enabled(True)