Commits

commits@gajim.org

17632 discussions

gajim: search_keys result is always utf-8 encoded because of --w...
by Gajim 11 May '16

11 May '16

changeset 7452dc852b30 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7452dc852b30 description: search_keys result is always utf-8 encoded because of --with-colons option. diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f8b7c305f177 -r 7452dc852b30 src/common/gnupg.py --- a/src/common/gnupg.py Tue May 03 22:50:02 2016 +0200 +++ b/src/common/gnupg.py Wed May 11 21:40:30 2016 +0200 @@ -1225,7 +1225,7 @@ # Get the response information result = self.result_map['search'](self) self._collect_output(p, result, stdin=p.stdin) - lines = result.data.decode(self.encoding, + lines = result.data.decode('utf-8', self.decode_errors).splitlines() valid_keywords = ['pub', 'uid'] for line in lines:

1 0

gajim-website: update debian keyring link
by Gajim Website 10 May '16

10 May '16

changeset 62fc24244a08 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=62fc24244a08 description: update debian keyring link diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 21dac983644e -r 62fc24244a08 downloads.php --- a/downloads.php Sat Apr 16 00:09:47 2016 +0200 +++ b/downloads.php Tue May 10 21:30:28 2016 +0200 @@ -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 (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 _("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

1 0

gajim: Fix IBB (don't send several time the close for a given tr...
by Gajim 03 May '16

03 May '16

changeset f8b7c305f177 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f8b7c305f177 description: Fix IBB (don't send several time the close for a given transfert) diffstat: src/common/protocol/bytestream.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (25 lines): diff -r 57f171136f0d -r f8b7c305f177 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun May 01 20:55:21 2016 +0200 +++ b/src/common/protocol/bytestream.py Tue May 03 22:50:02 2016 +0200 @@ -869,6 +869,8 @@ if not file_props.direction: # it's socks5 bytestream continue + if file_props.completed: + continue sid = file_props.sid if file_props.direction[:2] == '|>': # We waitthat other part accept stream @@ -897,6 +899,12 @@ file_props.received_len += len(chunk) gajim.socks5queue.progress_transfer_cb(self.name, file_props) + if file_props.completed: # set in progress_transfer_cd() + # notify the other side about stream closing + self.connection.send(nbxmpp.Protocol('iq', + file_props.direction[1:], 'set', + payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', + {'sid': file_props.transport_sid})])) else: # notify the other side about stream closing # notify the local user about sucessfull send

1 0

gajim-plugins: Add the GitHub wiki docs as a submodule
by Gajim Plugins 03 May '16

03 May '16

changeset 51fb05923dc3 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=51fb05923dc3 description: Add the GitHub wiki docs as a submodule diffstat: omemo/.gitmodules | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (7 lines): diff -r eb475e715cbd -r 51fb05923dc3 omemo/.gitmodules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/.gitmodules Tue Jan 26 15:42:04 2016 +0100 @@ -0,0 +1,3 @@ +[submodule "doc"] + path = doc + url = https://github.com/omemo/gajim-omemo.wiki.git

1 0

gajim-plugins: Fix delay when sending messages - #13
by Gajim Plugins 03 May '16

03 May '16

changeset 074793624d8a in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=074793624d8a description: Fix delay when sending messages - #13 Use threading for encryption when sending diffstat: omemo/__init__.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diffs (29 lines): diff -r b6c7e89ac38d -r 074793624d8a omemo/__init__.py --- a/omemo/__init__.py Wed Jan 27 09:58:02 2016 +0100 +++ b/omemo/__init__.py Thu Jan 28 16:55:52 2016 +0100 @@ -452,14 +452,17 @@ 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) - if not msg_dict: - return True - encrypted_node = OmemoMessage(msg_dict) - event.msg_iq.delChild('body') - event.msg_iq.addChild(node=encrypted_node) - log.debug(account + ' → ' + str(event.msg_iq)) + from_jid = gajim.get_jid_from_account(account) + def _encrypt_thread(from_jid, to_jid, plaintext): + msg_dict = state.create_msg(from_jid, + to_jid, plaintext) + if not msg_dict: + return True + encrypted_node = OmemoMessage(msg_dict) + event.msg_iq.delChild('body') + event.msg_iq.addChild(node=encrypted_node) + log.debug(account + ' → ' + str(event.msg_iq)) + gajim.thread_interface(_encrypt_thread, [from_jid, to_jid, plaintext]) except: return True

1 0

gajim-plugins: Update archlinux PKGBUILD to 0.4
by Gajim Plugins 03 May '16

03 May '16

changeset b6c7e89ac38d in /home/hg/repos/gajim-plugins author: cippaciong <lacapannadelloziotom(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=b6c7e89ac38d description: Update archlinux PKGBUILD to 0.4 diffstat: omemo/pkgs/PKGBUILD | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (25 lines): diff -r 51fb05923dc3 -r b6c7e89ac38d omemo/pkgs/PKGBUILD --- a/omemo/pkgs/PKGBUILD Tue Jan 26 15:42:04 2016 +0100 +++ b/omemo/pkgs/PKGBUILD Wed Jan 27 09:58:02 2016 +0100 @@ -2,17 +2,17 @@ pkgname=gajim-plugin-omemo _pkgname=gajim-omemo -pkgver=0.3 +pkgver=0.4 pkgrel=1 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." arch=(any) -url="https://github.com/kalkin/${_pkgname}" +url="https://github.com/omemo/${_pkgname}" license=('GPL') depends=("gajim" "python2-axolotl-git") provides=('gajim-plugin-omemo') conflicts=('gajim-plugin-omemo-git') -source=("https://github.com/kalkin/${_pkgname}/archive/${pkgver}.tar.gz") -sha512sums=('0f4f1c1d6b799c3a6c159d33b4c65367da038db75f169793f13d2710b93d3651489cccd17b3782093a3a76324d701dbf9facacd373526f70e9c274e21f9f2b57') +source=("https://github.com/omemo/${_pkgname}/archive/${pkgver}.tar.gz") +sha512sums=('2ab28e40153bbcb37d1ba7993265ecf1747ffc54d1f617e074aef5bfb416aab2e864b72f2c0b073f4e3fb2bc0c926f63497c0fc7b18d48cf9e1333db0e268279') package() { cd $srcdir/gajim-omemo-${pkgver}

1 0

gajim-plugins: Document installation via Package Managers
by Gajim Plugins 03 May '16

03 May '16

changeset 6baad29f1308 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=6baad29f1308 description: Document installation via Package Managers diffstat: omemo/README.md | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diffs (30 lines): diff -r 074793624d8a -r 6baad29f1308 omemo/README.md --- a/omemo/README.md Thu Jan 28 16:55:52 2016 +0100 +++ b/omemo/README.md Fri Feb 12 14:36:28 2016 +0100 @@ -8,6 +8,16 @@ **DO NOT rely on this plugin to protect sensitive information!** ## Installation + +### Via Package Manager +#### Arch +See [Arch Wiki](https://wiki.archlinux.org/index.php/Gajim#OMEMO_Support) + +#### Gentoo +`layman -a flow && emerge gajim-omemo` + +### Via PluginInstallerPlugin + Install the current stable version via the Gajim PluginManager. You *need* Gajim version *0.16.5*. If your package manager does not provide an up to date version you can install it from the official Mercurial repository. *DO NOT USE* gajim @@ -18,8 +28,7 @@ hg update gajim-0.16.5 --clean ``` -### Python libraries -You *have* to install `python-axolotl` via `pip`. Depending on your setup you might +**NOTE:** You *have* to install `python-axolotl` via `pip`. Depending on your setup you might want to use `pip2` as Gajim is using python2.7. If you are using the official repository, do not forget to install the `nbxmpp` dependency via pip or you package manager.

1 0

gajim-plugins: Revert "Fix delay when sending messages - #13"
by Gajim Plugins 03 May '16

03 May '16

changeset c31a85bbdd58 in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=c31a85bbdd58 description: Revert "Fix delay when sending messages - #13" This reverts commit d970936e15c13e4738de37b0d2a60193ed828041. diffstat: omemo/__init__.py | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diffs (29 lines): diff -r 6baad29f1308 -r c31a85bbdd58 omemo/__init__.py --- a/omemo/__init__.py Fri Feb 12 14:36:28 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 17:46:19 2016 +0100 @@ -452,17 +452,14 @@ if not state.encryption.is_active(to_jid): return False try: - from_jid = gajim.get_jid_from_account(account) - def _encrypt_thread(from_jid, to_jid, plaintext): - msg_dict = state.create_msg(from_jid, - to_jid, plaintext) - if not msg_dict: - return True - encrypted_node = OmemoMessage(msg_dict) - event.msg_iq.delChild('body') - event.msg_iq.addChild(node=encrypted_node) - log.debug(account + ' → ' + str(event.msg_iq)) - gajim.thread_interface(_encrypt_thread, [from_jid, 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) + event.msg_iq.delChild('body') + event.msg_iq.addChild(node=encrypted_node) + log.debug(account + ' → ' + str(event.msg_iq)) except: return True

1 0

gajim-plugins: add device ids when receiving a whisper message
by Gajim Plugins 03 May '16

03 May '16

changeset 01a00dc2a239 in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=01a00dc2a239 description: add device ids when receiving a whisper message diffstat: omemo/__init__.py | 6 ++++++ omemo/lib/python-omemo/src/omemo/state.py | 10 ++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diffs (50 lines): diff -r ace1409f4cab -r 01a00dc2a239 omemo/__init__.py --- a/omemo/__init__.py Fri Mar 25 18:07:46 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 20:15:35 2016 +0100 @@ -122,6 +122,7 @@ def message_received(self, msg): if msg.stanza.getTag('encrypted', namespace=NS_OMEMO): account = msg.conn.name + my_jid = gajim.get_jid_from_account(account) log.debug(account + ' ⇒ OMEMO msg received') state = self.get_omemo_state(account) @@ -138,6 +139,11 @@ if not plaintext: return + if my_jid == msg_dict['sender_jid']: + state.add_own_device(msg['sid']) + else: + state.add_device(msg_dict['sender_jid'], msg_dict['sid']) + msg.msgtxt = plaintext msg.stanza.setBody(msg.msgtxt) diff -r ace1409f4cab -r 01a00dc2a239 omemo/lib/python-omemo/src/omemo/state.py --- a/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 18:07:46 2016 +0100 +++ b/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 20:15:35 2016 +0100 @@ -91,6 +91,12 @@ log.debug('Saving devices for ' + name + ' → ' + str(devices)) self.device_ids[name] = devices + def add_device(self, name, device_id): + if name not in self.device_ids: + self.device_ids[name] = {device_id} + elif device_id not in self.device_ids[name]: + self.device_ids[name].append(device_id) + def set_own_devices(self, name, devices): """ Overwrite the current :py:attribute:`OmemoState.own_devices` with the given devices. @@ -103,6 +109,10 @@ self.own_name = name self.own_devices = devices + def add_own_device(self, device_id): + if device_id not in self.own_devices: + self.own_devices.append(device_id) + @property def own_device_id(self): reg_id = self.store.getLocalRegistrationId()

1 0

gajim-plugins: fixed typo
by Gajim Plugins 03 May '16

03 May '16

changeset a0fcf3c9a16b in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=a0fcf3c9a16b description: fixed typo diffstat: omemo/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ea036815f41d -r a0fcf3c9a16b omemo/__init__.py --- a/omemo/__init__.py Fri Mar 25 21:06:44 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 21:18:29 2016 +0100 @@ -143,7 +143,7 @@ return if my_jid == msg_dict['sender_jid']: - state.add_own_device(msg['sid']) + state.add_own_device(msg_dict['sid']) else: state.add_device(msg_dict['sender_jid'], msg_dict['sid'])

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