From 931fc581992fe0efeefece259673852fc7d0dfb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Tue, 27 Aug 2019 23:45:21 +0200 Subject: omemo: Update decrypt_message with slixmpp-omemo changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit decrypt_message now takes an Encrypted container and a sender (JID) instead of a Message object. Signed-off-by: Maxime “pep” Buquet --- plugins/omemo_plugin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins/omemo_plugin.py') diff --git a/plugins/omemo_plugin.py b/plugins/omemo_plugin.py index c59e0219..496e0a12 100644 --- a/plugins/omemo_plugin.py +++ b/plugins/omemo_plugin.py @@ -86,7 +86,9 @@ class Plugin(E2EEPlugin): body = None try: - body = self.core.xmpp['xep_0384'].decrypt_message(message, allow_untrusted) + mfrom = message['from'] + encrypted = message['omemo_encrypted'] + body = self.core.xmpp['xep_0384'].decrypt_message(encrypted, mfrom, allow_untrusted) body = body.decode('utf-8') except (MissingOwnKey,): # The message is missing our own key, it was not encrypted for -- cgit v1.2.3