Commits January 2016

commits@gajim.org

1 participants
71 discussions

gajim-plugins: Remove unnecessary import in ui.py
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 579b6705b3af in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=579b6705b3af description: Remove unnecessary import in ui.py diffstat: omemo/ui.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 9c09a43a9b7f -r 579b6705b3af omemo/ui.py --- a/omemo/ui.py Mon Jan 04 15:19:23 2016 +0100 +++ b/omemo/ui.py Wed Jan 06 17:17:00 2016 +0100 @@ -21,7 +21,8 @@ import logging import gtk -from message_control import TYPE_CHAT, MessageControl + +from message_control import TYPE_CHAT log = logging.getLogger('gajim.plugin_system.omemo')

1 0

gajim-plugins: Fix hiding OMEMO controls in muc
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset afea66b4f4b5 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=afea66b4f4b5 description: Fix hiding OMEMO controls in muc - This reverts commit 85e09c60befb4de69fb6559c8dc895dc8c655917. - Uses `chat_control` instead of `chat_control_base` as `gui_extension_point`. diffstat: omemo/__init__.py | 2 +- omemo/ui.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diffs (41 lines): diff -r c6b1b4ed02c0 -r afea66b4f4b5 omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 18:40:32 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 18:56:48 2016 +0100 @@ -54,7 +54,7 @@ (ged.PRECORE, self.handle_outgoing_msgs), } self.config_dialog = None - self.gui_extension_points = {'chat_control_base': + self.gui_extension_points = {'chat_control': (self.connect_ui, None)} SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP) diff -r c6b1b4ed02c0 -r afea66b4f4b5 omemo/ui.py --- a/omemo/ui.py Thu Jan 07 18:40:32 2016 +0100 +++ b/omemo/ui.py Thu Jan 07 18:56:48 2016 +0100 @@ -22,8 +22,6 @@ import gtk -from message_control import TYPE_CHAT - log = logging.getLogger('gajim.plugin_system.omemo') # from plugins.helpers import log @@ -104,13 +102,11 @@ self.toggle_omemo(available) self.checkbox.set_active(plugin.is_omemo_enabled(contact)) - self.chat_control = chat_control - if chat_control.TYPE_ID == TYPE_CHAT: - _add_widget(self.prekey_button, chat_control) - _add_widget(self.checkbox, chat_control) - _add_widget(self.clear_button, chat_control) + _add_widget(self.prekey_button, chat_control) + _add_widget(self.checkbox, chat_control) + _add_widget(self.clear_button, chat_control) def toggle_omemo(self, available): if available:

1 0

gajim-plugins: Show encrypted icon instead encrypted+authenticated
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset c6b1b4ed02c0 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=c6b1b4ed02c0 description: Show encrypted icon instead encrypted+authenticated diffstat: omemo/ui.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (17 lines): diff -r ea6c1ff93734 -r c6b1b4ed02c0 omemo/ui.py --- a/omemo/ui.py Thu Jan 07 16:38:51 2016 +0100 +++ b/omemo/ui.py Thu Jan 07 18:40:32 2016 +0100 @@ -76,11 +76,10 @@ log.info('Clicked ' + str(enabled)) if enabled: self.plugin.omemo_enable_for(self.contact) - self.chat_control._show_lock_image(True, 'OMEMO', True, True, True) + self.chat_control._show_lock_image(True, 'OMEMO', True, True, False) else: self.plugin.omemo_disable_for(self.contact) - self.chat_control._show_lock_image(False, 'OMEMO', False, True, - False) + self.chat_control._show_lock_image(False, 'OMEMO', False, True, False) def _add_widget(widget, chat_control):

1 0

gajim-plugins: Set max length for flake8 to 80 chars
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset ea6c1ff93734 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=ea6c1ff93734 description: Set max length for flake8 to 80 chars diffstat: omemo/setup.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (5 lines): diff -r 579b6705b3af -r ea6c1ff93734 omemo/setup.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/setup.cfg Thu Jan 07 16:38:51 2016 +0100 @@ -0,0 +1,1 @@ +max-line-length=80

1 0

gajim-plugins: Fix typo in documentation
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 9f0a252af47d in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=9f0a252af47d description: Fix typo in documentation diffstat: omemo/__init__.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (19 lines): diff -r dc5eb91fd958 -r 9f0a252af47d omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 20:59:10 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:28:42 2016 +0100 @@ -433,13 +433,14 @@ @log_calls('OmemoPlugin') def omemo_disable_for(self, contact): """ Used by the ui to disable omemo for a specified contact """ + # TODO Migrate this account = contact.account.name state = self.get_omemo_state(account) state.omemo_enabled.remove(contact.jid) @log_calls('OmemoPlugin') def has_omemo(self, contact): - """ Used by the ui to find out if omemo controls shoudl be displayed for + """ Used by the ui to find out if omemo controls should be displayed for the given contact. Returns

1 0

gajim-plugins: Minor logging fixes
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset da28f1663cf5 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=da28f1663cf5 description: Minor logging fixes diffstat: omemo/__init__.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (24 lines): diff -r c9713578565f -r da28f1663cf5 omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 21:08:02 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:03:06 2016 +0100 @@ -171,10 +171,8 @@ state = self.get_omemo_state(account) my_jid = gajim.get_jid_from_account(account) - log.debug(account + ' ⇒ Received OMEMO pep for jid ' + contact_jid) - if contact_jid == my_jid: - log.debug(state.name + ' ⇒ Received own device_list ' + str( + log.debug(state.name + ' ⇒ Received own device_list:' + str( devices_list)) state.add_own_devices(devices_list) @@ -187,6 +185,8 @@ devices_list.append(state.own_device_id) self.publish_own_devices_list(state) else: + log.debug(account + ' ⇒ Received device_list for ' + contact_jid + + ':' + devices_list) state.add_devices(contact_jid, devices_list) if account in self.ui_list and contact_jid in self.ui_list[ account]:

1 0

gajim-plugins: Document OmemoPlugin.query_prekey
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset c9713578565f in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=c9713578565f description: Document OmemoPlugin.query_prekey diffstat: omemo/__init__.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (20 lines): diff -r 9f0a252af47d -r c9713578565f omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 21:28:42 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:08:02 2016 +0100 @@ -239,10 +239,13 @@ del iq_ids_to_callbacks[id_] @log_calls('OmemoPlugin') - def query_prekey(self, contact): - account = contact.account.name + def query_prekey(self, recipient): + """ Calls OmemoPlugin.fetch_device_bundle_information() for each own or + recipient device key missing. + """ + account = recipient.account.name state = self.get_omemo_state(account) - to_jid = contact.jid + to_jid = recipient.jid my_jid = gajim.get_jid_from_account(account) for device_id in state.devices_without_sessions(to_jid): self.fetch_device_bundle_information(state, to_jid, device_id)

1 0

gajim-plugins: Document get_omemo_state & signed_in
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset dc5eb91fd958 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=dc5eb91fd958 description: Document get_omemo_state & signed_in diffstat: omemo/__init__.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (22 lines): diff -r afea66b4f4b5 -r dc5eb91fd958 omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 18:56:48 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 20:59:10 2016 +0100 @@ -60,12 +60,18 @@ @log_calls('OmemoPlugin') def get_omemo_state(self, account): + """ Returns the the OmemoState for specified account. Creates the + OmemoState if it does not exist yet. + """ if account not in self.omemo_states: self.omemo_states[account] = OmemoState(account) return self.omemo_states[account] @log_calls('OmemoPlugin') def signed_in(self, show): + """ + On sign in announce OMEMO support for each account. + """ account = show.conn.name state = self.get_omemo_state(account) self.announce_support(state)

1 0

gajim-plugins: Shorten fetch_device_bundle_information log
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset d78f799c5652 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=d78f799c5652 description: Shorten fetch_device_bundle_information log diffstat: omemo/__init__.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r da28f1663cf5 -r d78f799c5652 omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 21:03:06 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:08:16 2016 +0100 @@ -186,7 +186,7 @@ self.publish_own_devices_list(state) else: log.debug(account + ' ⇒ Received device_list for ' + contact_jid + - ':' + devices_list) + ':' + str(devices_list)) state.add_devices(contact_jid, devices_list) if account in self.ui_list and contact_jid in self.ui_list[ account]: @@ -267,8 +267,8 @@ device_id : int The device_id for which we are missing an axolotl session """ - log.debug(state.name + '→ Fetch bundle information for dev ' + str( - device_id) + ' and jid ' + jid) + log.debug(state.name + '→ Fetch bundle device ' + str(device_id) + '#' + + jid) iq = BundleInformationQuery(jid, device_id) iq_id = str(iq.getAttr('id')) iq_ids_to_callbacks[iq_id] = \

1 0

gajim-plugins: Replace is_omemo_enabled with an init var
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 99f455f0dd0f in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=99f455f0dd0f description: Replace is_omemo_enabled with an init var diffstat: omemo/__init__.py | 10 +++------- omemo/ui.py | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diffs (48 lines): diff -r d78f799c5652 -r 99f455f0dd0f omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 21:08:16 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:36:26 2016 +0100 @@ -214,7 +214,9 @@ jid = chat_control.contact.jid if account not in self.ui_list: self.ui_list[account] = {} - self.ui_list[account][jid] = Ui(self, chat_control) + state = self.get_omemo_state(account) + omemo_enabled = jid in state.omemo_enabled + self.ui_list[account][jid] = Ui(self, chat_control, omemo_enabled) def are_keys_missing(self, contact): """ Used by the ui to set the state of the PreKeyButton. """ @@ -421,12 +423,6 @@ return True @log_calls('OmemoPlugin') - def is_omemo_enabled(self, contact): - account = contact.account.name - state = self.get_omemo_state(account) - return contact.jid in state.omemo_enabled - - @log_calls('OmemoPlugin') def omemo_enable_for(self, contact): """ Used by the ui to enable omemo for a specified contact """ account = contact.account.name diff -r d78f799c5652 -r 99f455f0dd0f omemo/ui.py --- a/omemo/ui.py Thu Jan 07 21:08:16 2016 +0100 +++ b/omemo/ui.py Thu Jan 07 21:36:26 2016 +0100 @@ -92,7 +92,7 @@ last_msg_plain = True - def __init__(self, plugin, chat_control): + def __init__(self, plugin, chat_control, enabled): contact = chat_control.contact self.prekey_button = PreKeyButton(plugin, contact) self.checkbox = Checkbox(plugin, chat_control) @@ -101,7 +101,7 @@ available = plugin.has_omemo(contact) self.toggle_omemo(available) - self.checkbox.set_active(plugin.is_omemo_enabled(contact)) + self.checkbox.set_active(enabled) self.chat_control = chat_control _add_widget(self.prekey_button, chat_control)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2016