changeset a761d5282b57 in /home/hg/repos/gajim-plugins

author: tmolitor thilo@eightysoft.de branches: details:gajim-plugins?cmd=changeset;node=a761d5282b57 description: new version...

diffstat:

omemo/README.md | 23 ++++++++++++++++------- omemo/__init__.py | 7 +++++-- omemo/manifest.ini | 7 ++++--- 3 files changed, 25 insertions(+), 12 deletions(-)

diffs (81 lines):

diff -r f687ff4e7172 -r a761d5282b57 omemo/README.md --- a/omemo/README.md Sat Dec 26 10:21:55 2015 +0100 +++ b/omemo/README.md Sun Dec 27 18:03:23 2015 +0100 @@ -7,14 +7,8 @@

**DO NOT rely on this plugin to protect sensitive information!**

-## Dependencies -All dependencies can be installed with `pip`. (Depending on your setup you might -want to use `pip2` as Gajim is using python2.7) - -* python-axolotl - ## Installation -Clone the git repository into Gajim's plugin directory. +You can install this plugin via the Gajim PluginManager or by cloning the git repository into Gajim's plugin directory.

```shell mkdir ~/.local/share/gajim/plugins -p @@ -22,6 +16,21 @@ git clone git@github.com:kalkin/gajim-omemo.git ```

+### Dependencies +#### Gajim +You need Gajim version 0.16.4. If your package manager does not provide an up to date +version you can install it from the official Mercurial repository. +```shell +hg clone https://hg.gajim.org/gajim +cd gajim +hg update gajim-0.16.4 --clean +``` + +#### Python libraries +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 `nxmpp` dependency via pip or you package manager. + ## Running Enable *OMEMO Multi-End Message and Object Encryption* in the Plugin-Manager. Before exchanging encrypted messages with a contact you have to hit the *Get diff -r f687ff4e7172 -r a761d5282b57 omemo/__init__.py --- a/omemo/__init__.py Sat Dec 26 10:21:55 2015 +0100 +++ b/omemo/__init__.py Sun Dec 27 18:03:23 2015 +0100 @@ -130,7 +130,7 @@ account = msg.conn.name from_jid = str(msg.stanza.getAttr('from')) jid = gajim.get_jid_without_resource(from_jid) - gui = self.ui_list[account][jid] + gui = self.ui_list[account].get(jid, None) if gui and gui.encryption_active(): gui.plain_warning()

@@ -381,7 +381,10 @@

log.info(state.name + ' ⇒ Clearing devices_list ' + str(devices_list)) iq = DeviceListAnnouncement(devices_list) - gajim.connections[state.name].connection.send(iq) + connection = gajim.connections[state.name].connection + if not connection: # not connected + return + connection.send(iq) id_ = str(iq.getAttr('id')) iq_ids_to_callbacks[id_] = lambda event: log.info(event)

diff -r f687ff4e7172 -r a761d5282b57 omemo/manifest.ini --- a/omemo/manifest.ini Sat Dec 26 10:21:55 2015 +0100 +++ b/omemo/manifest.ini Sun Dec 27 18:03:23 2015 +0100 @@ -1,8 +1,9 @@ [info] name: OMEMO Multi-End Message and Object Encryption short_name: omemo -version: 0.1 -description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption. It is an open standard based on Axolotl and PEP which can be freely used and implemented by anyone. -authors: Bahtiar `kalkin-` Gadimov bahtiar@gadimov.de +version: 0.2 +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@gadimov.de, + Daniel Gultsch daniel@gultsch.de homepage: http://github.com/kalkin/gajim-omemo.git