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

[omemo] Fix encryption messages to self

Browse Source
This commit is contained in:
Philipp Hörist
2019-02-24 23:05:54 +01:00
parent 49ffa7a3b2
commit d4af2b7dad
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
omemo/backend/devices.py
View File

@@ -93,7 +93,7 @@ class DeviceManager:
raise NoDevicesFound raise NoDevicesFound
devices_for_encryption += self._get_own_devices_for_encryption() devices_for_encryption += self._get_own_devices_for_encryption()
return devices_for_encryption return set(devices_for_encryption)
def _get_devices_for_muc_encryption(self, jid): def _get_devices_for_muc_encryption(self, jid):
devices_for_encryption = [] devices_for_encryption = []
@@ -103,8 +103,7 @@ class DeviceManager:
def _get_own_devices_for_encryption(self): def _get_own_devices_for_encryption(self):
devices_for_encryption = [] devices_for_encryption = []
own_devices = self.get_devices(self._own_jid) own_devices = self.get_devices(self._own_jid, without_self=True)
own_devices.discard(self.own_device)
for device in own_devices: for device in own_devices:
if self._storage.isTrusted(self._own_jid, device): if self._storage.isTrusted(self._own_jid, device):
devices_for_encryption.append((self._own_jid, device)) devices_for_encryption.append((self._own_jid, device))

4
omemo/backend/state.py
View File

@@ -189,7 +189,9 @@ class OmemoState(DeviceManager):
log.exception('Failed to encrypt') log.exception('Failed to encrypt')
continue continue
recipients = set(whisper_messages.keys()) - set([self._own_jid]) recipients = set(whisper_messages.keys())
if jid != self._own_jid:
recipients -= set([self._own_jid])
if not recipients: if not recipients:
log.error('Encrypted keys empty') log.error('Encrypted keys empty')
return return