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

[omemo] Set encryption name in event obj

Browse Source
This commit is contained in:
Philipp Hörist
2017-06-02 03:12:27 +02:00
parent 90887631a7
commit 86afb2cacc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
omemo/omemoplugin.py
View File

@@ -405,7 +405,7 @@ class OmemoPlugin(GajimPlugin):
self.print_msg_to_log(msg.msg_) self.print_msg_to_log(msg.msg_)
msg.msgtxt = plaintext msg.msgtxt = plaintext
msg.encrypted = 'OMEMO' msg.encrypted = self.encryption_name
return return
elif msg.msg_.getTag('body'): elif msg.msg_.getTag('body'):
@@ -498,7 +498,7 @@ class OmemoPlugin(GajimPlugin):
# Gajim bug: there must be a body or the message # Gajim bug: there must be a body or the message
# gets dropped from history # gets dropped from history
msg.stanza.setBody(plaintext) msg.stanza.setBody(plaintext)
msg.encrypted = 'OMEMO' msg.encrypted = self.encryption_name
elif msg.stanza.getTag('body'): elif msg.stanza.getTag('body'):
account = msg.conn.name account = msg.conn.name
@@ -674,6 +674,7 @@ class OmemoPlugin(GajimPlugin):
self.print_msg_to_log(event.correction_msg) self.print_msg_to_log(event.correction_msg)
else: else:
self.print_msg_to_log(event.msg_iq) self.print_msg_to_log(event.msg_iq)
callback(event) callback(event)
except Exception as e: except Exception as e:
log.debug(e) log.debug(e)
@@ -732,7 +733,7 @@ class OmemoPlugin(GajimPlugin):
event.msg_iq.addChild(node=store) event.msg_iq.addChild(node=store)
self.print_msg_to_log(event.msg_iq) self.print_msg_to_log(event.msg_iq)
event.xhtml = None event.xhtml = None
event.encrypted = self.encryption_name
callback(event) callback(event)
except Exception as e: except Exception as e:
log.debug(e) log.debug(e)