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

xep_0384: get_device_list now always returns active devices

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2018-12-30 21:44:11 +01:00
parent 57addc3b39
commit 623ca1e2bb
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugin.py
View file

@ -240,10 +240,9 @@ class XEP_0384(BasePlugin):
self._store_device_ids(bare_jid, items) self._store_device_ids(bare_jid, items)
device_ids = self.get_device_list(bare_jid) device_ids = self.get_device_list(bare_jid)
active_devices = device_ids['active']
if bare_jid == self.xmpp.boundjid.bare and \ if bare_jid == self.xmpp.boundjid.bare and \
self._device_id not in active_devices: self._device_id not in device_ids:
await self._set_device_list() await self._set_device_list()
return None return None
@ -272,7 +271,7 @@ class XEP_0384(BasePlugin):
device_ids['active'].add(self._device_id) device_ids['active'].add(self._device_id)
devices = [] devices = []
for i in device_ids['active']: for i in device_ids:
d = Device() d = Device()
d['id'] = str(i) d['id'] = str(i)
devices.append(d) devices.append(d)
@ -284,8 +283,8 @@ class XEP_0384(BasePlugin):
) )
def get_device_list(self, jid: str) -> List[str]: def get_device_list(self, jid: str) -> List[str]:
# XXX: Maybe someday worry about inactive devices somehow """Return active device ids"""
return self._omemo.getDevices(jid) return self._omemo.getDevices(jid).get('active', [])
def is_encrypted(self, msg: Message) -> bool: def is_encrypted(self, msg: Message) -> bool:
return msg.xml.find('{%s}encrypted' % OMEMO_BASE_NS) is not None return msg.xml.find('{%s}encrypted' % OMEMO_BASE_NS) is not None