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

[pgp] Adapt to Gajim MAM changes

Browse Source
This commit is contained in:
Philipp Hörist
2017-11-19 19:29:13 +01:00
parent 9741339913
commit 14dc34b3fb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pgp/pgpplugin.py
View File

@@ -30,7 +30,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, MessageReceivedEvent) 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')
@@ -136,8 +136,10 @@ class OldPGPPlugin(GajimPlugin):
account = conn.name account = conn.name
if isinstance(obj, MessageReceivedEvent): if isinstance(obj, MessageReceivedEvent):
enc_tag = obj.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) enc_tag = obj.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED)
else: elif isinstance(obj, MamMessageReceivedEvent):
enc_tag = obj.msg_.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) enc_tag = obj.msg_.getTag('x', namespace=nbxmpp.NS_ENCRYPTED)
else:
return
if enc_tag: if enc_tag:
encmsg = enc_tag.getData() encmsg = enc_tag.getData()
key_id = app.config.get_per('accounts', account, 'keyid') key_id = app.config.get_per('accounts', account, 'keyid')