Commit deede80f authored by Philipp Hörist's avatar Philipp Hörist

Merge branch 'master' into 'master'

Version 1.0.3

See merge request !21
parents f532fcbb 1503d1f1
1.0.3 / 2017-02-12
- Set an inactive device active again after receiving a message from it
1.0.2 / 2017-02-04
- Fix a bug when publishing devices
- Fix copying fingerprint
......
[info]
name: OMEMO
short_name: omemo
version: 1.0.2
version: 1.0.3
description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencys, you can find install instructions for your system in the Gitlab Wiki.
authors: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de>
Daniel Gultsch <daniel@gultsch.de>
......
......@@ -439,6 +439,7 @@ class OmemoState:
# Publish new bundle after PreKey has been used
# for building a new Session
self.plugin.publish_bundle(self.account)
self.add_device(recipient_id, device_id)
return key
except UntrustedIdentityException as e:
log.info(self.account + " => Received WhisperMessage " +
......@@ -451,6 +452,7 @@ class OmemoState:
if self.isTrusted(recipient_id, device_id):
sessionCipher = self.get_session_cipher(recipient_id, device_id)
key = sessionCipher.decryptMsg(whisperMessage)
self.add_device(recipient_id, device_id)
return key
else:
raise Exception("Received WhisperMessage "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment