plugin XEP-0380, XEP-0384: use C.EXTRA_INFO_DECR_ERR as info sub-type when a message can't be decrypted.
This commit is contained in:
parent
554248e108
commit
7e5a2f59cf
2 changed files with 5 additions and 1 deletions
|
|
@ -96,6 +96,6 @@ class XEP_0380(object):
|
|||
u"User {sender} sent you an encrypted message (encrypted with {algorithm}), "
|
||||
u"and we can't decrypt it.").format(sender=sender_s, algorithm=algorithm)
|
||||
|
||||
extra = {C.MESS_EXTRA_INFO: u"UNKNOWN_ENCRYPTION"}
|
||||
extra = {C.MESS_EXTRA_INFO: C.EXTRA_INFO_DECR_ERR}
|
||||
client.feedback(to_jid, user_msg, extra)
|
||||
return False
|
||||
|
|
|
|||
|
|
@ -991,6 +991,10 @@ class OMEMO(object):
|
|||
except Exception as e:
|
||||
log.warning(_(u"Can't decrypt message: {reason}\n{xml}").format(
|
||||
reason=e, xml=message_elt.toXml()))
|
||||
user_msg = (D_(u"An OMEMO message from {sender} can't be decrypted: {reason}")
|
||||
.format(sender=from_jid.full(), reason=e))
|
||||
extra = {C.MESS_EXTRA_INFO: C.EXTRA_INFO_DECR_ERR}
|
||||
client.feedback(from_jid, user_msg, extra)
|
||||
defer.returnValue(False)
|
||||
if omemo_session.republish_bundle:
|
||||
# we don't wait for the Deferred (i.e. no yield) on purpose
|
||||
|
|
|
|||
Loading…
Reference in a new issue