[omemo] Save encryption details
This commit is contained in:
@@ -191,6 +191,7 @@ class OMEMOConnection:
|
|||||||
|
|
||||||
event.msgtxt = plaintext
|
event.msgtxt = plaintext
|
||||||
event.encrypted = self.plugin.encryption_name
|
event.encrypted = self.plugin.encryption_name
|
||||||
|
self.add_additional_data(event.additional_data)
|
||||||
|
|
||||||
def _mam_message_received(self, event):
|
def _mam_message_received(self, event):
|
||||||
""" Handles an incoming MAM message
|
""" Handles an incoming MAM message
|
||||||
@@ -237,6 +238,7 @@ class OMEMOConnection:
|
|||||||
|
|
||||||
event.msgtxt = plaintext
|
event.msgtxt = plaintext
|
||||||
event.encrypted = self.plugin.encryption_name
|
event.encrypted = self.plugin.encryption_name
|
||||||
|
self.add_additional_data(event.additional_data)
|
||||||
return
|
return
|
||||||
|
|
||||||
def _message_received(self, msg):
|
def _message_received(self, msg):
|
||||||
@@ -315,6 +317,7 @@ class OMEMOConnection:
|
|||||||
# gets dropped from history
|
# gets dropped from history
|
||||||
msg.stanza.setBody(plaintext)
|
msg.stanza.setBody(plaintext)
|
||||||
msg.encrypted = self.plugin.encryption_name
|
msg.encrypted = self.plugin.encryption_name
|
||||||
|
self.add_additional_data(msg.additional_data)
|
||||||
|
|
||||||
def room_memberlist_received(self, stanza):
|
def room_memberlist_received(self, stanza):
|
||||||
if not nbxmpp.isResultNode(stanza):
|
if not nbxmpp.isResultNode(stanza):
|
||||||
@@ -558,6 +561,7 @@ class OMEMOConnection:
|
|||||||
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.plugin.encryption_name
|
event.encrypted = self.plugin.encryption_name
|
||||||
|
self.add_additional_data(event.additional_data)
|
||||||
callback(event)
|
callback(event)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -873,6 +877,9 @@ class OMEMOConnection:
|
|||||||
log.debug(stanzastr)
|
log.debug(stanzastr)
|
||||||
log.debug('-'*15)
|
log.debug('-'*15)
|
||||||
|
|
||||||
|
def add_additional_data(self, data):
|
||||||
|
data['encrypted'] = {'name': self.plugin.encryption_name}
|
||||||
|
|
||||||
|
|
||||||
class OMEMOError(Exception):
|
class OMEMOError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|||||||
Reference in New Issue
Block a user