pep/slixmpp-omemo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xep_0384: do things in session_bind only if lib is available

Browse source 
`session_bind` is apparently loaded at about the same time as
plugin_init, and exceptions will be raise if the library could not be
loaded.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-01-31 16:28:12 +01:00
parent 3a7711aaf1
commit 8dbfc140ed
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugin.py
View file

@ -144,7 +144,7 @@ class XEP_0384(BasePlugin):
if not self.backend_loaded: if not self.backend_loaded:
log.info("xep_0384 cannot be loaded as the backend omemo library " log.info("xep_0384 cannot be loaded as the backend omemo library "
"is not available") "is not available")
return None raise PluginCouldNotLoad
if not self.data_dir: if not self.data_dir:
log.info("xep_0384 canoot be loaded as there is not data directory " log.info("xep_0384 canoot be loaded as there is not data directory "
@ -183,9 +183,10 @@ class XEP_0384(BasePlugin):
self.xmpp['xep_0163'].remove_interest(OMEMO_DEVICES_NS) self.xmpp['xep_0163'].remove_interest(OMEMO_DEVICES_NS)
def session_bind(self, _jid): def session_bind(self, _jid):
self.xmpp['xep_0163'].add_interest(OMEMO_DEVICES_NS) if self.backend_loaded:
asyncio.ensure_future(self._set_device_list()) self.xmpp['xep_0163'].add_interest(OMEMO_DEVICES_NS)
asyncio.ensure_future(self._publish_bundle()) asyncio.ensure_future(self._set_device_list())
asyncio.ensure_future(self._publish_bundle())
def my_device_id(self) -> int: def my_device_id(self) -> int:
return self._device_id return self._device_id