summaryrefslogtreecommitdiff
path: root/poezio/core
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-20 15:02:45 +0900
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-11-26 16:34:58 +0000
commit76445a68670b8b1cc9a046d582ddc68982e4c221 (patch)
tree79ca7e397a397d8fbf513491125414e16ec3e549 /poezio/core
parent1f43535f459ca5445dc0a8bfa05d57ac20481cad (diff)
downloadpoezio-76445a68670b8b1cc9a046d582ddc68982e4c221.tar.gz
poezio-76445a68670b8b1cc9a046d582ddc68982e4c221.tar.bz2
poezio-76445a68670b8b1cc9a046d582ddc68982e4c221.tar.xz
poezio-76445a68670b8b1cc9a046d582ddc68982e4c221.zip
Add support for XEP-0380: Explicit Message Encryption
Both for displaying incoming messages, and sending OTR and legacy OpenPGP.
Diffstat (limited to 'poezio/core')
-rw-r--r--poezio/core/handlers.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index e79e4232..a0d40dd4 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -259,7 +259,10 @@ class HandlerCore:
tmp_dir=tmp_dir,
extract_images=extract_images)
if not body:
- return
+ if not self.core.xmpp.plugin['xep_0380'].has_eme(message):
+ return
+ self.core.xmpp.plugin['xep_0380'].replace_body_with_eme(message)
+ body = msg['body']
remote_nick = ''
# normal message, we are the recipient