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

[omemo] Dont register GUI event handlers in module

Browse Source
This commit is contained in:
Philipp Hörist
2019-02-16 13:21:05 +01:00
parent 3a8fb991c8
commit 41cd853085
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
omemo/modules/omemo.py
View File

@@ -109,11 +109,6 @@ class OMEMO(BaseModule):
self.query_for_bundles = [] self.query_for_bundles = []
self.query_for_devicelists = [] self.query_for_devicelists = []
app.ged.register_event_handler('signed-in', ged.PRECORE,
self.signed_in)
app.ged.register_event_handler('muc-config-changed', ged.GUI2,
self._on_config_changed)
def get_own_jid(self, stripped=False): def get_own_jid(self, stripped=False):
if stripped: if stripped:
return self._con.get_own_jid().getStripped() return self._con.get_own_jid().getStripped()
@@ -126,10 +121,7 @@ class OMEMO(BaseModule):
conn.execute("PRAGMA secure_delete=1") conn.execute("PRAGMA secure_delete=1")
return OmemoState(self.own_jid, conn, self._account, self) return OmemoState(self.own_jid, conn, self._account, self)
def signed_in(self, event): def on_signed_in(self):
if event.conn.name != self._account:
return
log.info('%s => Announce Support after Sign In', self._account) log.info('%s => Announce Support after Sign In', self._account)
self.query_for_bundles = [] self.query_for_bundles = []
self.set_bundle() self.set_bundle()
@@ -346,10 +338,7 @@ class OMEMO(BaseModule):
return False return False
return contact.sub == 'both' return contact.sub == 'both'
def _on_config_changed(self, event): def on_muc_config_changed(self, event):
if event.account != self._account:
return
room = event.jid.getBare() room = event.jid.getBare()
status_codes = event.status_codes or [] status_codes = event.status_codes or []
if StatusCode.CONFIG_NON_ANONYMOUS in status_codes: if StatusCode.CONFIG_NON_ANONYMOUS in status_codes:

20
omemo/plugin.py
View File

@@ -87,8 +87,9 @@ class OmemoPlugin(GajimPlugin):
self.encryption_name = 'OMEMO' self.encryption_name = 'OMEMO'
self.allow_groupchat = True self.allow_groupchat = True
self.events_handlers = { self.events_handlers = {
'signed-in': (ged.PRECORE, self.signed_in),
'omemo-new-fingerprint': (ged.PRECORE, self._on_new_fingerprints), 'omemo-new-fingerprint': (ged.PRECORE, self._on_new_fingerprints),
'signed-in': (ged.PRECORE, self._on_signed_in),
'muc-config-changed': (ged.GUI2, self._on_muc_config_changed),
} }
self.modules = [omemo] self.modules = [omemo]
self.config_dialog = OMEMOConfigDialog(self) self.config_dialog = OMEMOConfigDialog(self)
@@ -138,18 +139,15 @@ class OmemoPlugin(GajimPlugin):
except Exception: except Exception:
log.exception('Error loading application css') log.exception('Error loading application css')
def signed_in(self, event): def _on_signed_in(self, event):
""" Method called on SignIn if event.conn.name in self.disabled_accounts:
return
app.connections[event.conn.name].get_module('OMEMO').on_signed_in()
Parameters def _on_muc_config_changed(self, event):
---------- if event.account in self.disabled_accounts:
event : SignedInEvent
"""
account = event.conn.name
if account == 'Local':
return
if account in self.disabled_accounts:
return return
app.connections[event.account].get_module('OMEMO').on_muc_config_changed(event)
def activate(self): def activate(self):
""" Method called when the Plugin is activated in the PluginManager """ Method called when the Plugin is activated in the PluginManager