Commits January 2016

commits@gajim.org

1 participants
71 discussions

gajim-plugins: Remove all state.name calls
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset de81e637127d in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=de81e637127d description: Remove all state.name calls diffstat: omemo/__init__.py | 66 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 38 insertions(+), 28 deletions(-) diffs (189 lines): diff -r 8f9c6813cde8 -r de81e637127d omemo/__init__.py --- a/omemo/__init__.py Wed Jan 13 20:22:22 2016 +0100 +++ b/omemo/__init__.py Wed Jan 13 20:32:50 2016 +0100 @@ -84,8 +84,7 @@ On sign in announce OMEMO support for each account. """ account = show.conn.name - state = self.get_omemo_state(account) - self.announce_support(state) + self.announce_support(account) @log_calls('OmemoPlugin') def activate(self): @@ -183,7 +182,7 @@ my_jid = gajim.get_jid_from_account(account_name) if contact_jid == my_jid: - log.info(state.name + ' ⇒ Received own device_list:' + str( + log.info(account_name + ' ⇒ Received own device_list:' + str( devices_list)) state.add_own_devices(devices_list) @@ -194,7 +193,7 @@ # also remove duplicates devices_list = list(set(state.own_devices)) devices_list.append(state.own_device_id) - self.publish_own_devices_list(state) + self.publish_own_devices_list(account_name, state) else: log.info(account_name + ' ⇒ Received device_list for ' + contact_jid + ':' + str(devices_list)) @@ -213,14 +212,14 @@ return True @log_calls('OmemoPlugin') - def publish_own_devices_list(self, state): + def publish_own_devices_list(self, account_name, state): devices_list = state.own_devices devices_list += [state.own_device_id] - log.debug(state.name + ' ⇒ Publishing own devices_list ' + str( + log.debug(account_name + ' ⇒ Publishing own devices_list ' + str( devices_list)) iq = DeviceListAnnouncement(devices_list) - gajim.connections[state.name].connection.send(iq) + gajim.connections[account_name].connection.send(iq) id_ = str(iq.getAttr('id')) iq_ids_to_callbacks[id_] = lambda event: log.debug(event) @@ -274,18 +273,23 @@ 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) + self.fetch_device_bundle_information(account, state, to_jid, + device_id) for device_id in state.own_devices_without_sessions(my_jid): - self.fetch_device_bundle_information(state, my_jid, device_id) + self.fetch_device_bundle_information(account, state, my_jid, + device_id) @log_calls('OmemoPlugin') - def fetch_device_bundle_information(self, state, jid, device_id): + def fetch_device_bundle_information(self, account_name, state, jid, + device_id): """ Fetch bundle information for specified jid, key, and create axolotl session on success. Parameters ---------- + account_name : str + The account name state : (OmemoState) The OmemoState which is missing device bundle information jid : str @@ -293,18 +297,19 @@ device_id : int The device_id for which we are missing an axolotl session """ - log.debug(state.name + '→ Fetch bundle device ' + str(device_id) + '#' + log.debug(account_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] = \ - lambda stanza: self.session_from_prekey_bundle(state, stanza, - jid, device_id) - gajim.connections[state.name].connection.send(iq) + lambda stanza: self.session_from_prekey_bundle(account_name, state, + stanza, jid, + device_id) + gajim.connections[account_name].connection.send(iq) @log_calls('OmemoPlugin') - def session_from_prekey_bundle(self, state, stanza, recipient_id, - device_id): + def session_from_prekey_bundle(self, account_name, state, stanza, + recipient_id, device_id): """ Starts a session when a bundle information announcement is received. @@ -325,6 +330,8 @@ Parameters: ----------- + account_name : str + The account name state : (OmemoState) The OmemoState used stanza @@ -341,7 +348,7 @@ return if state.build_session(recipient_id, device_id, bundle_dict): - self.update_prekeys(state.name, recipient_id) + self.update_prekeys(account_name, recipient_id) @log_calls('OmemoPlugin') def update_prekeys(self, account, recipient_id): @@ -368,23 +375,23 @@ Parameters ---------- account : str - The account name + the account name See also -------- 4.3 Announcing bundle information: http://conversations.im/xeps/multi-end.html#usecases-announcing """ - state = self.get_omemo_state(account.name) + state = self.get_omemo_state(account) iq = BundleInformationAnnouncement(state.bundle, state.own_device_id) - gajim.connections[state.name].connection.send(iq) + gajim.connections[account].connection.send(iq) id_ = str(iq.getAttr("id")) - log.debug(account.name + " → Announcing OMEMO support via PEP") + log.debug(account + " → Announcing OMEMO support via PEP") iq_ids_to_callbacks[id_] = lambda stanza: \ - self.handle_announcement_result(stanza, state) + self.handle_announcement_result(account, stanza, state) @log_calls('OmemoPlugin') - def handle_announcement_result(self, stanza, state): + def handle_announcement_result(self, account, stanza, state): """ Updates own device list if announcement was successfull. If the OMEMO support announcement was successfull update own device @@ -392,11 +399,14 @@ Parameters ---------- + account : str + the account name stanza The stanza object received from callback + state : (OmemoState) + The OmemoState used """ - account = state.name state = self.get_omemo_state(account) if successful(stanza): log.debug(account + ' → Publishing bundle was successful') @@ -414,9 +424,9 @@ state = self.get_omemo_state(account) devices_list = [state.own_device_id] - log.info(state.name + ' ⇒ Clearing devices_list ' + str(devices_list)) + log.info(account + ' ⇒ Clearing devices_list ' + str(devices_list)) iq = DeviceListAnnouncement(devices_list) - connection = gajim.connections[state.name].connection + connection = gajim.connections[account].connection if not connection: # not connected return connection.send(iq) @@ -435,8 +445,8 @@ if not state.encryption.is_active(to_jid): return False try: - msg_dict = state.create_msg( - gajim.get_jid_from_account(account), to_jid, plaintext) + msg_dict = state.create_msg(gajim.get_jid_from_account(account), + to_jid, plaintext) if not msg_dict: return True encrypted_node = OmemoMessage(msg_dict)

1 0

gajim-plugins: Fix sqlite db intialization
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset ac571cc010ff in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=ac571cc010ff description: Fix sqlite db intialization diffstat: omemo/__init__.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (32 lines): diff -r de81e637127d -r ac571cc010ff omemo/__init__.py --- a/omemo/__init__.py Wed Jan 13 20:32:50 2016 +0100 +++ b/omemo/__init__.py Wed Jan 13 20:46:44 2016 +0100 @@ -19,6 +19,8 @@ # import logging +import os +import sqlite3 from common import caps_cache, gajim, ged from common.pep import SUPPORTED_PERSONAL_USER_EVENTS @@ -43,6 +45,8 @@ log.error(AXOLOTL_MISSING) HAS_AXOLOTL = False +DB_DIR = gajim.gajimpaths.data_root + class OmemoPlugin(GajimPlugin): @@ -75,7 +79,9 @@ OmemoState if it does not exist yet. """ if account not in self.omemo_states: - self.omemo_states[account] = OmemoState(account) + db_path = os.path.join(DB_DIR, 'omemo_' + account + '.db') + conn = sqlite3.connect(db_path, check_same_thread=False) + self.omemo_states[account] = OmemoState(conn) return self.omemo_states[account] @log_calls('OmemoPlugin')

1 0

gajim-plugins: Release version 0.4
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset 80825bb98778 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=80825bb98778 description: Release version 0.4 diffstat: omemo/CHANGELOG | 13 +++++++++++++ omemo/manifest.ini | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diffs (32 lines): diff -r 1b12b717d120 -r 80825bb98778 omemo/CHANGELOG --- a/omemo/CHANGELOG Thu Jan 21 15:40:15 2016 +0100 +++ b/omemo/CHANGELOG Mon Jan 25 16:23:12 2016 +0100 @@ -1,3 +1,16 @@ +0.4 / 2016-01-21 +================== + + * Update README.md + * Fix #32: Add own devices as possible OMEMO partners. + * Fix one of the errors in #26 + * Fix sqlite db intialization + * Use the standalone python-omemo library + * FIx LOG_DB errors / lost messages + * Move all OMEMO related parts to own dir + * Rename all links from kalkin/.. to omemo/... + * Update archlinux PKGBUILD to 0.3 + 0.3 / 2016-01-10 ================== * Save if OMEMO is enabled between restarts - #17 diff -r 1b12b717d120 -r 80825bb98778 omemo/manifest.ini --- a/omemo/manifest.ini Thu Jan 21 15:40:15 2016 +0100 +++ b/omemo/manifest.ini Mon Jan 25 16:23:12 2016 +0100 @@ -1,7 +1,7 @@ [info] name: OMEMO Multi-End Message and Object Encryption short_name: omemo -version: 0.3 +version: 0.4 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install python-axolotl via pip to run this plugin. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de>, Daniel Gultsch <daniel(a)gultsch.de>

1 0

gajim-plugins: Fix one of the errors in #26
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset befdda870aea in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=befdda870aea description: Fix one of the errors in #26 diffstat: omemo/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ac571cc010ff -r befdda870aea omemo/__init__.py --- a/omemo/__init__.py Wed Jan 13 20:46:44 2016 +0100 +++ b/omemo/__init__.py Fri Jan 15 13:52:44 2016 +0100 @@ -418,7 +418,7 @@ log.debug(account + ' → Publishing bundle was successful') if not state.own_device_id_published(): log.warn(account + ' → Device list needs updating') - self.publish_own_devices_list(state) + self.publish_own_devices_list(account, state) else: log.debug(account + ' → Device list up to date') else:

1 0

gajim-plugins: Add some asserts in hope of pinning down #12
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset 1d0c3f592d10 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=1d0c3f592d10 description: Add some asserts in hope of pinning down #12 diffstat: omemo/xmpp.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r befdda870aea -r 1d0c3f592d10 omemo/xmpp.py --- a/omemo/xmpp.py Fri Jan 15 13:52:44 2016 +0100 +++ b/omemo/xmpp.py Fri Jan 15 14:09:26 2016 +0100 @@ -55,6 +55,8 @@ class DeviceListAnnouncement(Iq): def __init__(self, device_list): + assert isinstance(device_list, list) + assert len(device_list) > 0 id_ = gajim.get_an_id() attrs = {'id': id_} Iq.__init__(self, typ='set', attrs=attrs) @@ -85,6 +87,7 @@ class BundleInformationQuery(Iq): def __init__(self, contact_jid, device_id): + assert isinstance(device_id, int) id_ = gajim.get_an_id() attrs = {'id': id_} Iq.__init__(self, typ='get', attrs=attrs, to=contact_jid)

1 0

gajim-plugins: Release omemo plugin version 0.4
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset bfa12b3fd164 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=bfa12b3fd164 description: Release omemo plugin version 0.4 diffstat: omemo/CHANGELOG | 13 + omemo/README.md | 6 +- omemo/__init__.py | 83 +- omemo/aes_gcm.py | 160 -- omemo/lib/python-omemo/.ackrc | 19 + omemo/lib/python-omemo/.bumpversion.cfg | 11 + omemo/lib/python-omemo/.cookiecutterrc | 47 + omemo/lib/python-omemo/.coveragerc | 12 + omemo/lib/python-omemo/.editorconfig | 13 + omemo/lib/python-omemo/.gitignore | 63 + omemo/lib/python-omemo/.travis.yml | 44 + omemo/lib/python-omemo/AUTHORS.rst | 7 + omemo/lib/python-omemo/CHANGELOG.rst | 8 + omemo/lib/python-omemo/CONTRIBUTING.rst | 280 ++++ omemo/lib/python-omemo/COPYING | 675 ++++++++++ omemo/lib/python-omemo/MANIFEST.in | 21 + omemo/lib/python-omemo/README.rst | 123 + omemo/lib/python-omemo/appveyor.yml | 110 + omemo/lib/python-omemo/ci/appveyor-bootstrap.py | 113 + omemo/lib/python-omemo/ci/appveyor-download.py | 107 + omemo/lib/python-omemo/ci/appveyor-with-compiler.cmd | 46 + omemo/lib/python-omemo/ci/bootstrap.py | 53 + omemo/lib/python-omemo/ci/templates/.travis.yml | 37 + omemo/lib/python-omemo/ci/templates/appveyor.yml | 53 + omemo/lib/python-omemo/docs/authors.rst | 1 + omemo/lib/python-omemo/docs/changelog.rst | 1 + omemo/lib/python-omemo/docs/conf.py | 54 + omemo/lib/python-omemo/docs/contributing.rst | 1 + omemo/lib/python-omemo/docs/index.rst | 22 + omemo/lib/python-omemo/docs/installation.rst | 7 + omemo/lib/python-omemo/docs/readme.rst | 1 + omemo/lib/python-omemo/docs/reference/index.rst | 7 + omemo/lib/python-omemo/docs/reference/omemo.rst | 8 + omemo/lib/python-omemo/docs/requirements.txt | 2 + omemo/lib/python-omemo/docs/spelling_wordlist.txt | 11 + omemo/lib/python-omemo/docs/usage.rst | 7 + omemo/lib/python-omemo/setup.cfg | 44 + omemo/lib/python-omemo/setup.py | 67 + omemo/lib/python-omemo/src/.gitignore | 2 + omemo/lib/python-omemo/src/.style.yapf | 4 + omemo/lib/python-omemo/src/COPYING | 674 +++++++++ omemo/lib/python-omemo/src/omemo.png | Bin omemo/lib/python-omemo/src/omemo/__init__.py | 1 + omemo/lib/python-omemo/src/omemo/aes_gcm.py | 160 ++ omemo/lib/python-omemo/src/omemo/db_helpers.py | 13 + omemo/lib/python-omemo/src/omemo/encryption.py | 95 + omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py | 127 + omemo/lib/python-omemo/src/omemo/liteidentitykeystore.py | 76 + omemo/lib/python-omemo/src/omemo/liteprekeystore.py | 72 + omemo/lib/python-omemo/src/omemo/litesessionstore.py | 80 + omemo/lib/python-omemo/src/omemo/litesignedprekeystore.py | 77 + omemo/lib/python-omemo/src/omemo/state.py | 316 ++++ omemo/lib/python-omemo/tests/test_db_helpers.py | 19 + omemo/lib/python-omemo/tests/test_encryption_store.py | 31 + omemo/lib/python-omemo/tests/test_migrate_encryption_state.py | 47 + omemo/lib/python-omemo/tests/test_omemo.py | 6 + omemo/lib/python-omemo/tests/test_omemo_state.py | 107 + omemo/lib/python-omemo/tox.ini | 131 + omemo/manifest.ini | 4 +- omemo/omemo | 1 + omemo/pkgs/PKGBUILD | 4 +- omemo/state.py | 273 ---- omemo/store/__init__.py | 1 - omemo/store/encryption.py | 58 - omemo/store/liteaxolotlstore.py | 125 - omemo/store/liteidentitykeystore.py | 76 - omemo/store/liteprekeystore.py | 73 - omemo/store/litesessionstore.py | 80 - omemo/store/litesignedprekeystore.py | 77 - omemo/test_encryption_store.py | 31 - omemo/xmpp.py | 3 + 71 files changed, 4187 insertions(+), 994 deletions(-) diffs (truncated from 5675 to 300 lines): diff -r 0ad2a8bf5e82 -r bfa12b3fd164 omemo/CHANGELOG --- a/omemo/CHANGELOG Sun Jan 10 21:12:12 2016 +0100 +++ b/omemo/CHANGELOG Tue Jan 26 15:13:15 2016 +0100 @@ -1,3 +1,16 @@ +0.4 / 2016-01-21 +================== + + * Update README.md + * Fix #32: Add own devices as possible OMEMO partners. + * Fix one of the errors in #26 + * Fix sqlite db intialization + * Use the standalone python-omemo library + * FIx LOG_DB errors / lost messages + * Move all OMEMO related parts to own dir + * Rename all links from kalkin/.. to omemo/... + * Update archlinux PKGBUILD to 0.3 + 0.3 / 2016-01-10 ================== * Save if OMEMO is enabled between restarts - #17 diff -r 0ad2a8bf5e82 -r bfa12b3fd164 omemo/README.md --- a/omemo/README.md Sun Jan 10 21:12:12 2016 +0100 +++ b/omemo/README.md Tue Jan 26 15:13:15 2016 +0100 @@ -41,20 +41,20 @@ ```shell mkdir ~/.local/share/gajim/plugins -p cd ~/.local/share/gajim/plugins -git clone https://github.com/kalkin/gajim-omemo +git clone https://github.com/omemo/gajim-omemo ``` ## Support this project I develop this project in my free time. Your donation allows me to spend more time working on it and on free software generally. -My Bitcoin Address is: `1CnNM3Mree9hU8eRjCXrfCWV mX6oBnEfV1` +My Bitcoin Address is: `1CnNM3Mree9hU8eRjCXrfCWVmX6oBnEfV1` [![Support Me via Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flatt… ## I found a bug Please report it to the [issue -tracker](https://github.com/kalkin/gajim-omemo/issues). If you are experiencing +tracker](https://github.com/omemo/gajim-omemo/issues). If you are experiencing misbehaviour please provide detailed steps to reproduce and debugging output. Always mention the exact Gajim version. diff -r 0ad2a8bf5e82 -r bfa12b3fd164 omemo/__init__.py --- a/omemo/__init__.py Sun Jan 10 21:12:12 2016 +0100 +++ b/omemo/__init__.py Tue Jan 26 15:13:15 2016 +0100 @@ -19,6 +19,8 @@ # import logging +import os +import sqlite3 from common import caps_cache, gajim, ged from common.pep import SUPPORTED_PERSONAL_USER_EVENTS @@ -37,12 +39,14 @@ log = logging.getLogger('gajim.plugin_system.omemo') try: - from .state import OmemoState + from omemo.state import OmemoState HAS_AXOLOTL = True except ImportError: log.error(AXOLOTL_MISSING) HAS_AXOLOTL = False +DB_DIR = gajim.gajimpaths.data_root + class OmemoPlugin(GajimPlugin): @@ -75,7 +79,9 @@ OmemoState if it does not exist yet. """ if account not in self.omemo_states: - self.omemo_states[account] = OmemoState(account) + db_path = os.path.join(DB_DIR, 'omemo_' + account + '.db') + conn = sqlite3.connect(db_path, check_same_thread=False) + self.omemo_states[account] = OmemoState(conn) return self.omemo_states[account] @log_calls('OmemoPlugin') @@ -84,8 +90,7 @@ On sign in announce OMEMO support for each account. """ account = show.conn.name - state = self.get_omemo_state(account) - self.announce_support(state) + self.announce_support(account) @log_calls('OmemoPlugin') def activate(self): @@ -183,9 +188,9 @@ my_jid = gajim.get_jid_from_account(account_name) if contact_jid == my_jid: - log.info(state.name + ' ⇒ Received own device_list:' + str( + log.info(account_name + ' ⇒ Received own device_list:' + str( devices_list)) - state.add_own_devices(devices_list) + state.add_own_devices(my_jid, devices_list) if not state.own_device_id_published() or anydup( state.own_devices): @@ -194,7 +199,7 @@ # also remove duplicates devices_list = list(set(state.own_devices)) devices_list.append(state.own_device_id) - self.publish_own_devices_list(state) + self.publish_own_devices_list(account_name, state) else: log.info(account_name + ' ⇒ Received device_list for ' + contact_jid + ':' + str(devices_list)) @@ -213,14 +218,14 @@ return True @log_calls('OmemoPlugin') - def publish_own_devices_list(self, state): + def publish_own_devices_list(self, account_name, state): devices_list = state.own_devices devices_list += [state.own_device_id] - log.debug(state.name + ' ⇒ Publishing own devices_list ' + str( + log.debug(account_name + ' ⇒ Publishing own devices_list ' + str( devices_list)) iq = DeviceListAnnouncement(devices_list) - gajim.connections[state.name].connection.send(iq) + gajim.connections[account_name].connection.send(iq) id_ = str(iq.getAttr('id')) iq_ids_to_callbacks[id_] = lambda event: log.debug(event) @@ -231,7 +236,8 @@ if account_name not in self.ui_list: self.ui_list[account_name] = {} state = self.get_omemo_state(account_name) - if contact_jid in state.device_ids: + my_jid = gajim.get_jid_from_account(account_name) + if contact_jid in state.device_ids or contact_jid == my_jid: log.debug(account_name + " ⇒ Adding OMEMO ui for " + contact_jid) omemo_enabled = state.encryption.is_active(contact_jid) self.ui_list[account_name][contact_jid] = Ui(self, chat_control, @@ -274,18 +280,23 @@ 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) + self.fetch_device_bundle_information(account, state, to_jid, + device_id) for device_id in state.own_devices_without_sessions(my_jid): - self.fetch_device_bundle_information(state, my_jid, device_id) + self.fetch_device_bundle_information(account, state, my_jid, + device_id) @log_calls('OmemoPlugin') - def fetch_device_bundle_information(self, state, jid, device_id): + def fetch_device_bundle_information(self, account_name, state, jid, + device_id): """ Fetch bundle information for specified jid, key, and create axolotl session on success. Parameters ---------- + account_name : str + The account name state : (OmemoState) The OmemoState which is missing device bundle information jid : str @@ -293,18 +304,19 @@ device_id : int The device_id for which we are missing an axolotl session """ - log.debug(state.name + '→ Fetch bundle device ' + str(device_id) + '#' + log.debug(account_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] = \ - lambda stanza: self.session_from_prekey_bundle(state, stanza, - jid, device_id) - gajim.connections[state.name].connection.send(iq) + lambda stanza: self.session_from_prekey_bundle(account_name, state, + stanza, jid, + device_id) + gajim.connections[account_name].connection.send(iq) @log_calls('OmemoPlugin') - def session_from_prekey_bundle(self, state, stanza, recipient_id, - device_id): + def session_from_prekey_bundle(self, account_name, state, stanza, + recipient_id, device_id): """ Starts a session when a bundle information announcement is received. @@ -325,6 +337,8 @@ Parameters: ----------- + account_name : str + The account name state : (OmemoState) The OmemoState used stanza @@ -341,7 +355,7 @@ return if state.build_session(recipient_id, device_id, bundle_dict): - self.update_prekeys(state.name, recipient_id) + self.update_prekeys(account_name, recipient_id) @log_calls('OmemoPlugin') def update_prekeys(self, account, recipient_id): @@ -368,23 +382,23 @@ Parameters ---------- account : str - The account name + the account name See also -------- 4.3 Announcing bundle information: http://conversations.im/xeps/multi-end.html#usecases-announcing """ - state = self.get_omemo_state(account.name) + state = self.get_omemo_state(account) iq = BundleInformationAnnouncement(state.bundle, state.own_device_id) - gajim.connections[state.name].connection.send(iq) + gajim.connections[account].connection.send(iq) id_ = str(iq.getAttr("id")) - log.debug(account.name + " → Announcing OMEMO support via PEP") + log.debug(account + " → Announcing OMEMO support via PEP") iq_ids_to_callbacks[id_] = lambda stanza: \ - self.handle_announcement_result(stanza, state) + self.handle_announcement_result(account, stanza, state) @log_calls('OmemoPlugin') - def handle_announcement_result(self, stanza, state): + def handle_announcement_result(self, account, stanza, state): """ Updates own device list if announcement was successfull. If the OMEMO support announcement was successfull update own device @@ -392,17 +406,20 @@ Parameters ---------- + account : str + the account name stanza The stanza object received from callback + state : (OmemoState) + The OmemoState used """ - account = state.name state = self.get_omemo_state(account) if successful(stanza): log.debug(account + ' → Publishing bundle was successful') if not state.own_device_id_published(): log.warn(account + ' → Device list needs updating') - self.publish_own_devices_list(state) + self.publish_own_devices_list(account, state) else: log.debug(account + ' → Device list up to date') else: @@ -414,9 +431,9 @@ state = self.get_omemo_state(account) devices_list = [state.own_device_id] - log.info(state.name + ' ⇒ Clearing devices_list ' + str(devices_list)) + log.info(account + ' ⇒ Clearing devices_list ' + str(devices_list)) iq = DeviceListAnnouncement(devices_list) - connection = gajim.connections[state.name].connection + connection = gajim.connections[account].connection if not connection: # not connected return connection.send(iq) @@ -435,8 +452,8 @@ if not state.encryption.is_active(to_jid): return False try: - msg_dict = state.create_msg( - gajim.get_jid_from_account(account), to_jid, plaintext) + msg_dict = state.create_msg(gajim.get_jid_from_account(account), + to_jid, plaintext) if not msg_dict: return True encrypted_node = OmemoMessage(msg_dict) diff -r 0ad2a8bf5e82 -r bfa12b3fd164 omemo/aes_gcm.py --- a/omemo/aes_gcm.py Sun Jan 10 21:12:12 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,160 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2014 Jonathan Zdziarski <jonathan(a)zdziarski.com> -#

1 0

gajim-plugins: Fix #32: Add own devices as possible OMEMO partners.
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset 89249dfda284 in /home/hg/repos/gajim-plugins author: Armin Novak <armin.novak(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=89249dfda284 description: Fix #32: Add own devices as possible OMEMO partners. diffstat: omemo/__init__.py | 5 +++-- omemo/lib/python-omemo/src/omemo/state.py | 24 +++++++++++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diffs (97 lines): diff -r 1d0c3f592d10 -r 89249dfda284 omemo/__init__.py --- a/omemo/__init__.py Fri Jan 15 14:09:26 2016 +0100 +++ b/omemo/__init__.py Tue Jan 19 23:33:54 2016 +0100 @@ -190,7 +190,7 @@ if contact_jid == my_jid: log.info(account_name + ' ⇒ Received own device_list:' + str( devices_list)) - state.add_own_devices(devices_list) + state.add_own_devices(my_jid, devices_list) if not state.own_device_id_published() or anydup( state.own_devices): @@ -236,7 +236,8 @@ if account_name not in self.ui_list: self.ui_list[account_name] = {} state = self.get_omemo_state(account_name) - if contact_jid in state.device_ids: + my_jid = gajim.get_jid_from_account(account_name) + if contact_jid in state.device_ids or contact_jid == my_jid: log.debug(account_name + " ⇒ Adding OMEMO ui for " + contact_jid) omemo_enabled = state.encryption.is_active(contact_jid) self.ui_list[account_name][contact_jid] = Ui(self, chat_control, diff -r 1d0c3f592d10 -r 89249dfda284 omemo/lib/python-omemo/src/omemo/state.py --- a/omemo/lib/python-omemo/src/omemo/state.py Fri Jan 15 14:09:26 2016 +0100 +++ b/omemo/lib/python-omemo/src/omemo/state.py Tue Jan 19 23:33:54 2016 +0100 @@ -22,6 +22,7 @@ from axolotl.ecc.djbec import DjbECPublicKey from axolotl.identitykey import IdentityKey +from axolotl.duplicatemessagexception import DuplicateMessageException from axolotl.invalidmessageexception import InvalidMessageException from axolotl.invalidversionexception import InvalidVersionException from axolotl.nosessionexception import NoSessionException @@ -36,14 +37,15 @@ from .aes_gcm import NoValidSessions, aes_decrypt, aes_encrypt from .liteaxolotlstore import LiteAxolotlStore -log = logging.getLogger('omemo') - +#log = logging.getLogger('omemo') +log = logging.getLogger('gajim.plugin_system.omemo') class OmemoState: session_ciphers = {} encryption = None device_ids = {} + own_name = '' own_devices = [] def __init__(self, connection): @@ -89,7 +91,7 @@ log.debug('Saving devices for ' + name + ' → ' + str(devices)) self.device_ids[name] = devices - def add_own_devices(self, devices): + def add_own_devices(self, name, devices): """ Overwrite the current :py:attribute:`OmemoState.own_devices` with the given devices. @@ -98,6 +100,7 @@ devices : [int] A list of device_ids """ + self.own_name = name self.own_devices = devices @property @@ -163,6 +166,19 @@ log.error('sender_jid → ' + str(sender_jid) + ' sid =>' + str( sid)) return + except (DuplicateMessageException) as e: + log.error('Duplicate message found ' + str(e.args)) + log.error('sender_jid → ' + str(sender_jid) + ' sid => ' +str(sid)) + return + except (Exception) as e: + log.error('Duplicate message found ' + str(e.args)) + log.error('sender_jid → ' + str(sender_jid) + ' sid => ' +str(sid)) + return + + except (DuplicateMessageException): + log.error('Duplicate message found ' + e.message) + log.error('sender_jid → ' + str(sender_jid) + ' sid => ' +str(sid)) + return result = unicode(aes_decrypt(key, iv, payload)) log.debug("Decrypted msg ⇒ " + result) @@ -224,6 +240,8 @@ jid : string The contacts jid """ + if jid == self.own_name: + return set(self.own_devices) - set({self.own_device_id}) if jid not in self.device_ids: return set() return set(self.device_ids[jid])

1 0

gajim-plugins: Fix typo
by Gajim Plugins 26 Jan '16

26 Jan '16

changeset 1b12b717d120 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=1b12b717d120 description: Fix typo diffstat: omemo/README.md | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 89249dfda284 -r 1b12b717d120 omemo/README.md --- a/omemo/README.md Tue Jan 19 23:33:54 2016 +0100 +++ b/omemo/README.md Thu Jan 21 15:40:15 2016 +0100 @@ -48,7 +48,7 @@ I develop this project in my free time. Your donation allows me to spend more time working on it and on free software generally. -My Bitcoin Address is: `1CnNM3Mree9hU8eRjCXrfCWV mX6oBnEfV1` +My Bitcoin Address is: `1CnNM3Mree9hU8eRjCXrfCWVmX6oBnEfV1` [![Support Me via Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flatt…

1 0

gajim-website: add link to https for gajim-dev-keyring package
by Gajim Website 25 Jan '16

25 Jan '16

changeset 4a828d65565c in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=4a828d65565c description: add link to https for gajim-dev-keyring package diffstat: downloads.php | 2 +- locale/ar_AE/LC_MESSAGES/msg.po | 20 +++++++++++++++++--- locale/bg_BG/LC_MESSAGES/msg.po | 17 ++++++++++++++--- locale/de_DE/LC_MESSAGES/msg.po | 20 +++++++++++++++++--- locale/eo/LC_MESSAGES/msg.po | 17 ++++++++++++++--- locale/es_ES/LC_MESSAGES/msg.po | 17 ++++++++++++++--- locale/fr_FR/LC_MESSAGES/msg.po | 20 ++++++++++++++++---- locale/he_IL/LC_MESSAGES/msg.po | 20 +++++++++++++++++--- locale/hu_HU/LC_MESSAGES/msg.po | 20 +++++++++++++++++--- locale/it_IT/LC_MESSAGES/msg.po | 20 +++++++++++++++++--- locale/pl_PL/LC_MESSAGES/msg.po | 20 +++++++++++++++++--- locale/pt_BR/LC_MESSAGES/msg.po | 20 +++++++++++++++++--- locale/ru_RU/LC_MESSAGES/msg.po | 20 +++++++++++++++++--- msg.pot | 16 +++++++++++++--- 14 files changed, 208 insertions(+), 41 deletions(-) diffs (truncated from 599 to 300 lines): diff -r ba67c38bcdf2 -r 4a828d65565c downloads.php --- a/downloads.php Tue Dec 29 21:05:51 2015 +0100 +++ b/downloads.php Mon Jan 25 22:05:44 2016 +0100 @@ -136,7 +136,7 @@ print (" deb ftp://ftp.gajim.org/debian unstable main\n"); print (" \n"); print _("and install it by doing")." apt-get install gajim-nightly.\n"; -print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do")." apt-get install gajim-dev-keyring.\n"; +print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository (or via") . " <a href='https://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim-dev-keyri…'>https</a>). " . _("Just do")." apt-get install gajim-dev-keyring.\n"; print "</div>\n"; #4)Fedora diff -r ba67c38bcdf2 -r 4a828d65565c locale/ar_AE/LC_MESSAGES/msg.po --- a/locale/ar_AE/LC_MESSAGES/msg.po Tue Dec 29 21:05:51 2015 +0100 +++ b/locale/ar_AE/LC_MESSAGES/msg.po Mon Jan 25 22:05:44 2016 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: mag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-28 14:06+0100\n" +"POT-Creation-Date: 2016-01-25 22:04+0100\n" "PO-Revision-Date: 2014-06-02 01:08+0300\n" "Last-Translator: Yann <asterix(a)asterix.lagaule.org>\n" "Language-Team: Arabic <karrar.kazuya(a)gmail.com>\n" @@ -309,10 +309,16 @@ msgid "and install it by doing" msgstr "و نصبه ب قيامك ب" -#: downloads.php:139 downloads.php:203 +#: downloads.php:139 +#, fuzzy +msgid "Just do" +msgstr " فقط" + +#: downloads.php:139 +#, fuzzy msgid "" "You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" +"package from the same repository (or via" msgstr "" "يمكنك الحصول على مفتاح ال GPG لهذة الحزمة عن طريق تنصيبك ل حزمة gajim-dev-" "keyring من نفس المستودع, مجرد قم ب " @@ -354,6 +360,14 @@ msgid "If you use Ubuntu universe repository do" msgstr " اذا تستخدم Ubuntu universe repository قم ب" +#: downloads.php:203 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" +"يمكنك الحصول على مفتاح ال GPG لهذة الحزمة عن طريق تنصيبك ل حزمة gajim-dev-" +"keyring من نفس المستودع, مجرد قم ب " + #: downloads.php:209 msgid "Gajim installer" msgstr "منصب كاجيم" diff -r ba67c38bcdf2 -r 4a828d65565c locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Tue Dec 29 21:05:51 2015 +0100 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Mon Jan 25 22:05:44 2016 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-28 14:06+0100\n" +"POT-Creation-Date: 2016-01-25 22:04+0100\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -317,10 +317,15 @@ msgid "and install it by doing" msgstr "Инсталирайте го чрез" -#: downloads.php:139 downloads.php:203 +#: downloads.php:139 +#, fuzzy +msgid "Just do" +msgstr " Само" + +#: downloads.php:139 msgid "" "You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" +"package from the same repository (or via" msgstr "" #: downloads.php:151 @@ -359,6 +364,12 @@ msgid "If you use Ubuntu universe repository do" msgstr " Ако използвате хранилището „universe“ на Убунту, изпълнете" +#: downloads.php:203 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + #: downloads.php:209 #, fuzzy msgid "Gajim installer" diff -r ba67c38bcdf2 -r 4a828d65565c locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Tue Dec 29 21:05:51 2015 +0100 +++ b/locale/de_DE/LC_MESSAGES/msg.po Mon Jan 25 22:05:44 2016 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-28 14:06+0100\n" +"POT-Creation-Date: 2016-01-25 22:04+0100\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -327,10 +327,16 @@ msgid "and install it by doing" msgstr "und installieren Sie die SVN-Version durch" -#: downloads.php:139 downloads.php:203 +#: downloads.php:139 +#, fuzzy +msgid "Just do" +msgstr " Einfach" + +#: downloads.php:139 +#, fuzzy msgid "" "You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" +"package from the same repository (or via" msgstr "" "Um den GPG-Schlüssel dieses Pakets zu erhalten, installieren Sie bitte das " "Paket gajim-dev-keyring aus derselben Installationsquelle. Es genügt " @@ -373,6 +379,14 @@ msgstr "" " Wenn Sie die Installationsquelle \"universe\" aktiviert haben, reicht" +#: downloads.php:203 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" +"Um den GPG-Schlüssel dieses Pakets zu erhalten, installieren Sie bitte das " +"Paket gajim-dev-keyring aus derselben Installationsquelle. Es genügt " + #: downloads.php:209 msgid "Gajim installer" msgstr "Gajim-Installationsdatei" diff -r ba67c38bcdf2 -r 4a828d65565c locale/eo/LC_MESSAGES/msg.po --- a/locale/eo/LC_MESSAGES/msg.po Tue Dec 29 21:05:51 2015 +0100 +++ b/locale/eo/LC_MESSAGES/msg.po Mon Jan 25 22:05:44 2016 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-28 14:06+0100\n" +"POT-Creation-Date: 2016-01-25 22:04+0100\n" "PO-Revision-Date: 2007-02-19 20:40+0400\n" "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin(a)gmail.com>\n" "Language-Team: Esperanto <translation-team-eo(a)lists.sourceforge.net>\n" @@ -314,10 +314,15 @@ msgid "and install it by doing" msgstr "kaj instalu ĝin farante" -#: downloads.php:139 downloads.php:203 +#: downloads.php:139 +#, fuzzy +msgid "Just do" +msgstr " Simple" + +#: downloads.php:139 msgid "" "You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" +"package from the same repository (or via" msgstr "" #: downloads.php:151 @@ -355,6 +360,12 @@ msgid "If you use Ubuntu universe repository do" msgstr " Se vi uzas Ubuntu unuverse deponejon, faru" +#: downloads.php:203 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + #: downloads.php:209 #, fuzzy msgid "Gajim installer" diff -r ba67c38bcdf2 -r 4a828d65565c locale/es_ES/LC_MESSAGES/msg.po --- a/locale/es_ES/LC_MESSAGES/msg.po Tue Dec 29 21:05:51 2015 +0100 +++ b/locale/es_ES/LC_MESSAGES/msg.po Mon Jan 25 22:05:44 2016 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-28 14:06+0100\n" +"POT-Creation-Date: 2016-01-25 22:04+0100\n" "PO-Revision-Date: 2005-06-01 19:05+0300\n" "Last-Translator: <membriskhan(a)gmail.com>\n" "Language-Team: Spanish <es(a)li.org>\n" @@ -319,10 +319,15 @@ msgid "and install it by doing" msgstr "e instálalo haciendo" -#: downloads.php:139 downloads.php:203 +#: downloads.php:139 +#, fuzzy +msgid "Just do" +msgstr " Simplemente " + +#: downloads.php:139 msgid "" "You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" +"package from the same repository (or via" msgstr "" #: downloads.php:151 @@ -364,6 +369,12 @@ msgid "If you use Ubuntu universe repository do" msgstr " Si usas el repositorio de Ubuntu universe haz" +#: downloads.php:203 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + #: downloads.php:209 #, fuzzy msgid "Gajim installer" diff -r ba67c38bcdf2 -r 4a828d65565c locale/fr_FR/LC_MESSAGES/msg.po --- a/locale/fr_FR/LC_MESSAGES/msg.po Tue Dec 29 21:05:51 2015 +0100 +++ b/locale/fr_FR/LC_MESSAGES/msg.po Mon Jan 25 22:05:44 2016 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-28 14:06+0100\n" +"POT-Creation-Date: 2016-01-25 22:04+0100\n" "PO-Revision-Date: 2011-10-09 14:48+0100\n" "Last-Translator: manu <manuk7(a)laposte.net>\n" "Language-Team: none\n" @@ -313,13 +313,17 @@ msgid "and install it by doing" msgstr "et installez-le en faisant" -#: downloads.php:139 downloads.php:203 +#: downloads.php:139 +msgid "Just do" +msgstr "Lancez simplement" + +#: downloads.php:139 msgid "" "You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" +"package from the same repository (or via" msgstr "" "Vous pouvez récupérer la clé GPG de ce paquet en installant le paquet gajim-" -"dev-keyring du même dépot. Faites simplement" +"dev-keyring du même dépot (ou en" #: downloads.php:151 msgid "Gajim is available in FreeBSD via FreeBSD ports. Just " @@ -355,6 +359,14 @@ msgid "If you use Ubuntu universe repository do" msgstr "Si vous utilisez Ubuntu universe, faites" +#: downloads.php:203 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" +"Vous pouvez récupérer la clé GPG de ce paquet en installant le paquet gajim-" +"dev-keyring du même dépot. Faites simplement" + #: downloads.php:209 msgid "Gajim installer" msgstr "Installateur de Gajim" diff -r ba67c38bcdf2 -r 4a828d65565c locale/he_IL/LC_MESSAGES/msg.po --- a/locale/he_IL/LC_MESSAGES/msg.po Tue Dec 29 21:05:51 2015 +0100 +++ b/locale/he_IL/LC_MESSAGES/msg.po Mon Jan 25 22:05:44 2016 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gajim-website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-28 14:06+0100\n" +"POT-Creation-Date: 2016-01-25 22:04+0100\n" "PO-Revision-Date: 2014-04-02 08:09+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut <genghiskhan(a)gmx.ca>\n" @@ -320,10 +320,16 @@ msgid "and install it by doing" msgstr "והתקינו את באמצעות" -#: downloads.php:139 downloads.php:203 +#: downloads.php:139 +#, fuzzy

1 0

gajim: Fix a remnant use of urllib from python2 in gajim-remote
by Gajim 24 Jan '16

24 Jan '16

changeset 209d558b9401 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=209d558b9401 description: Fix a remnant use of urllib from python2 in gajim-remote diffstat: src/common/helpers.py | 3 +-- src/gajim-remote.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (49 lines): diff -r 5032f1231f0a -r 209d558b9401 src/common/helpers.py --- a/src/common/helpers.py Sun Jan 17 20:54:20 2016 +0100 +++ b/src/common/helpers.py Sun Jan 24 19:12:30 2016 +0000 @@ -35,7 +35,6 @@ import os import subprocess import urllib -from urllib.parse import urlparse import webbrowser import errno import select @@ -144,7 +143,7 @@ _url = url if '//' not in _url: _url = '//' + _url - o = urlparse(_url) + o = urllib.parse.urlparse(_url) p_loc = idn_to_ascii(o.netloc) return url.replace(o.netloc, p_loc) diff -r 5032f1231f0a -r 209d558b9401 src/gajim-remote.py --- a/src/gajim-remote.py Sun Jan 17 20:54:20 2016 +0100 +++ b/src/gajim-remote.py Sun Jan 24 19:12:30 2016 +0000 @@ -32,6 +32,7 @@ import signal signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application + from common import exceptions from common import i18n # This installs _() function from common.i18n import Q_ @@ -543,7 +544,7 @@ return jid, args = uri.split('?', 1) try: - jid = urllib.unquote(jid) + jid = urllib.parse.unquote(jid) except UnicodeDecodeError: pass args = args.split(';') @@ -565,7 +566,7 @@ # dialog message = options['body'] try: - message = urllib.unquote(message) + message = urllib.parse.unquote(message) except UnicodeDecodeError: pass if len(sys.argv) == 4:

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