hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Show better error messages on device publish fail

Browse Source
This commit is contained in:
Philipp Hörist
2017-11-15 19:06:24 +01:00
parent 6e42eae556
commit 02c7edefe3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
omemo/omemo_connection.py
View File

@@ -607,9 +607,10 @@ class OMEMOConnection:
self.send_with_callback(device_announce, self.send_with_callback(device_announce,
self.device_list_publish_result) self.device_list_publish_result)
@staticmethod def device_list_publish_result(self, stanza):
def device_list_publish_result(stanza): if not nbxmpp.isResultNode(stanza):
log.debug(stanza) log.error('%s => Publishing devicelist failed: %s',
self.account, stanza.getError())
def are_keys_missing(self, contact_jid): def are_keys_missing(self, contact_jid):
""" Checks if devicekeys are missing and querys the """ Checks if devicekeys are missing and querys the
@@ -756,10 +757,8 @@ class OMEMOConnection:
if successful(stanza): if successful(stanza):
devices_list = list(set(unpack_device_list_update(stanza, self.account))) devices_list = list(set(unpack_device_list_update(stanza, self.account)))
if not devices_list: if not devices_list:
log.error('%s => Devicelistquery was NOT successful',
self.account)
self.publish_own_devices_list(new=True) self.publish_own_devices_list(new=True)
return False return
self.omemo.set_own_devices(devices_list) self.omemo.set_own_devices(devices_list)
self.omemo.store.sessionStore.setActiveState( self.omemo.store.sessionStore.setActiveState(
@@ -770,7 +769,8 @@ class OMEMOConnection:
# overwritten by some other client # overwritten by some other client
self.publish_own_devices_list() self.publish_own_devices_list()
else: else:
log.error('%s => Devicelistquery was NOT successful', self.account) log.error('%s => Devicelistquery was NOT successful: %s',
self.account, stanza.getError())
self.publish_own_devices_list(new=True) self.publish_own_devices_list(new=True)
def clear_device_list(self): def clear_device_list(self):