Commit 1cd53087 authored by Philipp Hörist's avatar Philipp Hörist

Adapt to nbxmpp changes

parent 18c96e62
......@@ -90,11 +90,11 @@ class LengthNotifierPlugin(GajimPlugin):
# Not restricted to any JIDs
return True
current_jid = JID(jid)
current_jid = JID.from_string(jid)
allowed_jids = self.config['JIDS'].split(',')
for allowed_jid in allowed_jids:
try:
address = JID(allowed_jid.strip())
address = JID.from_string(allowed_jid.strip())
except Exception as error:
log.debug('Error parsing JID: %s (%s)' % (error, allowed_jid))
continue
......
......@@ -267,7 +267,7 @@ class OMEMO(BaseModule):
contact = app.contacts.get_gc_contact(self._account, room_jid, resource)
if contact is not None:
return JID(contact.jid).bare
return JID.from_string(contact.jid).bare
self._log.info('Groupchat: Last resort trying to find SID in DB')
from_jid = self.backend.storage.getJidFromDevice(properties.omemo.sid)
......
......@@ -140,7 +140,7 @@ class OpenPGPPlugin(GajimPlugin):
keys = app.connections[account].get_module('OpenPGP').get_keys(
jid, only_trusted=False)
if not keys:
con.get_module('OpenPGP').request_keylist(JID(jid))
con.get_module('OpenPGP').request_keylist(JID.from_string(jid))
ErrorDialog(
_('No OpenPGP key'),
_('We didnt receive a OpenPGP key from this contact.'))
......
......@@ -254,7 +254,7 @@ class TicTacToeSession():
self.conn = conn
self.jid = jid
self.type_ = type_
self.resource = jid.resource()
self.resource = jid.resource
if thread_id:
self.received_thread_id = True
......
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