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

[openpgp] Adapt to nbxmpp changes

Browse Source
This commit is contained in:
lovetox
2020-10-26 13:33:47 +01:00
parent ad3da5f975
commit 2df99058d7
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
openpgp/modules/openpgp.py
View File

@@ -21,8 +21,9 @@ from pathlib import Path
from nbxmpp.namespaces import Namespace from nbxmpp.namespaces import Namespace
from nbxmpp import Node from nbxmpp import Node
from nbxmpp import StanzaMalformed from nbxmpp import StanzaMalformed
from nbxmpp.util import is_error_result
from nbxmpp.structs import StanzaHandler from nbxmpp.structs import StanzaHandler
from nbxmpp.errors import StanzaError
from nbxmpp.errors import MalformedStanzaError
from nbxmpp.modules.openpgp import PGPKeyMetadata from nbxmpp.modules.openpgp import PGPKeyMetadata
from nbxmpp.modules.openpgp import parse_signcrypt from nbxmpp.modules.openpgp import parse_signcrypt
from nbxmpp.modules.openpgp import create_signcrypt_node from nbxmpp.modules.openpgp import create_signcrypt_node
@@ -117,10 +118,13 @@ class OpenPGP(BaseModule):
callback=self._public_key_received, callback=self._public_key_received,
user_data=fingerprint) user_data=fingerprint)
def _public_key_received(self, result, fingerprint): def _public_key_received(self, task):
if is_error_result(result): fingerprint = task.get_user_data()
try:
result = task.finish()
except (StanzaError, MalformedStanzaError) as error:
log.error('%s => Public Key not found: %s', log.error('%s => Public Key not found: %s',
self._account, result) self._account, error)
return return
imported_key = self._pgp.import_key(result.key, result.jid) imported_key = self._pgp.import_key(result.key, result.jid)
@@ -152,16 +156,19 @@ class OpenPGP(BaseModule):
callback=self._keylist_received, callback=self._keylist_received,
user_data=jid) user_data=jid)
def _keylist_received(self, result, jid): def _keylist_received(self, task):
if is_error_result(result): jid = task.get_user_data()
try:
keylist = task.finish()
except (StanzaError, MalformedStanzaError) as error:
log.error('%s => Keylist query failed: %s', log.error('%s => Keylist query failed: %s',
self._account, result) self._account, error)
if self.own_jid.bareMatch(jid) and self._fingerprint is not None: if self.own_jid.bareMatch(jid) and self._fingerprint is not None:
self.set_keylist() self.set_keylist()
return return
log.info('Keylist received from %s', jid) log.info('Keylist received from %s', jid)
self._process_keylist(result, jid) self._process_keylist(keylist, jid)
def _process_keylist(self, keylist, from_jid): def _process_keylist(self, keylist, from_jid):
if not keylist: if not keylist: