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

[omemo] Clean up some small things

Browse Source 
- unused import
- unused var GAJIM_VERSION
- redundant self.plugin = self
- simplify condition
- redundant 'else'
This commit is contained in:
Philipp Hörist
2017-05-23 20:25:17 +02:00
parent 8d14bf328d
commit 0a8aa4df89
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
omemo/omemoplugin.py
View File

@@ -24,7 +24,6 @@ import logging
import os import os
import sqlite3 import sqlite3
import shutil import shutil
import message_control
import nbxmpp import nbxmpp
from nbxmpp.simplexml import Node from nbxmpp.simplexml import Node
@@ -52,8 +51,6 @@ CRYPTOGRAPHY_MISSING = 'You are missing Python-Cryptography'
AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version' AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version'
PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \ PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \
'the GitHub Wiki' 'the GitHub Wiki'
GAJIM_VERSION = 'OMEMO only works with the latest Gajim version, get the ' \
'latest version from gajim.org'
ERROR_MSG = '' ERROR_MSG = ''
NS_HINTS = 'urn:xmpp:hints' NS_HINTS = 'urn:xmpp:hints'
@@ -144,7 +141,6 @@ class OmemoPlugin(GajimPlugin):
self.encryption_state, None)} self.encryption_state, None)}
SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP) SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP)
self.plugin = self
self.announced = [] self.announced = []
self.query_for_bundles = [] self.query_for_bundles = []
self.disabled_accounts = [] self.disabled_accounts = []
@@ -153,7 +149,7 @@ class OmemoPlugin(GajimPlugin):
self.config_default_values = {'DISABLED_ACCOUNTS': ([], ''), } self.config_default_values = {'DISABLED_ACCOUNTS': ([], ''), }
for account in self.plugin.config['DISABLED_ACCOUNTS']: for account in self.config['DISABLED_ACCOUNTS']:
self.disabled_accounts.append(account) self.disabled_accounts.append(account)
# add aesgcm:// uri scheme to config # add aesgcm:// uri scheme to config
@@ -198,7 +194,7 @@ class OmemoPlugin(GajimPlugin):
conn = sqlite3.connect(db_path, check_same_thread=False) conn = sqlite3.connect(db_path, check_same_thread=False)
self.omemo_states[account] = OmemoState(my_jid, conn, account, self.omemo_states[account] = OmemoState(my_jid, conn, account,
self.plugin) self)
return self.omemo_states[account] return self.omemo_states[account]
@@ -784,7 +780,7 @@ class OmemoPlugin(GajimPlugin):
devices_list = list(set(unpack_device_list_update(event.stanza, devices_list = list(set(unpack_device_list_update(event.stanza,
event.conn.name))) event.conn.name)))
contact_jid = gajim.get_jid_without_resource(event.fjid) contact_jid = gajim.get_jid_without_resource(event.fjid)
if len(devices_list) == 0: if not devices_list:
log.error(account + log.error(account +
' => Received empty or invalid Devicelist from: ' + ' => Received empty or invalid Devicelist from: ' +
contact_jid) contact_jid)
@@ -899,8 +895,7 @@ class OmemoPlugin(GajimPlugin):
if state.getTrustedFingerprints(contact_jid): if state.getTrustedFingerprints(contact_jid):
return False return False
else: return True
return True
@staticmethod @staticmethod
def handle_iq_received(event): def handle_iq_received(event):
@@ -1054,7 +1049,7 @@ class OmemoPlugin(GajimPlugin):
if successful(stanza): if successful(stanza):
devices_list = list(set(unpack_device_list_update(stanza, account))) devices_list = list(set(unpack_device_list_update(stanza, account)))
if len(devices_list) == 0: if not devices_list:
log.error(account + ' => Devicelistquery was NOT successful') log.error(account + ' => Devicelistquery was NOT successful')
self.publish_own_devices_list(account, new=True) self.publish_own_devices_list(account, new=True)
return False return False