Commits October 2016

commits@gajim.org

1 participants
87 discussions

gajim: Fix ad-hoc command window only displaying a very small area
by Gajim 30 Oct '16

30 Oct '16

changeset 66fcb7c9a012 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=66fcb7c9a012 description: Fix ad-hoc command window only displaying a very small area diffstat: data/gui/adhoc_commands_window.ui | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r da49257cc3ce -r 66fcb7c9a012 data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Tue Oct 18 16:26:03 2016 +0200 +++ b/data/gui/adhoc_commands_window.ui Sun Oct 30 19:50:06 2016 +0000 @@ -119,7 +119,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -385,7 +385,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing>

1 0

gajim-plugins: Handle unknown entities
by Gajim Plugins 30 Oct '16

30 Oct '16

changeset e1d7291ab37c in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=e1d7291ab37c description: Handle unknown entities diffstat: gotr/otrmodule.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 678e16de4738 -r e1d7291ab37c gotr/otrmodule.py --- a/gotr/otrmodule.py Sun Oct 30 19:07:55 2016 +0100 +++ b/gotr/otrmodule.py Sun Oct 30 21:38:15 2016 +0100 @@ -707,8 +707,12 @@ self.stripped_data += '\n' def handle_entityref(self, name): - c = unichr(name2codepoint[name]) + try: + c = unichr(name2codepoint[name]) + except KeyError: + c = '&{};'.format(name) self.stripped_data += c + def handle_charref(self, name): if name.startswith('x'): c = unichr(int(name[1:], 16))

1 0

gajim-plugins: Handle apostrophe correctly
by Gajim Plugins 30 Oct '16

30 Oct '16

changeset 678e16de4738 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=678e16de4738 description: Handle apostrophe correctly diffstat: gotr/manifest.ini | 2 +- gotr/otrmodule.py | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 75ede510ed84 -r 678e16de4738 gotr/manifest.ini --- a/gotr/manifest.ini Fri Oct 21 03:47:13 2016 +0200 +++ b/gotr/manifest.ini Sun Oct 30 19:07:55 2016 +0100 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.9.5 +version: 1.9.6 description: Provide OTR encryption. Read <a href="https://github.com/python-otr/gajim-otr/wiki">https://github.com/python-otr/gajim-otr/wiki</a> before use. authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de diff -r 75ede510ed84 -r 678e16de4738 gotr/otrmodule.py --- a/gotr/otrmodule.py Fri Oct 21 03:47:13 2016 +0200 +++ b/gotr/otrmodule.py Sun Oct 30 19:07:55 2016 +0100 @@ -82,6 +82,7 @@ from HTMLParser import HTMLParser from htmlentitydefs import name2codepoint +name2codepoint['apos'] = 0x0027 HAS_CRYPTO = True try:

1 0

gajim: Store optional fields correctly in Bookmarks
by Gajim 21 Oct '16

21 Oct '16

changeset e34411e66704 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=e34411e66704 description: Store optional fields correctly in Bookmarks diffstat: src/common/connection.py | 10 +++++-- src/common/connection_handlers_events.py | 40 ++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 17 deletions(-) diffs (101 lines): diff -r 738aa5082b6a -r e34411e66704 src/common/connection.py --- a/src/common/connection.py Sun Oct 16 22:40:41 2016 +0200 +++ b/src/common/connection.py Fri Oct 21 22:40:50 2016 +0200 @@ -2473,7 +2473,8 @@ """ if not gajim.account_is_connected(self.name): return - if self.pubsub_supported and storage_type != 'xml': + if self.pubsub_supported and self.pubsub_publish_options_supported \ + and storage_type != 'xml': self.send_pb_retrieve('', 'storage:bookmarks') # some server (ejabberd) are so slow to answer that we request via XML # if we don't get answer in the next 30 seconds @@ -2488,6 +2489,7 @@ storage_type can be set to 'pubsub' or 'xml' so store in only one method else it will be stored on both """ + NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' if not gajim.account_is_connected(self.name): return iq = nbxmpp.Node(tag='storage', attrs={'xmlns': 'storage:bookmarks'}) @@ -2495,8 +2497,9 @@ iq2 = iq.addChild(name = "conference") iq2.setAttr('jid', bm['jid']) iq2.setAttr('autojoin', bm['autojoin']) - iq2.setAttr('minimize', bm['minimize']) iq2.setAttr('name', bm['name']) + iq2.setTag('minimize', namespace=NS_GAJIM_BM). \ + setData(bm['minimize']) # Only add optional elements if not empty # Note: need to handle both None and '' as empty # thus shouldn't use "is not None" @@ -2505,7 +2508,8 @@ if bm.get('password', None): iq2.setTagData('password', bm['password']) if bm.get('print_status', None): - iq2.setTagData('print_status', bm['print_status']) + iq2.setTag('print_status', namespace=NS_GAJIM_BM). \ + setData(bm['print_status']) if self.pubsub_supported and self.pubsub_publish_options_supported and \ storage_type != 'xml': diff -r 738aa5082b6a -r e34411e66704 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Oct 16 22:40:41 2016 +0200 +++ b/src/common/connection_handlers_events.py Fri Oct 21 22:40:50 2016 +0200 @@ -508,29 +508,41 @@ class BookmarksHelper: def parse_bookmarks(self): self.bookmarks = [] + NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' confs = self.storage_node.getTags('conference') for conf in confs: autojoin_val = conf.getAttr('autojoin') - if autojoin_val is None: # not there (it's optional) + if not autojoin_val: # not there (it's optional) autojoin_val = False - minimize_val = conf.getAttr('minimize') - if minimize_val is None: # not there (it's optional) - minimize_val = False - print_status = conf.getTagData('print_status') - if not print_status: - print_status = conf.getTagData('show_status') + minimize_val = conf.getTag('minimize', namespace=NS_GAJIM_BM) + if not minimize_val: # not there, try old Gajim behaviour + minimize_val = conf.getAttr('minimize') + if not minimize_val: # not there (it's optional) + minimize_val = False + else: + minimize_val = minimize_val.getData() + + print_status = conf.getTag('print_status', namespace=NS_GAJIM_BM) + if not print_status: # not there, try old Gajim behaviour + print_status = conf.getTagData('print_status') + if not print_status: # not there, try old Gajim behaviour + print_status = conf.getTagData('show_status') + else: + print_status = print_status.getData() + try: jid = helpers.parse_jid(conf.getAttr('jid')) except helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) + log.warning('Invalid JID: %s, ignoring it' + % conf.getAttr('jid')) continue bm = {'name': conf.getAttr('name'), - 'jid': jid, - 'autojoin': autojoin_val, - 'minimize': minimize_val, - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - 'print_status': print_status} + 'jid': jid, + 'autojoin': autojoin_val, + 'minimize': minimize_val, + 'password': conf.getTagData('password'), + 'nick': conf.getTagData('nick'), + 'print_status': print_status} bm_jids = [b['jid'] for b in self.bookmarks]

1 0

gajim-plugins: Merge branch 'omemo-0.9.5'
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 75ede510ed84 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=75ede510ed84 description: Merge branch 'omemo-0.9.5' diffstat: omemo/CHANGELOG | 5 + omemo/README.md | 7 + omemo/__init__.py | 373 ++++++++++++++++++++--- omemo/config_dialog.ui | 194 ++++++++++++- omemo/fpr_dialog.ui | 27 +- omemo/manifest.ini | 2 +- omemo/omemo/liteaxolotlstore.py | 18 + omemo/omemo/liteidentitykeystore.py | 13 +- omemo/omemo/litesessionstore.py | 57 ++- omemo/omemo/state.py | 151 +++++++-- omemo/pkgs/PKGBUILD | 6 +- omemo/ui.py | 555 +++++++++++++++++++++++------------ 12 files changed, 1074 insertions(+), 334 deletions(-) diffs (truncated from 2101 to 300 lines): diff -r 1063fb15f4da -r 75ede510ed84 omemo/CHANGELOG --- a/omemo/CHANGELOG Mon Oct 17 15:14:30 2016 +0200 +++ b/omemo/CHANGELOG Fri Oct 21 03:47:13 2016 +0200 @@ -1,3 +1,8 @@ +0.9.5 / 2016-10-10 +- Add GroupChat BETA +- Add Option to delete Fingerprints +- Add Option to deactivate Accounts for OMEMO + 0.9.0 / 2016-08-28 - Send INFO message to resources who dont support OMEMO - Check dependencys and give correct error message diff -r 1063fb15f4da -r 75ede510ed84 omemo/README.md --- a/omemo/README.md Mon Oct 17 15:14:30 2016 +0200 +++ b/omemo/README.md Fri Oct 21 03:47:13 2016 +0200 @@ -57,6 +57,13 @@ you can receive messages from fingerprints where you didnt made a trust decision, but you cant receive Messages from *not trusted* fingerprints +## Filetransfer + +For Filetransfer use the **httpupload** plugin. + +For decrypting and showing pictures in chat use the **url_image_preview** plugin. + +If you want to use these plugins together with *OMEMO* you have to install the `python-cryptography` package ## Debugging To see OMEMO related debug output start Gajim with the parameter `-l diff -r 1063fb15f4da -r 75ede510ed84 omemo/__init__.py --- a/omemo/__init__.py Mon Oct 17 15:14:30 2016 +0200 +++ b/omemo/__init__.py Fri Oct 21 03:47:13 2016 +0200 @@ -21,14 +21,15 @@ import logging import os import sqlite3 -import os +import shutil +import message_control -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 from nbxmpp.simplexml import Node -from nbxmpp import NS_CORRECT +from nbxmpp import NS_CORRECT, NS_ADDRESS from . import ui from .ui import Ui @@ -40,7 +41,7 @@ from common import demandimport demandimport.enable() -demandimport.ignore += ['_imp'] +demandimport.ignore += ['_imp', '_thread', 'axolotl'] IQ_CALLBACK = {} @@ -54,42 +55,51 @@ 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') 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') +GROUPCHAT = False 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 + if pkg.parse_version(GAJIM_VER) > pkg.parse_version('0.16.5'): + GROUPCHAT = True +else: + # if GAJIM_VER < 0.16.5, the Plugin fails on missing dependencys earlier + if not GAJIM_VER == '0.16.5': + GROUPCHAT = True # pylint: disable=no-init # pylint: disable=attribute-defined-outside-init @@ -99,6 +109,8 @@ omemo_states = {} ui_list = {} + groupchat = {} + temp_groupchat = {} @log_calls('OmemoPlugin') def init(self): @@ -116,15 +128,48 @@ 'stanza-message-outgoing': (ged.PRECORE, self.handle_outgoing_stanza), 'message-outgoing': - (ged.PRECORE, self.handle_outgoing_event), - } + (ged.PRECORE, self.handle_outgoing_event)} + if GROUPCHAT: + self.events_handlers['gc-stanza-message-outgoing'] =\ + (ged.PRECORE, self.handle_outgoing_gc_stanza) + self.events_handlers['gc-presence-received'] =\ + (ged.PRECORE, self.gc_presence_received) + self.events_handlers['gc-config-changed-received'] =\ + (ged.PRECORE, self.gc_config_changed_received) + self.events_handlers['muc-admin-received'] =\ + (ged.PRECORE, self.room_memberlist_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': ([], ''), } + + 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') + 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): @@ -140,13 +185,14 @@ ------- OmemoState """ + if account in self.disabled_accounts: + return 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) @@ -170,6 +216,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 = [] @@ -183,11 +231,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 + @@ -202,23 +254,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): @@ -235,12 +289,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) @@ -293,12 +350,14 @@ ------- 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

1 0

gajim-plugins: Add restart note for disabling accounts
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 0511dab4b3e0 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=0511dab4b3e0 description: Add restart note for disabling accounts diffstat: omemo/config_dialog.ui | 166 ++++++++++++++++++++++++++++-------------------- 1 files changed, 97 insertions(+), 69 deletions(-) diffs (214 lines): diff -r cea2e7b54062 -r 0511dab4b3e0 omemo/config_dialog.ui --- a/omemo/config_dialog.ui Sun Oct 09 02:20:56 2016 +0200 +++ b/omemo/config_dialog.ui Sun Oct 09 02:22:08 2016 +0200 @@ -422,39 +422,81 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox6"> + <object class="GtkVBox" id="vbox2"> <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"> + <object class="GtkLabel" id="label6"> + <property name="height_request">30</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">You have to restart Gajim for changes to take effect !</property> + <attributes> + <attribute name="weight" value="bold"/> + <attribute name="foreground" value="#ffff00000000"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</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="GtkScrolledWindow" id="scrolledwindow3"> + <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="can_focus">False</property> <child> - <object class="GtkTreeView" id="active_accounts_view"> + <object class="GtkScrolledWindow" id="scrolledwindow3"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">account_store</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="title" translatable="yes">Active Accounts</property> - <property name="alignment">0.5</property> + <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="GtkCellRendererText" id="cellrenderertext5"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <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> @@ -464,73 +506,59 @@ </packing> </child> <child> - <object class="GtkButton" id="disable_accounts_btn"> - <property name="label" translatable="yes">Disable Account</property> + <object class="GtkVBox" id="vbox6"> <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"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="can_focus">False</property> <child> - <object class="GtkTreeView" id="disabled_accounts_view"> + <object class="GtkScrolledWindow" id="scrolledwindow4"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">disabled_account_store</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="title" translatable="yes">Disabled Accounts</property> - <property name="alignment">0.5</property> + <object class="GtkTreeView" id="disabled_accounts_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">disabled_account_store</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext6"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <property name="title" translatable="yes">Disabled Accounts</property> + <property name="alignment">0.5</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext6"/> + <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="activate_accounts_btn"> + <property name="label" translatable="yes">Activate Account</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="activate_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="GtkButton" id="activate_accounts_btn"> - <property name="label" translatable="yes">Activate Account</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="activate_accounts_btn_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child>

1 0

gajim-plugins: Refactoring UI
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset e3922009f433 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=e3922009f433 description: Refactoring UI diffstat: omemo/config_dialog.ui | 3 + omemo/fpr_dialog.ui | 25 ++-- omemo/ui.py | 256 ++++++++++++++++++------------------------------ 3 files changed, 112 insertions(+), 172 deletions(-) diffs (truncated from 537 to 300 lines): diff -r 0511dab4b3e0 -r e3922009f433 omemo/config_dialog.ui --- a/omemo/config_dialog.ui Sun Oct 09 02:22:08 2016 +0200 +++ b/omemo/config_dialog.ui Sun Oct 09 19:10:37 2016 +0200 @@ -206,6 +206,9 @@ <object class="GtkTreeViewColumn" id="name_column"> <property name="resizable">True</property> <property name="title">Name</property> + <property name="clickable">True</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">1</property> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> diff -r 0511dab4b3e0 -r e3922009f433 omemo/fpr_dialog.ui --- a/omemo/fpr_dialog.ui Sun Oct 09 02:22:08 2016 +0200 +++ b/omemo/fpr_dialog.ui Sun Oct 09 19:10:37 2016 +0200 @@ -2,12 +2,6 @@ <interface> <requires lib="gtk+" version="2.16"/>  - <object class="GtkListStore" id="account_store"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkListStore" id="fingerprint_store"> <columns>  @@ -43,7 +37,9 @@ <object class="GtkTreeView" id="fingerprint_view"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_tooltip">True</property> <property name="model">fingerprint_store</property> + <property name="headers_clickable">False</property> <property name="search_column">0</property> <property name="tooltip_column">3</property> <signal name="button-press-event" handler="fpr_button_pressed_cb" swapped="no"/> @@ -51,8 +47,11 @@ <object class="GtkTreeViewColumn" id="name_column"> <property name="resizable">True</property> <property name="title">Name</property> + <property name="clickable">True</property> + <property name="sort_indicator">True</property> + <property name="sort_column_id">1</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> + <object class="GtkCellRendererText" id="NameCell"/> <attributes> <attribute name="text">1</attribute> </attributes> @@ -64,7 +63,7 @@ <property name="resizable">True</property> <property name="title">Trust</property> <child> - <object class="GtkCellRendererText" id="cellrenderertoggle1"/> + <object class="GtkCellRendererText" id="TrustCell"/> <attributes> <attribute name="text">2</attribute> </attributes> @@ -76,7 +75,7 @@ <property name="resizable">True</property> <property name="title">Fingerprint</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext4"/> + <object class="GtkCellRendererText" id="FingerprintCell"/> <attributes> <attribute name="markup">3</attribute> </attributes> @@ -200,7 +199,7 @@ <property name="resizable">True</property> <property name="title">Name</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> + <object class="GtkCellRendererText" id="NameCell1"/> <attributes> <attribute name="text">1</attribute> </attributes> @@ -212,7 +211,7 @@ <property name="resizable">True</property> <property name="title">Trust</property> <child> - <object class="GtkCellRendererText" id="cellrenderertoggle2"/> + <object class="GtkCellRendererText" id="TrustCell2"/> <attributes> <attribute name="text">2</attribute> </attributes> @@ -224,7 +223,7 @@ <property name="resizable">True</property> <property name="title">Fingerprint</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext3"/> + <object class="GtkCellRendererText" id="FingerprintCell1"/> <attributes> <attribute name="markup">3</attribute> </attributes> @@ -291,8 +290,6 @@ <object class="GtkMenuItem" id="copyfprclipboard_item"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Context menu item">Copy to clipboard</property> - <property name="use_underline">True</property> <signal name="activate" handler="clipboard_button_cb" swapped="no"/> </object> </child> diff -r 0511dab4b3e0 -r e3922009f433 omemo/ui.py --- a/omemo/ui.py Sun Oct 09 02:22:08 2016 +0200 +++ b/omemo/ui.py Sun Oct 09 19:10:37 2016 +0200 @@ -28,6 +28,7 @@ # pylint: disable=import-error import gtkgui_helpers from common import gajim +from dialogs import YesNoDialog from plugins.gui import GajimPluginConfigDialog from axolotl.state.sessionrecord import SessionRecord # pylint: enable=import-error @@ -328,22 +329,13 @@ self.plugin.config['DISABLED_ACCOUNTS'] = [] self.disabled_accounts = self.plugin.config['DISABLED_ACCOUNTS'] + log.debug('Disabled Accounts:') log.debug(self.disabled_accounts) - self.fpr_model = gtk.ListStore(gobject.TYPE_INT, - gobject.TYPE_STRING, - gobject.TYPE_STRING, - gobject.TYPE_STRING, - gobject.TYPE_INT) - - self.device_model = gtk.ListStore(gobject.TYPE_STRING) + self.fpr_model = self.B.get_object('fingerprint_store') + self.device_model = self.B.get_object('deviceid_store') 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) - - self.device_view = self.B.get_object('deviceid_view') - self.device_view.set_model(self.device_model) self.disabled_acc_store = self.B.get_object('disabled_account_store') self.account_store = self.B.get_object('account_store') @@ -358,7 +350,6 @@ self.plugin_active = False def on_run(self): - log.debug('on_run') for plugin in gajim.plugin_manager.active_plugins: log.debug(type(plugin)) if type(plugin).__name__ == 'OmemoPlugin': @@ -380,17 +371,12 @@ return False def update_account_store(self): - log.debug('update_account_store') - # get accounts - log.debug(self.disabled_accounts) for account in sorted(gajim.contacts.get_accounts()): if account not in self.disabled_accounts and \ not self.is_in_accountstore(account): - log.debug('append') self.account_store.append(row=(account,)) def update_account_combobox(self): - log.debug('update_account_combobox') if self.plugin_active is False: return if len(self.account_store) > 0: @@ -400,24 +386,20 @@ self.B.get_object('account_combobox')) def account_combobox_changed_cb(self, box, *args): - log.debug('account_combobox_changed_cb') self.update_context_list() def update_disabled_account_view(self): - log.debug('update_disabled_account_view') self.disabled_acc_store.clear() for account in self.disabled_accounts: self.disabled_acc_store.append(row=(account,)) def activate_accounts_btn_clicked(self, button, *args): - log.debug('activate_accounts_btn_clicked') mod, paths = self.disabled_acc_view.get_selection().get_selected_rows() for path in paths: it = mod.get_iter(path) account = mod.get(it, 0) if account[0] in self.disabled_accounts and \ not self.is_in_accountstore(account[0]): - log.debug('add/remove') self.account_store.append(row=(account[0],)) self.disabled_accounts.remove(account[0]) self.update_disabled_account_view() @@ -425,7 +407,6 @@ self.update_account_combobox() def disable_accounts_btn_clicked(self, button, *args): - log.debug('disable_accounts_btn_clicked') mod, paths = self.active_acc_view.get_selection().get_selected_rows() for path in paths: it = mod.get_iter(path) @@ -446,37 +427,25 @@ mod, paths = self.fpr_view.get_selection().get_selected_rows() + def on_yes(checked): + record = state.store.loadSession(jid, deviceid) + identity_key = record.getSessionState().getRemoteIdentityKey() + + state.store.deleteSession(jid, deviceid) + state.store.deleteIdentity(jid, identity_key) + self.update_context_list() + 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() + YesNoDialog( + 'Delete Fingerprint?', + 'Do you want to delete the ' + 'fingerprint of {} on your account {}?' + '\n\n<tt>{}</tt>'.format(jid, account, fpr), + on_response_yes=on_yes, transient_for=self) def trust_button_clicked_cb(self, button, *args): active = self.B.get_object('account_combobox').get_active() @@ -486,48 +455,42 @@ mod, paths = self.fpr_view.get_selection().get_selected_rows() + def on_yes(checked, identity_key): + state.store.setTrust(identity_key, TRUSTED) + try: + if self.plugin.ui_list[account]: + self.plugin.ui_list[account][jid]. \ + refresh_auth_lock_icon() + except: + log.debug('UI not available') + self.update_context_list() + + def on_no(identity_key): + state.store.setTrust(identity_key, UNTRUSTED) + try: + if jid in self.plugin.ui_list[account]: + self.plugin.ui_list[account][jid]. \ + refresh_auth_lock_icon() + except: + log.debug('UI not available') + self.update_context_list() + 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('Trust / Revoke 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 trust 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() record = state.store.loadSession(jid, deviceid) identity_key = record.getSessionState().getRemoteIdentityKey()

1 0

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

21 Oct '16

changeset fff4c0f1ea62 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=fff4c0f1ea62 description: Add version check for GroupChat diffstat: omemo/__init__.py | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diffs (47 lines): diff -r e3922009f433 -r fff4c0f1ea62 omemo/__init__.py --- a/omemo/__init__.py Sun Oct 09 19:10:37 2016 +0200 +++ b/omemo/__init__.py Sun Oct 09 21:06:40 2016 +0200 @@ -80,6 +80,7 @@ ERROR_MSG = 'Error: ' + str(e) GAJIM_VER = gajim.config.get('version') +GROUPCHAT = False if os.name != 'nt': try: @@ -93,6 +94,12 @@ if not SETUPTOOLS_MISSING: if pkg.parse_version(GAJIM_VER) < pkg.parse_version('0.16.5'): ERROR_MSG = GAJIM_VERSION + if pkg.parse_version(GAJIM_VER) > pkg.parse_version('0.16.5'): + GROUPCHAT = True +else: + # if GAJIM_VER < 0.16.5, the Plugin fails on missing dependencys earlier + if not GAJIM_VER == '0.16.5': + GROUPCHAT = True # pylint: disable=no-init # pylint: disable=attribute-defined-outside-init @@ -120,14 +127,14 @@ 'stanza-message-outgoing': (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), - } + (ged.PRECORE, self.handle_outgoing_event)} + if GROUPCHAT: + self.events_handlers['gc-stanza-message-outgoing'] =\ + (ged.PRECORE, self.handle_outgoing_gc_stanza) + self.events_handlers['gc-presence-received'] =\ + (ged.PRECORE, self.gc_presence_received) + self.events_handlers['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),

1 0

gajim-plugins: Update CHANGELOG
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset dc5978e74a3b in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=dc5978e74a3b description: Update CHANGELOG diffstat: omemo/CHANGELOG | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (12 lines): diff -r fff4c0f1ea62 -r dc5978e74a3b omemo/CHANGELOG --- a/omemo/CHANGELOG Sun Oct 09 21:06:40 2016 +0200 +++ b/omemo/CHANGELOG Mon Oct 10 12:59:22 2016 +0200 @@ -1,3 +1,8 @@ +0.9.5 / 2016-10-10 +- Add GroupChat BETA +- Add Option to delete Fingerprints +- Add Option to deactivate Accounts for OMEMO + 0.9.0 / 2016-08-28 - Send INFO message to resources who dont support OMEMO - Check dependencys and give correct error message

1 0

gajim-plugins: Update manifest.ini
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 708c7c7193eb in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=708c7c7193eb description: Update manifest.ini diffstat: omemo/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dc5978e74a3b -r 708c7c7193eb omemo/manifest.ini --- a/omemo/manifest.ini Mon Oct 10 12:59:22 2016 +0200 +++ b/omemo/manifest.ini Mon Oct 10 12:59:50 2016 +0200 @@ -1,7 +1,7 @@ [info] name: OMEMO short_name: omemo -version: 0.9.0 +version: 0.9.5 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 some dependencys, you can find install instructions for your system in the Github Wiki. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> Daniel Gultsch <daniel(a)gultsch.de>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2016