Commit 4fee27c2 authored by Philipp Hörist's avatar Philipp Hörist

[pgp] Prepare for future Gajim changes

parent 3f4ae27a
...@@ -29,8 +29,7 @@ from gi.repository import GLib ...@@ -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): ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment