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

[pgp] Prepare for future Gajim changes

Browse Source
This commit is contained in:
Philipp Hörist
2018-07-15 01:40:28 +02:00
parent 3f4ae27ae8
commit 4fee27c264
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pgp/pgpplugin.py
View File

@@ -29,8 +29,7 @@ from gi.repository import GLib
from gajim import dialogs from gajim import dialogs
from gajim.common import app from gajim.common import app
from gajim.common.connection_handlers_events import ( from gajim.common.connection_handlers_events import MessageNotSentEvent
MessageNotSentEvent, MessageReceivedEvent, MamMessageReceivedEvent)
from gajim.plugins import GajimPlugin from gajim.plugins import GajimPlugin
log = logging.getLogger('gajim.plugin_system.oldpgp') log = logging.getLogger('gajim.plugin_system.oldpgp')
@@ -147,10 +146,15 @@ class OldPGPPlugin(GajimPlugin):
# Another Plugin already decrypted the message # Another Plugin already decrypted the message
return return
account = conn.name account = conn.name
if isinstance(obj, MessageReceivedEvent): if obj.name == 'message-received':
enc_tag = obj.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) enc_tag = obj.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED)
elif isinstance(obj, MamMessageReceivedEvent): elif obj.name == 'mam-message-received':
enc_tag = obj.msg_.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) # Compatibility for Gajim 1.0.3
if hasattr(obj, 'message'):
message = obj.message
else:
message = obj.msg_
enc_tag = message.getTag('x', namespace=nbxmpp.NS_ENCRYPTED)
else: else:
return return
if enc_tag: if enc_tag: