Commits

commits@gajim.org

17632 discussions

gajim-plugins: Add axolotl to demandignore
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset da1eb841ff4b in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=da1eb841ff4b description: Add axolotl to demandignore diffstat: omemo/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 210303e1d814 -r da1eb841ff4b omemo/__init__.py --- a/omemo/__init__.py Wed Sep 07 00:38:43 2016 +0200 +++ b/omemo/__init__.py Sun Sep 04 00:46:47 2016 +0200 @@ -39,7 +39,7 @@ from common import demandimport demandimport.enable() -demandimport.ignore += ['_imp', '_thread'] +demandimport.ignore += ['_imp', '_thread', 'axolotl'] IQ_CALLBACK = {}

1 0

gajim-plugins: Add delete fingerprint button
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 1f50cf60b330 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=1f50cf60b330 description: Add delete fingerprint button diffstat: omemo/config_dialog.ui | 17 +++ omemo/fpr_dialog.ui | 2 + omemo/omemo/liteaxolotlstore.py | 12 ++ omemo/omemo/liteidentitykeystore.py | 13 +- omemo/omemo/litesessionstore.py | 39 +++---- omemo/ui.py | 198 ++++++++++++++++++++++------------- 6 files changed, 183 insertions(+), 98 deletions(-) diffs (truncated from 474 to 300 lines): diff -r da1eb841ff4b -r 1f50cf60b330 omemo/config_dialog.ui --- a/omemo/config_dialog.ui Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/config_dialog.ui Tue Sep 06 22:50:18 2016 +0200 @@ -24,6 +24,8 @@ <column type="gchararray"/>  <column type="gchararray"/> +  + <column type="gint"/> </columns> </object> <object class="GtkNotebook" id="notebook1"> @@ -261,6 +263,21 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkButton" id="delfprbutton"> + <property name="label" translatable="yes">Delete Fingerprint</property> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="delfpr_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff -r da1eb841ff4b -r 1f50cf60b330 omemo/fpr_dialog.ui --- a/omemo/fpr_dialog.ui Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/fpr_dialog.ui Tue Sep 06 22:50:18 2016 +0200 @@ -18,6 +18,8 @@ <column type="gchararray"/>  <column type="gchararray"/> +  + <column type="gint"/> </columns> </object> <object class="GtkNotebook" id="notebook1"> diff -r da1eb841ff4b -r 1f50cf60b330 omemo/omemo/liteaxolotlstore.py --- a/omemo/omemo/liteaxolotlstore.py Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/omemo/liteaxolotlstore.py Tue Sep 06 22:50:18 2016 +0200 @@ -83,10 +83,16 @@ def saveIdentity(self, recepientId, identityKey): self.identityKeyStore.saveIdentity(recepientId, identityKey) + def deleteIdentity(self, recipientId, identityKey): + self.identityKeyStore.deleteIdentity(recipientId, identityKey) + def isTrustedIdentity(self, recepientId, identityKey): return self.identityKeyStore.isTrustedIdentity(recepientId, identityKey) + def setTrust(self, identityKey, trust): + return self.identityKeyStore.setTrust(identityKey, trust) + def getTrustedFingerprints(self, jid): return self.identityKeyStore.getTrustedFingerprints(jid) @@ -139,6 +145,12 @@ def deleteAllSessions(self, recepientId): self.sessionStore.deleteAllSessions(recepientId) + def getSessionsFromJid(self, recipientId): + return self.sessionStore.getSessionsFromJid(recipientId) + + def getAllSessions(self): + return self.sessionStore.getAllSessions() + def loadSignedPreKey(self, signedPreKeyId): return self.signedPreKeyStore.loadSignedPreKey(signedPreKeyId) diff -r da1eb841ff4b -r 1f50cf60b330 omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Tue Sep 06 22:50:18 2016 +0200 @@ -86,6 +86,13 @@ return result is not None + def deleteIdentity(self, recipientId, identityKey): + q = "DELETE FROM identities WHERE recipient_id = ? AND public_key = ?" + c = self.dbConn.cursor() + c.execute(q, (recipientId, + identityKey.getPublicKey().serialize())) + self.dbConn.commit() + def isTrustedIdentity(self, recipientId, identityKey): q = "SELECT trust FROM identities WHERE recipient_id = ? " \ "AND public_key = ?" @@ -160,8 +167,8 @@ c.execute(q, fingerprints) self.dbConn.commit() - def setTrust(self, _id, trust): - q = "UPDATE identities SET trust = ? WHERE _id = ?" + def setTrust(self, identityKey, trust): + q = "UPDATE identities SET trust = ? WHERE public_key = ?" c = self.dbConn.cursor() - c.execute(q, (trust, _id)) + c.execute(q, (trust, identityKey.getPublicKey().serialize())) self.dbConn.commit() diff -r da1eb841ff4b -r 1f50cf60b330 omemo/omemo/litesessionstore.py --- a/omemo/omemo/litesessionstore.py Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/omemo/litesessionstore.py Tue Sep 06 22:50:18 2016 +0200 @@ -82,6 +82,23 @@ self.dbConn.cursor().execute(q, (recipientId, )) self.dbConn.commit() + def getAllSessions(self): + q = "SELECT _id, recipient_id, device_id, record, active from sessions" + c = self.dbConn.cursor() + result = [] + for row in c.execute(q): + result.append((row[0], row[1], row[2], row[3], row[4])) + return result + + def getSessionsFromJid(self, recipientId): + q = "SELECT _id, recipient_id, device_id, record, active from sessions" \ + " WHERE recipient_id = ?" + c = self.dbConn.cursor() + result = [] + for row in c.execute(q, (recipientId,)): + result.append((row[0], row[1], row[2], row[3], row[4])) + return result + def setActiveState(self, deviceList, jid): c = self.dbConn.cursor() @@ -96,28 +113,6 @@ c.execute(q, deviceList) self.dbConn.commit() - def getActiveSessionsKeys(self, recipientId): - q = "SELECT record FROM sessions WHERE active = 1 AND recipient_id = ?" - c = self.dbConn.cursor() - result = [] - for row in c.execute(q, (recipientId,)): - public_key = (SessionRecord(serialized=row[0]). - getSessionState().getRemoteIdentityKey(). - getPublicKey()) - result.append(public_key.serialize()) - return result - - def getAllActiveSessionsKeys(self): - q = "SELECT record FROM sessions WHERE active = 1" - c = self.dbConn.cursor() - result = [] - for row in c.execute(q): - public_key = (SessionRecord(serialized=row[0]). - getSessionState().getRemoteIdentityKey(). - getPublicKey()) - result.append(public_key.serialize()) - return result - def getInactiveSessionsKeys(self, recipientId): q = "SELECT record FROM sessions WHERE active = 0 AND recipient_id = ?" c = self.dbConn.cursor() diff -r da1eb841ff4b -r 1f50cf60b330 omemo/ui.py --- a/omemo/ui.py Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/ui.py Tue Sep 06 22:50:18 2016 +0200 @@ -28,6 +28,7 @@ import gtkgui_helpers from common import gajim from plugins.gui import GajimPluginConfigDialog +from axolotl.state.sessionrecord import SessionRecord # pylint: enable=import-error log = logging.getLogger('gajim.plugin_system.omemo') @@ -260,7 +261,8 @@ self.fpr_model = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_STRING, - gobject.TYPE_STRING) + gobject.TYPE_STRING, + gobject.TYPE_INT) self.device_model = gtk.ListStore(gobject.TYPE_STRING) @@ -290,6 +292,46 @@ def account_combobox_changed_cb(self, box, *args): self.update_context_list() + def delfpr_button_clicked(self, button, *args): + active = self.B.get_object('account_combobox').get_active() + account = self.account_store[active][0] + + state = self.plugin.get_omemo_state(account) + + mod, paths = self.fpr_view.get_selection().get_selected_rows() + + for path in paths: + it = mod.get_iter(path) + jid, fpr, deviceid = mod.get(it, 1, 3, 4) + fpr = fpr[31:-12] + + dlg = gtk.Dialog('Delete Fingerprint', self, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + (gtk.STOCK_YES, gtk.RESPONSE_YES, + gtk.STOCK_NO, gtk.RESPONSE_NO)) + l = gtk.Label() + l.set_markup('Do you want to delete the ' + 'fingerprint of %s on your account %s?' + '\n\n<tt>%s</tt>' % (jid, account, fpr)) + l.set_line_wrap(True) + l.set_padding(12, 12) + dlg.vbox.pack_start(l) + dlg.show_all() + + response = dlg.run() + if response == gtk.RESPONSE_YES: + record = state.store.loadSession(jid, deviceid) + identity_key = record.getSessionState().getRemoteIdentityKey() + + state.store.deleteSession(jid, deviceid) + state.store.deleteIdentity(jid, identity_key) + + dlg.destroy() + else: + dlg.destroy() + + self.update_context_list() + def trust_button_clicked_cb(self, button, *args): active = self.B.get_object('account_combobox').get_active() account = self.account_store[active][0] @@ -300,7 +342,7 @@ for path in paths: it = mod.get_iter(path) - _id, user, fpr = mod.get(it, 0, 1, 3) + jid, fpr, deviceid = mod.get(it, 1, 3, 4) fpr = fpr[31:-12] dlg = gtk.Dialog('Trust / Revoke Fingerprint', self, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, @@ -309,28 +351,35 @@ l = gtk.Label() l.set_markup('Do you want to trust the ' 'fingerprint of %s on your account %s?' - '\n\n<tt>%s</tt>' % (user, account, fpr)) + '\n\n<tt>%s</tt>' % (jid, account, fpr)) l.set_line_wrap(True) l.set_padding(12, 12) dlg.vbox.pack_start(l) dlg.show_all() response = dlg.run() + + record = state.store.loadSession(jid, deviceid) + identity_key = record.getSessionState().getRemoteIdentityKey() + if response == gtk.RESPONSE_YES: - state.store.identityKeyStore.setTrust(_id, TRUSTED) + state.store.setTrust(identity_key, TRUSTED) try: if self.plugin.ui_list[account]: - self.plugin.ui_list[account][user].refresh_auth_lock_icon() + self.plugin.ui_list[account][jid]. \ + refresh_auth_lock_icon() except: - dlg.destroy() + log.debug('UI not available') else: if response == gtk.RESPONSE_NO: - state.store.identityKeyStore.setTrust(_id, UNTRUSTED) + state.store.setTrust(identity_key, UNTRUSTED) try: - if user in self.plugin.ui_list[account]: - self.plugin.ui_list[account][user].refresh_auth_lock_icon() + if jid in self.plugin.ui_list[account]: + self.plugin.ui_list[account][jid]. \ + refresh_auth_lock_icon() except: - dlg.destroy() + log.debug('UI not available') + dlg.destroy() self.update_context_list() @@ -391,35 +440,33 @@ self.B.get_object('fingerprint_label').set_markup('<tt>%s</tt>' % ownfpr) - fprDB = state.store.identityKeyStore.getAllFingerprints() - activeSessions = state.store.sessionStore. \ - getAllActiveSessionsKeys() - for item in fprDB: - _id, jid, fpr, tr = item - active = fpr in activeSessions - fpr = binascii.hexlify(fpr) + trust_str = {0: 'False', 1: 'True', 2: 'Undecided'} + session_db = state.store.getAllSessions() + + for item in session_db:

1 0

gajim-plugins: Refactor create message process
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 866cf8a00b63 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=866cf8a00b63 description: Refactor create message process diffstat: omemo/omemo/state.py | 53 ++++++++++++++++++++------------------------------- 1 files changed, 21 insertions(+), 32 deletions(-) diffs (100 lines): diff -r 1f50cf60b330 -r 866cf8a00b63 omemo/omemo/state.py --- a/omemo/omemo/state.py Tue Sep 06 22:50:18 2016 +0200 +++ b/omemo/omemo/state.py Wed Sep 07 00:22:20 2016 +0200 @@ -201,7 +201,7 @@ except (NoSessionException, InvalidMessageException) as e: log.warning('No Session found ' + e.message) log.warning('sender_jid => ' + str(sender_jid) + ' sid =>' + - str(sid)) + str(sid)) return except (DuplicateMessageException) as e: log.warning('Duplicate message found ' + str(e.args)) @@ -226,41 +226,34 @@ log.error('No known devices') return - for dev in devices_list: - self.get_session_cipher(jid, dev) - session_ciphers = self.session_ciphers[jid] - if not session_ciphers: - log.warning('No session ciphers for ' + jid) - return - # Encrypt the message key with for each of receivers devices - for rid, cipher in session_ciphers.items(): + for device in devices_list: try: - if self.isTrusted(cipher) == TRUSTED: - encrypted_keys[rid] = cipher.encrypt(key).serialize() + if self.isTrusted(jid, device) == TRUSTED: + cipher = self.get_session_cipher(jid, device) + encrypted_keys[device] = cipher.encrypt(key).serialize() else: log.debug('Skipped Device because Trust is: ' + - str(self.isTrusted(cipher))) + str(self.isTrusted(jid, device))) except: - log.warning('Failed to find key for device ' + str(rid)) + log.warning('Failed to find key for device ' + str(device)) if len(encrypted_keys) == 0: - log_msg = 'Encrypted keys empty' - log.error(log_msg) - raise NoValidSessions(log_msg) + log.error('Encrypted keys empty') + raise NoValidSessions('Encrypted keys empty') my_other_devices = set(self.own_devices) - set({self.own_device_id}) # Encrypt the message key with for each of our own devices - for dev in my_other_devices: + for device in my_other_devices: try: - cipher = self.get_session_cipher(from_jid, dev) - if self.isTrusted(cipher) == TRUSTED: - encrypted_keys[dev] = cipher.encrypt(key).serialize() + if self.isTrusted(from_jid, device) == TRUSTED: + cipher = self.get_session_cipher(from_jid, device) + encrypted_keys[device] = cipher.encrypt(key).serialize() else: log.debug('Skipped own Device because Trust is: ' + - str(self.isTrusted(cipher))) + str(self.isTrusted(from_jid, device))) except: - log.warning('Failed to find key for device ' + str(dev)) + log.warning('Failed to find key for device ' + str(device)) payload = encrypt(key, iv, plaintext) @@ -273,14 +266,10 @@ log.debug('Finished encrypting message') return result - def isTrusted(self, cipher): - self.cipher = cipher - self.state = self.cipher.sessionStore. \ - loadSession(self.cipher.recipientId, self.cipher.deviceId). \ - getSessionState() - self.key = self.state.getRemoteIdentityKey() - return self.store.identityKeyStore. \ - isTrustedIdentity(self.cipher.recipientId, self.key) + def isTrusted(self, recipient_id, device_id): + record = self.store.loadSession(recipient_id, device_id) + identity_key = record.getSessionState().getRemoteIdentityKey() + return self.store.isTrustedIdentity(recipient_id, identity_key) def getTrustedFingerprints(self, recipient_id): inactive = self.store.getInactiveSessionsKeys(recipient_id) @@ -364,10 +353,10 @@ def handleWhisperMessage(self, recipient_id, device_id, key): whisperMessage = WhisperMessage(serialized=key) - sessionCipher = self.get_session_cipher(recipient_id, device_id) log.debug(self.account + " => Received WhisperMessage from " + recipient_id) - if self.isTrusted(sessionCipher) >= TRUSTED: + if self.isTrusted(recipient_id, device_id): + sessionCipher = self.get_session_cipher(recipient_id, device_id) key = sessionCipher.decryptMsg(whisperMessage) return key else:

1 0

gajim-plugins: Further improve import error handling
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 658a55b36ce5 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=658a55b36ce5 description: Further improve import error handling diffstat: omemo/__init__.py | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diffs (51 lines): diff -r 866cf8a00b63 -r 658a55b36ce5 omemo/__init__.py --- a/omemo/__init__.py Wed Sep 07 00:22:20 2016 +0200 +++ b/omemo/__init__.py Wed Sep 14 22:43:10 2016 +0200 @@ -58,36 +58,37 @@ log = logging.getLogger('gajim.plugin_system.omemo') try: - from .omemo.state import OmemoState -except Exception as e: - log.error(e) - ERROR_MSG = 'Error: ' + str(e) - -try: - import google.protobuf + prototest = __import__('google.protobuf') except Exception as e: log.error(e) ERROR_MSG = PROTOBUF_MISSING try: - import axolotl + axolotltest = __import__('axolotl') except Exception as e: log.error(e) ERROR_MSG = AXOLOTL_MISSING +if not ERROR_MSG: + try: + from .omemo.state import OmemoState + except Exception as e: + log.error(e) + ERROR_MSG = 'Error: ' + str(e) + GAJIM_VER = gajim.config.get('version') if os.name != 'nt': try: SETUPTOOLS_MISSING = False - from pkg_resources import parse_version + pkg = __import__('pkg_resources') except Exception as e: log.error(e) SETUPTOOLS_MISSING = True ERROR_MSG = 'You are missing the Setuptools package.' if not SETUPTOOLS_MISSING: - if parse_version(GAJIM_VER) < parse_version('0.16.5'): + if pkg.parse_version(GAJIM_VER) < pkg.parse_version('0.16.5'): ERROR_MSG = GAJIM_VERSION # pylint: disable=no-init

1 0

gajim-plugins: Migrate DB name to jid instead of account name
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 94f78e560b6b in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=94f78e560b6b description: Migrate DB name to jid instead of account name JID is a more permanent identifier, because the account name can be changed in Gajim. The DB path is now in a profile DIR diffstat: omemo/__init__.py | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diffs (61 lines): diff -r 658a55b36ce5 -r 94f78e560b6b omemo/__init__.py --- a/omemo/__init__.py Wed Sep 14 22:43:10 2016 +0200 +++ b/omemo/__init__.py Sun Sep 18 01:59:27 2016 +0200 @@ -21,8 +21,9 @@ import logging import os import sqlite3 +import shutil -from common import caps_cache, gajim, ged +from common import caps_cache, gajim, ged, configpaths from common.pep import SUPPORTED_PERSONAL_USER_EVENTS from plugins import GajimPlugin from plugins.helpers import log_calls @@ -53,7 +54,8 @@ NS_HINTS = 'urn:xmpp:hints' NS_PGP = 'urn:xmpp:openpgp:0' -DB_DIR = gajim.gajimpaths.data_root +DB_DIR_OLD = gajim.gajimpaths.data_root +DB_DIR_NEW = configpaths.gajimpaths['MY_DATA'] log = logging.getLogger('gajim.plugin_system.omemo') @@ -126,6 +128,21 @@ self.announced = [] self.query_for_bundles = [] + def migrate_dbpath(self, account, my_jid): + old_dbpath = os.path.join(DB_DIR_OLD, 'omemo_' + account + '.db') + new_dbpath = os.path.join(DB_DIR_NEW, 'omemo_' + my_jid + '.db') + + if os.path.exists(old_dbpath): + log.debug('Migrating DBName and Path ..') + try: + shutil.move(old_dbpath, new_dbpath) + return new_dbpath + except Exception: + log.exception('Migration Error:') + return old_dbpath + + return new_dbpath + @log_calls('OmemoPlugin') def get_omemo_state(self, account): """ Returns the the OmemoState for the specified account. @@ -142,11 +159,10 @@ """ if account not in self.omemo_states: self.deactivate_gajim_e2e(account) - db_path = os.path.join(DB_DIR, 'omemo_' + account + '.db') + my_jid = gajim.get_jid_from_account(account) + db_path = self.migrate_dbpath(account, my_jid) + conn = sqlite3.connect(db_path, check_same_thread=False) - - my_jid = gajim.get_jid_from_account(account) - self.omemo_states[account] = OmemoState(my_jid, conn, account, self.plugin)

1 0

gajim-plugins: Show config dialog if there are no accounts
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset d0fcde466a48 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=d0fcde466a48 description: Show config dialog if there are no accounts Fixes:#118 diffstat: omemo/ui.py | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 12 deletions(-) diffs (96 lines): diff -r 94f78e560b6b -r d0fcde466a48 omemo/ui.py --- a/omemo/ui.py Sun Sep 18 01:59:27 2016 +0200 +++ b/omemo/ui.py Sun Sep 18 18:13:01 2016 +0200 @@ -266,11 +266,6 @@ self.device_model = gtk.ListStore(gobject.TYPE_STRING) - self.account_store = self.B.get_object('account_store') - - for account in sorted(gajim.contacts.get_accounts()): - self.account_store.append(row=(account,)) - self.fpr_view = self.B.get_object('fingerprint_view') self.fpr_view.set_model(self.fpr_model) self.fpr_view.get_selection().set_mode(gtk.SELECTION_MULTIPLE) @@ -278,19 +273,38 @@ self.device_view = self.B.get_object('deviceid_view') self.device_view.set_model(self.device_model) - if len(self.account_store) > 0: - self.B.get_object('account_combobox').set_active(0) - self.child.pack_start(self.B.get_object('notebook1')) self.B.connect_signals(self) def on_run(self): - self.update_context_list() - self.account_combobox_changed_cb(self.B.get_object('account_combobox')) + self.update_account_combobox() + self.clear_all() + if len(self.account_store) > 0: + self.account_combobox_changed_cb( + self.B.get_object('account_combobox')) + + def clear_all(self): + self.fpr_model.clear() + self.device_model.clear() + self.B.get_object('ID').set_markup('') + self.B.get_object('fingerprint_label').set_markup('') + self.B.get_object('trust_button').set_sensitive(False) + self.B.get_object('delfprbutton').set_sensitive(False) + self.B.get_object('refresh').set_sensitive(False) + self.B.get_object('cleardevice_button').set_sensitive(False) + + def update_account_combobox(self): + self.account_store = self.B.get_object('account_store') + self.account_store.clear() + for account in sorted(gajim.contacts.get_accounts()): + self.account_store.append(row=(account,)) + if len(self.account_store) > 0: + self.B.get_object('account_combobox').set_active(0) def account_combobox_changed_cb(self, box, *args): - self.update_context_list() + if len(self.account_store) > 0: + self.update_context_list() def delfpr_button_clicked(self, button, *args): active = self.B.get_object('account_combobox').get_active() @@ -429,8 +443,18 @@ self.device_model.clear() active = self.B.get_object('account_combobox').get_active() account = self.account_store[active][0] + + # Set buttons active + self.B.get_object('trust_button').set_sensitive(True) + self.B.get_object('delfprbutton').set_sensitive(True) + self.B.get_object('refresh').set_sensitive(True) + if account == 'Local': + self.B.get_object('cleardevice_button').set_sensitive(False) + else: + self.B.get_object('cleardevice_button').set_sensitive(True) + + # Set FPR Label and DeviceID state = self.plugin.get_omemo_state(account) - deviceid = state.own_device_id self.B.get_object('ID').set_markup('<tt>%s</tt>' % deviceid) @@ -440,6 +464,7 @@ self.B.get_object('fingerprint_label').set_markup('<tt>%s</tt>' % ownfpr) + # Set Fingerprint List trust_str = {0: 'False', 1: 'True', 2: 'Undecided'} session_db = state.store.getAllSessions() @@ -468,6 +493,7 @@ format(color[trust], fpr), deviceid)) + # Set Device ID List for item in state.own_devices: self.device_model.append([item])

1 0

gajim-plugins: Option to disable accounts for OMEMO
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 6b094611322a in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=6b094611322a description: Option to disable accounts for OMEMO diffstat: omemo/__init__.py | 78 ++++++++++++++++++------- omemo/config_dialog.ui | 146 +++++++++++++++++++++++++++++++++++++++++++++++- omemo/ui.py | 111 +++++++++++++++++++++++++++++++----- 3 files changed, 293 insertions(+), 42 deletions(-) diffs (truncated from 526 to 300 lines): diff -r d0fcde466a48 -r 6b094611322a omemo/__init__.py --- a/omemo/__init__.py Sun Sep 18 18:13:01 2016 +0200 +++ b/omemo/__init__.py Mon Sep 19 20:08:04 2016 +0200 @@ -127,6 +127,12 @@ self.plugin = self self.announced = [] self.query_for_bundles = [] + self.disabled_accounts = [] + + self.config_default_values = {'DISABLED_ACCOUNTS': ([], ''), } + + for account in self.plugin.config['DISABLED_ACCOUNTS']: + self.disabled_accounts.append(account) def migrate_dbpath(self, account, my_jid): old_dbpath = os.path.join(DB_DIR_OLD, 'omemo_' + account + '.db') @@ -157,6 +163,8 @@ ------- OmemoState """ + if account in self.disabled_accounts: + return if account not in self.omemo_states: self.deactivate_gajim_e2e(account) my_jid = gajim.get_jid_from_account(account) @@ -186,6 +194,8 @@ event : SignedInEvent """ account = event.conn.name + if account in self.disabled_accounts: + return log.debug(account + ' => Announce Support after Sign In') self.query_for_bundles = [] @@ -199,11 +209,15 @@ """ Method called when the Plugin is activated in the PluginManager """ self.query_for_bundles = [] - if NS_NOTIFY not in gajim.gajim_common_features: - gajim.gajim_common_features.append(NS_NOTIFY) - self._compute_caps_hash() - # Publish bundle information + # Publish bundle information and Entity Caps for account in gajim.connections: + if account in self.disabled_accounts: + log.debug(account + + ' => Account is disabled') + continue + if NS_NOTIFY not in gajim.gajim_optional_features[account]: + gajim.gajim_optional_features[account].append(NS_NOTIFY) + self._compute_caps_hash(account) if account not in self.announced: if gajim.account_is_connected(account): log.debug(account + @@ -218,23 +232,25 @@ Removes OMEMO from the Entity Capabilities list """ - if NS_NOTIFY in gajim.gajim_common_features: - gajim.gajim_common_features.remove(NS_NOTIFY) - self._compute_caps_hash() + for account in gajim.connections: + if account in self.disabled_accounts: + continue + if NS_NOTIFY in gajim.gajim_optional_features[account]: + gajim.gajim_optional_features[account].remove(NS_NOTIFY) + self._compute_caps_hash(account) @staticmethod - def _compute_caps_hash(): + def _compute_caps_hash(account): """ Computes the hash for Entity Capabilities and publishes it """ - for acc in gajim.connections: - gajim.caps_hash[acc] = caps_cache.compute_caps_hash( - [gajim.gajim_identity], - gajim.gajim_common_features + - gajim.gajim_optional_features[acc]) - # re-send presence with new hash - connected = gajim.connections[acc].connected - if connected > 1 and gajim.SHOW_LIST[connected] != 'invisible': - gajim.connections[acc].change_status( - gajim.SHOW_LIST[connected], gajim.connections[acc].status) + gajim.caps_hash[account] = caps_cache.compute_caps_hash( + [gajim.gajim_identity], + gajim.gajim_common_features + + gajim.gajim_optional_features[account]) + # re-send presence with new hash + connected = gajim.connections[account].connected + if connected > 1 and gajim.SHOW_LIST[connected] != 'invisible': + gajim.connections[account].change_status( + gajim.SHOW_LIST[connected], gajim.connections[account].status) @log_calls('OmemoPlugin') def mam_message_received(self, msg): @@ -251,12 +267,15 @@ ------- Return means that the Event is passed on to Gajim """ + account = msg.conn.name + if account in self.disabled_accounts: + return + if msg.msg_.getTag('openpgp', namespace=NS_PGP): return omemo_encrypted_tag = msg.msg_.getTag('encrypted', namespace=NS_OMEMO) if omemo_encrypted_tag: - account = msg.conn.name log.debug(account + ' => OMEMO MAM msg received') state = self.get_omemo_state(account) @@ -309,12 +328,15 @@ ------- Return means that the Event is passed on to Gajim """ + account = msg.conn.name + if account in self.disabled_accounts: + return + if msg.stanza.getTag('openpgp', namespace=NS_PGP): return if msg.stanza.getTag('encrypted', namespace=NS_OMEMO) and \ msg.mtype == 'chat': - account = msg.conn.name log.debug(account + ' => OMEMO msg received') state = self.get_omemo_state(account) @@ -379,6 +401,8 @@ Return if encryption is not activated """ account = event.account + if account in self.disabled_accounts: + return state = self.get_omemo_state(account) if not state.encryption.is_active(event.jid): @@ -401,11 +425,13 @@ Return if encryption is not activated or any other exception or error occurs """ + account = event.conn.name + if account in self.disabled_accounts: + return try: if not event.msg_iq.getTag('body'): return - account = event.conn.name state = self.get_omemo_state(account) full_jid = str(event.msg_iq.getAttr('to')) to_jid = gajim.get_jid_without_resource(full_jid) @@ -479,6 +505,11 @@ 4.2 Discovering peer support http://conversations.im/xeps/multi-end.html#usecases-discovering """ + + account = event.conn.name + if account in self.disabled_accounts: + return False + if event.pep_type != 'headline': return False @@ -486,7 +517,6 @@ event.conn.name))) if len(devices_list) == 0: return False - account = event.conn.name contact_jid = gajim.get_jid_without_resource(event.fjid) state = self.get_omemo_state(account) my_jid = gajim.get_jid_from_account(account) @@ -573,6 +603,8 @@ Gajim ChatControl object """ account = chat_control.contact.account.name + if account in self.disabled_accounts: + return contact_jid = chat_control.contact.jid if account not in self.ui_list: self.ui_list[account] = {} @@ -604,6 +636,8 @@ """ contact_jid = chat_control.contact.jid account = chat_control.contact.account.name + if account in self.disabled_accounts: + return self.ui_list[account][contact_jid].removeUi() def are_keys_missing(self, account, contact_jid): diff -r d0fcde466a48 -r 6b094611322a omemo/config_dialog.ui --- a/omemo/config_dialog.ui Sun Sep 18 18:13:01 2016 +0200 +++ b/omemo/config_dialog.ui Mon Sep 19 20:08:04 2016 +0200 @@ -4,7 +4,7 @@  <object class="GtkListStore" id="account_store"> <columns> -  +  <column type="gchararray"/> </columns> </object> @@ -14,6 +14,12 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkListStore" id="disabled_account_store"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkListStore" id="fingerprint_store"> <columns>  @@ -106,7 +112,6 @@ <object class="GtkLabel" id="fingerprint_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label"><tt>-------- -------- -------- -------- -------- </tt></property> <property name="use_markup">True</property> <property name="selectable">True</property> </object> @@ -149,7 +154,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">0</property> </object> <packing> <property name="expand">False</property> @@ -417,6 +421,142 @@ <property name="tab_fill">False</property> </packing> </child> + <child> + <object class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="spacing">5</property> + <child> + <object class="GtkVBox" id="vbox5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="active_accounts_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">account_store</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <property name="title" translatable="yes">Active Accounts</property> + <property name="alignment">0.5</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext5"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="disable_accounts_btn"> + <property name="label" translatable="yes">Disable Account</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="disable_accounts_btn_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox2">

1 0

gajim-plugins: Add GroupChat
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset cea2e7b54062 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=cea2e7b54062 description: Add GroupChat diffstat: omemo/__init__.py | 126 +++++++++++++++++++++++++++++++++++++-- omemo/omemo/liteaxolotlstore.py | 3 + omemo/omemo/litesessionstore.py | 10 +++ omemo/omemo/state.py | 102 +++++++++++++++++++++++++++---- omemo/ui.py | 112 ++++++++++++++++++++++++++++++----- 5 files changed, 314 insertions(+), 39 deletions(-) diffs (truncated from 565 to 300 lines): diff -r 6b094611322a -r cea2e7b54062 omemo/__init__.py --- a/omemo/__init__.py Mon Sep 19 20:08:04 2016 +0200 +++ b/omemo/__init__.py Sun Oct 09 02:20:56 2016 +0200 @@ -22,6 +22,7 @@ import os import sqlite3 import shutil +import message_control from common import caps_cache, gajim, ged, configpaths from common.pep import SUPPORTED_PERSONAL_USER_EVENTS @@ -101,6 +102,7 @@ omemo_states = {} ui_list = {} + groupchat = {} @log_calls('OmemoPlugin') def init(self): @@ -119,15 +121,24 @@ (ged.PRECORE, self.handle_outgoing_stanza), 'message-outgoing': (ged.PRECORE, self.handle_outgoing_event), + 'gc-stanza-message-outgoing': + (ged.PRECORE, self.handle_outgoing_gc_stanza), + 'gc-presence-received': + (ged.PRECORE, self.gc_presence_received), + 'gc-config-changed-received': + (ged.PRECORE, self.gc_config_changed_received), } self.config_dialog = ui.OMEMOConfigDialog(self) self.gui_extension_points = {'chat_control': (self.connect_ui, - self.disconnect_ui)} + self.disconnect_ui), + 'groupchat_control': (self.connect_ui, + self.disconnect_ui)} SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP) self.plugin = self self.announced = [] self.query_for_bundles = [] self.disabled_accounts = [] + self.gc_message = {} self.config_default_values = {'DISABLED_ACCOUNTS': ([], ''), } @@ -335,8 +346,7 @@ if msg.stanza.getTag('openpgp', namespace=NS_PGP): return - if msg.stanza.getTag('encrypted', namespace=NS_OMEMO) and \ - msg.mtype == 'chat': + if msg.stanza.getTag('encrypted', namespace=NS_OMEMO): log.debug(account + ' => OMEMO msg received') state = self.get_omemo_state(account) @@ -345,14 +355,29 @@ log.debug('message was forwarded doing magic') else: from_jid = str(msg.stanza.getFrom()) + + if msg.mtype == 'groupchat': + from_jid = self.groupchat[msg.jid][msg.resource] + self.print_msg_to_log(msg.stanza) msg_dict = unpack_encrypted(msg.stanza.getTag ('encrypted', namespace=NS_OMEMO)) - msg_dict['sender_jid'] = gajim.get_jid_without_resource(from_jid) - plaintext = state.decrypt_msg(msg_dict) + + plaintext = '' + if msg_dict['sid'] == state.own_device_id: + if msg_dict['payload'] in self.gc_message: + plaintext = self.gc_message[msg_dict['payload']] + del self.gc_message[msg_dict['payload']] + else: + log.error(account + ' => Cant decrypt GroupChat Message ' + 'from ' + from_jid) + else: + msg_dict['sender_jid'] = gajim. \ + get_jid_without_resource(from_jid) + plaintext = state.decrypt_msg(msg_dict) if not plaintext: - return + return True msg.msgtxt = plaintext # Gajim bug: there must be a body or the message @@ -365,7 +390,7 @@ self.ui_list[account][contact_jid].activate_omemo() return False - elif msg.stanza.getTag('body') and msg.mtype == 'chat': + elif msg.stanza.getTag('body'): account = msg.conn.name from_jid = str(msg.stanza.getFrom()) @@ -386,6 +411,86 @@ ', Ui Warning not shown') @log_calls('OmemoPlugin') + def gc_presence_received(self, event): + if not event.real_jid: + return + room = event.room_jid + account = event.conn.name + jid = gajim.get_jid_without_resource(event.real_jid) + nick = event.nick + + if room not in self.groupchat: + self.groupchat[room] = {} + + if nick not in self.groupchat[room]: + self.groupchat[room][nick] = jid + + log.debug('PRESENCE RECEIVED') + log.debug(self.groupchat[room]) + + if '100' in event.status_code: + self.ui_list[account][room].sensitive(True) + + @log_calls('OmemoPlugin') + def gc_config_changed_received(self, event): + log.debug('CONFIG CHANGE') + log.debug(event.room_jid) + log.debug(event.status_code) + + def handle_outgoing_gc_stanza(self, event): + """ Manipulates the outgoing groupchat stanza + + The body is getting encrypted + + Parameters + ---------- + event : StanzaMessageOutgoingEvent + + Returns + ------- + Return if encryption is not activated or any other + exception or error occurs + """ + try: + if not event.msg_iq.getTag('body'): + return + account = event.conn.name + state = self.get_omemo_state(account) + full_jid = str(event.msg_iq.getAttr('to')) + to_jid = gajim.get_jid_without_resource(full_jid) + if not state.encryption.is_active(to_jid): + return + # Delete previous Message out of Correction Message Stanza + if event.msg_iq.getTag('replace', namespace=NS_CORRECT): + event.msg_iq.delChild('encrypted', attrs={'xmlns': NS_OMEMO}) + + plaintext = event.msg_iq.getBody().encode('utf8') + msg_dict = state.create_gc_msg( + gajim.get_jid_from_account(account), to_jid, plaintext) + if not msg_dict: + return True + + self.gc_message[msg_dict['payload']] = plaintext + encrypted_node = OmemoMessage(msg_dict) + event.msg_iq.delChild('body') + event.msg_iq.addChild(node=encrypted_node) + + # XEP-xxxx: Explicit Message Encryption + if not event.msg_iq.getTag('encrypted', attrs={'xmlns': NS_EME}): + eme_node = Node('encrypted', attrs={'xmlns': NS_EME, + 'name': 'OMEMO', + 'namespace': NS_OMEMO}) + event.msg_iq.addChild(node=eme_node) + + # Store Hint for MAM + store = Node('store', attrs={'xmlns': NS_HINTS}) + event.msg_iq.addChild(node=store) + self.print_msg_to_log(event.msg_iq) + except Exception as e: + log.debug(e) + return True + + @log_calls('OmemoPlugin') def handle_outgoing_event(self, event): """ Handles a message outgoing event @@ -625,6 +730,11 @@ else: log.warning(account + " => No devices for " + contact_jid) + if chat_control.type_id == message_control.TYPE_GC: + self.ui_list[account][contact_jid] = Ui(self, chat_control, + omemo_enabled, state) + self.ui_list[account][contact_jid].sensitive(False) + @log_calls('OmemoPlugin') def disconnect_ui(self, chat_control): """ Calls the removeUi method to remove all relatad UI objects. @@ -663,7 +773,7 @@ if my_jid not in self.query_for_bundles: devices_without_session = state \ - .devices_without_sessions(my_jid) + .devices_without_sessions(my_jid) self.query_for_bundles.append(my_jid) diff -r 6b094611322a -r cea2e7b54062 omemo/omemo/liteaxolotlstore.py --- a/omemo/omemo/liteaxolotlstore.py Mon Sep 19 20:08:04 2016 +0200 +++ b/omemo/omemo/liteaxolotlstore.py Sun Oct 09 02:20:56 2016 +0200 @@ -148,6 +148,9 @@ def getSessionsFromJid(self, recipientId): return self.sessionStore.getSessionsFromJid(recipientId) + def getSessionsFromJids(self, recipientId): + return self.sessionStore.getSessionsFromJids(recipientId) + def getAllSessions(self): return self.sessionStore.getAllSessions() diff -r 6b094611322a -r cea2e7b54062 omemo/omemo/litesessionstore.py --- a/omemo/omemo/litesessionstore.py Mon Sep 19 20:08:04 2016 +0200 +++ b/omemo/omemo/litesessionstore.py Sun Oct 09 02:20:56 2016 +0200 @@ -99,6 +99,16 @@ result.append((row[0], row[1], row[2], row[3], row[4])) return result + def getSessionsFromJids(self, recipientId): + q = "SELECT _id, recipient_id, device_id, record, active from sessions" \ + " WHERE recipient_id IN ({})" \ + .format(', '.join(['?'] * len(recipientId))) + c = self.dbConn.cursor() + result = [] + for row in c.execute(q, recipientId): + result.append((row[0], row[1], row[2], row[3], row[4])) + return result + def setActiveState(self, deviceList, jid): c = self.dbConn.cursor() diff -r 6b094611322a -r cea2e7b54062 omemo/omemo/state.py --- a/omemo/omemo/state.py Mon Sep 19 20:08:04 2016 +0200 +++ b/omemo/omemo/state.py Sun Oct 09 02:20:56 2016 +0200 @@ -266,6 +266,94 @@ log.debug('Finished encrypting message') return result + def create_gc_msg(self, from_jid, jid, plaintext): + key = get_random_bytes(16) + iv = get_random_bytes(16) + encrypted_keys = {} + room = jid + + devices_list = self.device_list_for(jid, True) + + if len(devices_list) == 0: + log.error('No known devices') + return + + for tup in devices_list: + self.get_session_cipher(tup[0], tup[1]) + + # Encrypt the message key with for each of receivers devices + for nick in self.plugin.groupchat[room]: + jid_to = self.plugin.groupchat[room][nick] + if jid_to == self.own_jid: + continue + for rid, cipher in self.session_ciphers[jid_to].items(): + try: + if self.isTrusted(jid_to, rid) == TRUSTED: + encrypted_keys[rid] = cipher.encrypt(key). \ + serialize() + else: + log.debug('Skipped Device because Trust is: ' + + str(self.isTrusted(jid_to, rid))) + except: + log.exception('ERROR:') + log.warning('Failed to find key for device ' + + str(rid)) + + if len(encrypted_keys) == 0: + log_msg = 'Encrypted keys empty' + log.error(log_msg) + raise NoValidSessions(log_msg) + + my_other_devices = set(self.own_devices) - set({self.own_device_id}) + # Encrypt the message key with for each of our own devices + for dev in my_other_devices: + try: + cipher = self.get_session_cipher(from_jid, dev) + if self.isTrusted(jid_to, dev) == TRUSTED: + encrypted_keys[dev] = cipher.encrypt(key).serialize() + else: + log.debug('Skipped own Device because Trust is: ' + + str(self.isTrusted(jid_to, dev))) + except: + log.warning('Failed to find key for device ' + str(dev)) + + payload = encrypt(key, iv, plaintext) + + result = {'sid': self.own_device_id, + 'keys': encrypted_keys,

1 0

gajim: Add no-store hint to ChatStates
by Gajim 18 Oct '16

18 Oct '16

changeset da49257cc3ce in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=da49257cc3ce description: Add no-store hint to ChatStates diffstat: src/common/connection.py | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diffs (39 lines): diff -r 74824f0bd5d4 -r da49257cc3ce src/common/connection.py --- a/src/common/connection.py Mon Oct 17 02:44:58 2016 +0200 +++ b/src/common/connection.py Tue Oct 18 16:26:03 2016 +0200 @@ -481,6 +481,12 @@ # <body> tag is the active event if chatstate and contact and contact.supports(nbxmpp.NS_CHATSTATES): msg_iq.setTag(chatstate, namespace=nbxmpp.NS_CHATSTATES) + only_chatste = False + if not msgtxt: + only_chatste = True + if only_chatste and not session.enable_encryption: + msg_iq.setTag('no-store', + namespace=nbxmpp.NS_MSG_HINTS) # XEP-0184 if msgtxt and gajim.config.get_per('accounts', self.name, @@ -504,15 +510,18 @@ msg_iq = session.encrypt_stanza(msg_iq) if self.carbons_enabled: msg_iq.addChild(name='private', - namespace=nbxmpp.NS_CARBONS) + namespace=nbxmpp.NS_CARBONS) msg_iq.addChild(name='no-permanent-store', - namespace=nbxmpp.NS_MSG_HINTS) + namespace=nbxmpp.NS_MSG_HINTS) msg_iq.addChild(name='no-copy', - namespace=nbxmpp.NS_MSG_HINTS) + namespace=nbxmpp.NS_MSG_HINTS) + if only_chatste: + msg_iq.addChild(name='no-store', + namespace=nbxmpp.NS_MSG_HINTS) if callback: callback(jid, msg, keyID, forward_from, session, original_message, - subject, type_, msg_iq, xhtml) + subject, type_, msg_iq, xhtml) def log_message(self, jid, msg, forward_from, session, original_message, subject, type_, xhtml=None, additional_data={}):

1 0

gajim-plugins: Use correct timeformat and rewrite show/hide code...
by Gajim Plugins 17 Oct '16

17 Oct '16

changeset 1063fb15f4da in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=1063fb15f4da description: Use correct timeformat and rewrite show/hide code - Fixes #8447 diffstat: appindicator_integration/manifest.ini | 2 +- appindicator_integration/plugin.py | 54 +++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 22 deletions(-) diffs (124 lines): diff -r c7c2e519ed63 -r 1063fb15f4da appindicator_integration/manifest.ini --- a/appindicator_integration/manifest.ini Sun Oct 09 00:45:45 2016 +0200 +++ b/appindicator_integration/manifest.ini Mon Oct 17 15:14:30 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Appindicator integration short_name: appindicator_integration -version: 0.1.5 +version: 0.1.6 description: This plugin integrates Gajim with the appindicator. You must have python-appindicator (and Gajim obviously) installed to enable this plugin. Rewriten from Ubuntu Ayatana Integration plugin homepage: http://trac-plugins.gajim.org/wiki/AppindicatorSupportPlugin diff -r c7c2e519ed63 -r 1063fb15f4da appindicator_integration/plugin.py --- a/appindicator_integration/plugin.py Sun Oct 09 00:45:45 2016 +0200 +++ b/appindicator_integration/plugin.py Mon Oct 17 15:14:30 2016 +0200 @@ -10,13 +10,16 @@ import os import time import gobject -#GTK +# GTK import gtkgui_helpers import gtk +ERRORMSG = '' try: import appindicator except: - appindicator = None + ERRORMSG = 'python-appindicator is missing! Please install it.' +if os.name == 'nt': + ERRORMSG = 'This is a Plugin for Linux' # Gajim from common import gajim, ged from plugins import GajimPlugin @@ -28,16 +31,15 @@ @log_calls("AppindicatorIntegrationPlugin") def init(self): - self.config_dialog = None - self.test_activatable() - self.events_handlers = {'our-show': (ged.GUI2, self.set_indicator_icon)} - - - def test_activatable(self): - self.available_text = '' - if not appindicator: + if ERRORMSG: self.activatable = False - self.available_text += _(' Error: python-appindicator is missing! Please install it.') + self.available_text += _(ERRORMSG) + return + else: + self.config_dialog = None + self.events_handlers = {'our-show': (ged.GUI2, + self.set_indicator_icon)} + self.windowstate = None @log_calls("AppindicatorIntegrationPlugin") def activate(self): @@ -85,18 +87,28 @@ gajim.events.event_added_subscribe(self.on_event_added) gajim.events.event_removed_subscribe(self.on_event_removed) + self.roster = gajim.interface.roster.window + self.handlerid = self.roster.connect('window-state-event', + self.window_state_event_cb) + def connect(self, widget, data=None): for account in gajim.connections: if gajim.config.get_per('accounts', account, - 'sync_with_global_status'): - gajim.connections[account].change_status('online','online') + 'sync_with_global_status'): + gajim.connections[account].change_status('online', + 'online') + def window_state_event_cb(self, win, event): + if event.new_window_state & gtk.gdk.WINDOW_STATE_ICONIFIED: + self.windowstate = 'iconified' + elif event.new_window_state & gtk.gdk.WINDOW_STATE_WITHDRAWN: + self.windowstate = 'hidden' def set_indicator_icon(self, obj=''): is_connected = 0 for account in gajim.connections: if not gajim.config.get_per('accounts', account, - 'sync_with_global_status'): + 'sync_with_global_status'): continue if gajim.account_is_connected(account): is_connected = 1 @@ -119,17 +131,17 @@ self.indicator.set_status(appindicator.STATUS_PASSIVE) del self.indicator + self.roster.disconnect(self.handlerid) + def roster_raise(self, widget, data=None): win = gajim.interface.roster.window - if win.is_active(): + if win.get_property("visible") and self.windowstate != 'iconified': gobject.idle_add(win.hide) else: win.present() - # preserve the 'steal focus preservation' - #if self._is_first(): - # win.window.focus(gtk.get_current_event_time()) - #else: - win.window.focus(long(time.time())) + self.windowstate = 'shown' + + win.window.focus(gtk.get_current_event_time()) def on_exit_menuitem_activate(self, widget, data=None): gajim.interface.roster.on_quit_request() @@ -143,7 +155,7 @@ def on_event_added(self, event): account = event.account jid = event.jid - when = time.time() + when = time.localtime() contact = "" key = (account, jid)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits