Commits July 2020

commits@gajim.org

1 participants
77 discussions

[Git][gajim/gajim][master] Groupchat: Handle invites consistently
by Philipp Hörist 06 Jul '20

06 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9c2f5427 by lovetox at 2020-07-06T22:41:35+02:00 Groupchat: Handle invites consistently - Always print a status message - Display errors on invite Fixes #10171 - - - - - 6 changed files: - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1071,9 +1071,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): else: self.received_history_pos = pos - def add_info_message(self, text): + def add_info_message(self, text, message_id=None): self.conv_textview.print_conversation_line( - text, 'info', '', None, graphics=False) + text, 'info', '', None, message_id=message_id, graphics=False) def add_status_message(self, text): self.conv_textview.print_conversation_line( ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -308,10 +308,9 @@ class StandardGroupChatCommands(CommandContainer): @command(raw=True, empty=True) @doc(_("Invite a user to a group chat for a reason")) def invite(self, jid, reason): - self.connection.get_module('MUC').invite(self.room_jid, jid, reason) - return _("Invited %(jid)s to %(room_jid)s") % { - 'jid': jid, - 'room_jid': self.room_jid} + control = app.get_groupchat_control(self.account, self.room_jid) + if control is not None: + control.invite(jid) @command(raw=True, empty=True) @doc(_("Join a group chat given by an XMPP Address")) ===================================== gajim/common/app.py ===================================== @@ -644,3 +644,12 @@ def get_stored_bob_data(algo_hash: str) -> Optional[bytes]: data = file.read() return data return None + +def get_groupchat_control(account, jid): + control = app.interface.msg_win_mgr.get_gc_control(jid, account) + if control is not None: + return control + try: + return app.interface.minimized_controls[account][jid] + except Exception: + return None ===================================== gajim/common/modules/muc.py ===================================== @@ -777,7 +777,8 @@ class MUC(BaseModule): password = app.gc_passwords.get(room, None) self._log.info('Invite %s to %s', to, room) - self._nbxmpp('MUC').invite(room, to, reason, password, continue_, type_) + return self._nbxmpp('MUC').invite(room, to, reason, password, + continue_, type_) @event_filter(['account']) def _on_account_disconnected(self, _event): ===================================== gajim/groupchat_control.py ===================================== @@ -218,6 +218,7 @@ class GroupchatControl(ChatControlBase): ('signed-in', ged.GUI1, self._on_signed_in), ('decrypted-message-received', ged.GUI2, self._on_decrypted_message_received), ('message-sent', ged.OUT_POSTCORE, self._on_message_sent), + ('message-error', ged.GUI1, self._on_message_error), ('bookmarks-received', ged.GUI2, self._on_bookmarks_received), ]) # pylint: enable=line-too-long @@ -512,11 +513,17 @@ class GroupchatControl(ChatControlBase): def _on_invite_clicked(self, _button): invitees = self._invite_box.get_invitees() - con = app.connections[self.account] for jid in invitees: - con.get_module('MUC').invite(self.room_jid, jid) + self.invite(jid) self._show_page('groupchat') + def invite(self, contact_jid): + con = app.connections[self.account] + message_id = con.get_module('MUC').invite(self.room_jid, contact_jid) + self.add_info_message( + _(f'{contact_jid} has been invited to this group chat'), + message_id=message_id) + def _on_destroy_room(self, _action, _param): self.xml.destroy_reason_entry.grab_focus() self.xml.destroy_button.grab_default() @@ -1757,10 +1764,7 @@ class GroupchatControl(ChatControlBase): return contact_jid = data - con = app.connections[self.account] - con.get_module('MUC').invite(self.room_jid, contact_jid) - self.add_info_message(_('%(jid)s has been invited to this ' - 'group chat') % {'jid': contact_jid}) + self.invite(contact_jid) def _jid_not_blocked(self, bare_jid: str) -> bool: fjid = self.room_jid + '/' + bare_jid ===================================== gajim/roster_window.py ===================================== @@ -2921,24 +2921,24 @@ class RosterWindow: app.interface.instances['file_transfers'].show_file_send_request( account, contact) - def on_invite_to_room(self, widget, list_, room_jid, room_account, - resource=None): + def on_invite_to_room(self, + _widget, + list_, + room_jid, + room_account, + resource=None): """ Resource parameter MUST NOT be used if more than one contact in list """ - for e in list_: - contact = e[0] + gc_control = app.get_groupchat_control(room_account, room_jid) + if gc_control is None: + return + + for contact, _ in list_: contact_jid = contact.jid if resource: # we MUST have one contact only in list_ contact_jid += '/' + resource - con = app.connections[room_account] - con.get_module('MUC').invite(room_jid, contact_jid) - gc_control = app.interface.msg_win_mgr.get_gc_control(room_jid, - room_account) - if gc_control: - gc_control.add_info_message( - _('%(jid)s has been invited to this group chat') % { - 'jid': contact_jid}) + gc_control.invite(contact_jid) def on_all_groupchat_maximized(self, widget, group_list): for (contact, account) in group_list: @@ -4158,8 +4158,9 @@ class RosterWindow: if type_source != 'contact': return contact_jid = data - con = app.connections[account_dest] - con.get_module('MUC').invite(jid_dest, contact_jid) + gc_control = app.get_groupchat_control(account_dest, jid_dest) + if gc_control is not None: + gc_control.invite(contact_jid) return if type_source == 'group': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c2f54275c5e5f5282d56ef329e3aabd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9c2f54275c5e5f5282d56ef329e3aabd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Return message id on invite()
by Philipp Hörist 06 Jul '20

06 Jul '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6b6987c3 by lovetox at 2020-07-06T21:30:53+02:00 MUC: Return message id on invite() - - - - - 1 changed file: - nbxmpp/modules/muc.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -492,7 +492,7 @@ class MUC(BaseModule): else: invite = self._build_mediated_invite( room, to, reason, password, continue_) - self._client.send_stanza(invite) + return self._client.send_stanza(invite) @staticmethod def _build_direct_invite(room, to, reason, password, continue_): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6b6987c3dbb14963d865008a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6b6987c3dbb14963d865008a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Roster: Add spam reporting
by Philipp Hörist 06 Jul '20

06 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: cb4a2ed5 by Daniel Brötzmann at 2020-07-06T09:06:31+02:00 Roster: Add spam reporting - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -2740,10 +2740,12 @@ class RosterWindow: When clicked on the 'block' button in context menu. list_ is a list of (contact, account) """ - def on_continue(msg, pep_dict): - if msg is None: - # user pressed Cancel to change status message dialog - return + def _block_it(is_checked=None, report=None): + if is_checked is not None: # Dialog has been shown + if is_checked: + app.config.set('confirm_block', 'no') + else: + app.config.set('confirm_block', 'yes') accounts = [] for _, account in list_: @@ -2755,7 +2757,7 @@ class RosterWindow: l_ = [i[0] for i in list_ if i[1] == acct] con = app.connections[acct] jid_list = [contact.jid for contact in l_] - con.get_module('Blocking').block(jid_list) + con.get_module('Blocking').block(jid_list, report) for contact in l_: ctrl = app.interface.msg_win_mgr.get_control( contact.jid, acct) @@ -2768,14 +2770,6 @@ class RosterWindow: return self.draw_contact(contact.jid, acct) - def _block_it(is_checked=None): - if is_checked is not None: # Dialog has been shown - if is_checked: - app.config.set('confirm_block', 'no') - else: - app.config.set('confirm_block', 'yes') - self.get_status_message('offline', on_continue, show_pep=False) - # Check if confirmation is needed for blocking confirm_block = app.config.get('confirm_block') if confirm_block == 'no': @@ -2789,6 +2783,10 @@ class RosterWindow: 'will not receive further messages.'), _('_Do not ask again'), [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('_Report Spam'), + callback=_block_it, + kwargs={'report': 'spam'}), DialogButton.make('Remove', text=_('_Block'), callback=_block_it)], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cb4a2ed5ecac6df95c27ae21d14ad385… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cb4a2ed5ecac6df95c27ae21d14ad385… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused methods
by Philipp Hörist 05 Jul '20

05 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d2f31355 by lovetox at 2020-07-05T22:02:53+02:00 Remove unused methods - - - - - c1aad3cf by lovetox at 2020-07-05T22:57:17+02:00 Remove privacy lists support Fixes #10161 - - - - - 13 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - gajim/common/modules/discovery.py - − gajim/common/modules/privacylists.py - gajim/dialog_messages.py - gajim/groupchat_control.py - gajim/gtk/const.py - − gajim/gtk/privacy_list.py - gajim/gtk/server_info.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -26,7 +26,6 @@ from gajim import dialogs from gajim.gtk.dialogs import ShortcutsWindow from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.about import AboutDialog -from gajim.gtk.privacy_list import PrivacyListsWindow from gajim.gtk.history import HistoryWindow from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.util import open_window @@ -171,15 +170,6 @@ def on_history_sync(_action, param): parent=interface.roster.window) -def on_privacy_lists(_action, param): - account = param.get_string() - if 'privacy_lists' in interface.instances[account]: - interface.instances[account]['privacy_lists'].window.present() - else: - interface.instances[account]['privacy_lists'] = \ - PrivacyListsWindow(account) - - def on_server_info(_action, param): account = param.get_string() open_window('ServerInfo', account=account) ===================================== gajim/application.py ===================================== @@ -473,7 +473,6 @@ class GajimApplication(Gtk.Application): ('-archive', a.on_mam_preferences, 'feature', 's'), ('-pep-config', a.on_pep_config, 'online', 's'), ('-sync-history', a.on_history_sync, 'online', 's'), - ('-privacylists', a.on_privacy_lists, 'feature', 's'), ('-blocking', a.on_blocking_list, 'feature', 's'), ('-send-server-message', a.on_send_server_message, 'online', 's'), ('-set-motd', a.on_set_motd, 'online', 's'), @@ -571,9 +570,6 @@ class GajimApplication(Gtk.Application): elif event.feature == Namespace.MAM_2: action = '%s-archive' % event.account self.lookup_action(action).set_enabled(True) - elif event.feature == Namespace.PRIVACY: - action = '%s-privacylists' % event.account - self.lookup_action(action).set_enabled(True) elif event.feature == Namespace.BLOCKING: action = '%s-blocking' % event.account self.lookup_action(action).set_enabled(True) ===================================== gajim/common/helpers.py ===================================== @@ -833,9 +833,7 @@ def get_optional_features(account): def jid_is_blocked(account, jid): con = app.connections[account] - return (jid in con.get_module('Blocking').blocked or - jid in con.get_module('PrivacyLists').blocked_contacts or - con.get_module('PrivacyLists').blocked_all) + return jid in con.get_module('Blocking').blocked def get_subscription_request_msg(account=None): s = app.config.get_per('accounts', account, 'subscription_request_msg') ===================================== gajim/common/modules/__init__.py ===================================== @@ -56,7 +56,6 @@ MODULES = [ 'pep', 'ping', 'presence', - 'privacylists', 'pubsub', 'receipts', 'register', @@ -99,11 +98,6 @@ class ModuleMock: # Blocking self.blocked = [] # type: List[Any] - # Privacy Lists - self.blocked_contacts = [] # type: List[Any] - self.blocked_groups = [] # type: List[Any] - self.blocked_all = False - # Delimiter self.delimiter = '::' ===================================== gajim/common/modules/discovery.py ===================================== @@ -137,7 +137,6 @@ class Discovery(BaseModule): self._con.get_module('Blocking').pass_disco(result) self._con.get_module('VCardTemp').pass_disco(result) self._con.get_module('Carbons').pass_disco(result) - self._con.get_module('PrivacyLists').pass_disco(result) self._con.get_module('HTTPUpload').pass_disco(result) if Namespace.REGISTER in result.features: ===================================== gajim/common/modules/privacylists.py deleted ===================================== @@ -1,436 +0,0 @@ -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -# XEP-0016: Privacy Lists - -import nbxmpp -from nbxmpp.namespaces import Namespace -from nbxmpp.structs import StanzaHandler - -from gajim.common import app -from gajim.common import helpers -from gajim.common.nec import NetworkEvent -from gajim.common.nec import NetworkIncomingEvent -from gajim.common.modules.base import BaseModule -from gajim.common.connection_handlers_events import InformationEvent - - -class PrivacyLists(BaseModule): - def __init__(self, con): - BaseModule.__init__(self, con) - - self.default_list = None - self.active_list = None - self.blocked_contacts = [] - self.blocked_groups = [] - self.blocked_list = [] - self.blocked_all = False - - self.handlers = [ - StanzaHandler(name='iq', - callback=self._list_push_received, - typ='set', - ns=Namespace.PRIVACY), - ] - - self.supported = False - - def pass_disco(self, info): - if Namespace.PRIVACY not in info.features: - return - - self.supported = True - self._log.info('Discovered XEP-0016: Privacy Lists: %s', info.jid) - - app.nec.push_incoming_event( - NetworkEvent('feature-discovered', - account=self._account, - feature=Namespace.PRIVACY)) - - def _list_push_received(self, _con, stanza, _properties): - result = stanza.buildReply('result') - result.delChild(result.getTag('query')) - self._con.connection.send(result) - - for list_ in stanza.getQueryPayload(): - if list_.getName() == 'list': - name = list_.getAttr('name') - self._log.info('Received Push: %s', name) - self.get_privacy_list(name) - - raise nbxmpp.NodeProcessed - - def get_privacy_lists(self, callback=None): - self._log.info('Request lists') - iq = nbxmpp.Iq('get', Namespace.PRIVACY) - self._con.connection.SendAndCallForResponse( - iq, self._privacy_lists_received, {'callback': callback}) - - def _privacy_lists_received(self, _nbxmpp_client, stanza, callback): - lists = [] - new_default = None - result = nbxmpp.isResultNode(stanza) - if not result: - self._log.warning('List not available: %s', stanza.getError()) - else: - for list_ in stanza.getQueryPayload(): - name = list_.getAttr('name') - if list_.getName() == 'active': - self.active_list = name - elif list_.getName() == 'default': - new_default = name - else: - lists.append(name) - - self._log.info('Received lists: %s', lists) - - # Download default list if we don’t have it - if self.default_list != new_default: - self.default_list = new_default - if new_default is not None: - self._log.info('Found new default list: %s', new_default) - self.get_privacy_list(new_default) - - if callback: - callback(result) - else: - app.nec.push_incoming_event( - PrivacyListsReceivedEvent(None, - conn=self._con, - active_list=self.active_list, - default_list=self.default_list, - lists=lists)) - - def get_privacy_list(self, name): - self._log.info('Request list: %s', name) - list_ = nbxmpp.Node('list', {'name': name}) - iq = nbxmpp.Iq('get', Namespace.PRIVACY, payload=[list_]) - self._con.connection.SendAndCallForResponse( - iq, self._privacy_list_received) - - def _privacy_list_received(self, _nbxmpp_client, stanza): - if not nbxmpp.isResultNode(stanza): - self._log.warning('List not available: %s', stanza.getError()) - return - - rules = [] - list_ = stanza.getQueryPayload()[0] - name = list_.getAttr('name') - - for child in list_.getChildren(): - - item = child.getAttrs() - - children = [] - for scnd_child in child.getChildren(): - children.append(scnd_child.getName()) - - item['child'] = children - if len(item) not in (3, 5): - self._log.warning('Wrong count of attrs: %s', stanza) - continue - rules.append(item) - - self._log.info('Received list: %s', name) - - if name == self.default_list: - self._default_list_received(rules) - - app.nec.push_incoming_event(PrivacyListReceivedEvent( - None, conn=self._con, list_name=name, rules=rules)) - - def del_privacy_list(self, name): - self._log.info('Remove list: %s', name) - - def _del_privacy_list_result(_nbxmpp_client, stanza): - if not nbxmpp.isResultNode(stanza): - self._log.warning('List deletion failed: %s', stanza.getError()) - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='privacy-list-error', args=name)) - else: - app.nec.push_incoming_event(PrivacyListRemovedEvent( - None, conn=self._con, list_name=name)) - - node = nbxmpp.Node('list', {'name': name}) - iq = nbxmpp.Iq('set', Namespace.PRIVACY, payload=[node]) - self._con.connection.SendAndCallForResponse( - iq, _del_privacy_list_result) - - def set_privacy_list(self, name, rules): - node = nbxmpp.Node('list', {'name': name}) - iq = nbxmpp.Iq('set', Namespace.PRIVACY, payload=[node]) - for item in rules: - children = item.get('child', []) - for child in children: - node.setTag(child) - item.pop('child', None) - node.setTag('item', item) - self._log.info('Update list: %s %s', name, rules) - self._con.connection.SendAndCallForResponse( - iq, self._default_result_handler, {}) - - def _default_list_received(self, rules): - roster = app.interface.roster - - for rule in rules: - if rule['action'] == 'allow': - if 'type' not in rule: - self.blocked_all = False - - elif rule['type'] == 'jid': - if rule['value'] in self.blocked_contacts: - self.blocked_contacts.remove(rule['value']) - - elif rule['type'] == 'group': - if rule['value'] in self.blocked_groups: - self.blocked_groups.remove(rule['value']) - - elif rule['action'] == 'deny': - if 'type' not in rule: - self.blocked_all = True - - elif rule['type'] == 'jid': - if rule['value'] not in self.blocked_contacts: - self.blocked_contacts.append(rule['value']) - - elif rule['type'] == 'group': - if rule['value'] not in self.blocked_groups: - self.blocked_groups.append(rule['value']) - - self.blocked_list.append(rule) - - if 'type' in rule: - if rule['type'] == 'jid': - roster.draw_contact(rule['value'], self._account) - if rule['type'] == 'group': - roster.draw_group(rule['value'], self._account) - - def set_active_list(self, name=None): - self._log.info('Set active list: %s', name) - attr = {} - if name: - attr['name'] = name - node = nbxmpp.Node('active', attr) - iq = nbxmpp.Iq('set', Namespace.PRIVACY, payload=[node]) - self._con.connection.SendAndCallForResponse( - iq, self._default_result_handler, {}) - - def set_default_list(self, name=None): - self._log.info('Set default list: %s', name) - attr = {} - if name: - attr['name'] = name - node = nbxmpp.Node('default', attr) - iq = nbxmpp.Iq('set', Namespace.PRIVACY, payload=[node]) - self._con.connection.SendAndCallForResponse( - iq, self._default_result_handler, {}) - - def _default_result_handler(self, _nbxmpp_client, stanza): - if not nbxmpp.isResultNode(stanza): - self._log.warning('Operation failed: %s', stanza.getError()) - - def _get_max_blocked_list_order(self): - max_order = 0 - for rule in self.blocked_list: - order = int(rule['order']) - if order > max_order: - max_order = order - return max_order - - def block_gc_contact(self, jid): - if jid in self.blocked_contacts: - return - self._log.info('Block GC contact: %s', jid) - - if self.default_list is None: - self.default_list = 'block' - - max_order = self._get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), - 'type': 'jid', - 'action': 'deny', - 'value': jid, - 'child': ['message', 'iq', 'presence-out']} - self.blocked_list.append(new_rule) - self.blocked_contacts.append(jid) - self.set_privacy_list(self.default_list, self.blocked_list) - if len(self.blocked_list) == 1: - self.set_default_list(self.default_list) - - def block_contacts(self, contact_list, _message): - if not self.supported: - jid_list = [contact.jid for contact in contact_list] - self._con.get_module('Blocking').block(jid_list) - return - - if self.default_list is None: - self.default_list = 'block' - for contact in contact_list: - self._log.info('Block contacts: %s', contact.jid) - contact.show = 'offline' - self._con.get_module('Presence').send_presence(contact.jid, - typ='unavailable') - max_order = self._get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), - 'type': 'jid', - 'action': 'deny', - 'value': contact.jid} - self.blocked_list.append(new_rule) - self.blocked_contacts.append(contact.jid) - self.set_privacy_list(self.default_list, self.blocked_list) - if len(self.blocked_list) == 1: - self.set_default_list(self.default_list) - - def unblock_gc_contact(self, jid): - new_blocked_list = [] - # needed for draw_contact: - if jid not in self.blocked_contacts: - return - - self.blocked_contacts.remove(jid) - - self._log.info('Unblock GC contact: %s', jid) - for rule in self.blocked_list: - if (rule['action'] != 'deny' or - rule['type'] != 'jid' or - rule['value'] != jid): - new_blocked_list.append(rule) - - if not new_blocked_list: - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.set_default_list(None) - self.del_privacy_list(self.default_list) - else: - self.set_privacy_list(self.default_list, new_blocked_list) - - def unblock_contacts(self, contact_list): - if not self.supported: - jid_list = [contact.jid for contact in contact_list] - self._con.get_module('Blocking').unblock(jid_list) - return - - new_blocked_list = [] - to_unblock = [] - for contact in contact_list: - self._log.info('Unblock contacts: %s', contact.jid) - to_unblock.append(contact.jid) - if contact.jid in self.blocked_contacts: - self.blocked_contacts.remove(contact.jid) - for rule in self.blocked_list: - if (rule['action'] != 'deny' or - rule['type'] != 'jid' or - rule['value'] not in to_unblock): - new_blocked_list.append(rule) - - if not new_blocked_list: - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.set_default_list(None) - self.del_privacy_list(self.default_list) - else: - self.set_privacy_list(self.default_list, new_blocked_list) - if not app.interface.roster.regroup: - show = self._con.status - else: # accounts merged - show = helpers.get_global_show() - - for contact in contact_list: - self._con.get_module('Presence').send_presence( - contact.jid, show=show, status=self._con.status_message) - self._presence_probe(contact.jid) - - def block_group(self, group, contact_list, _message): - if not self.supported: - return - if group in self.blocked_groups: - return - self.blocked_groups.append(group) - - self._log.info('Block group: %s', group) - - if self.default_list is None: - self.default_list = 'block' - - for contact in contact_list: - self._con.get_module('Presence').send_presence( - contact.jid, typ='unavailable') - - max_order = self._get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), - 'type': 'group', - 'action': 'deny', - 'value': group} - - self.blocked_list.append(new_rule) - self.set_privacy_list(self.default_list, self.blocked_list) - if len(self.blocked_list) == 1: - self.set_default_list(self.default_list) - - def unblock_group(self, group, contact_list): - if not self.supported: - return - - if group not in self.blocked_groups: - return - self.blocked_groups.remove(group) - - self._log.info('Unblock group: %s', group) - new_blocked_list = [] - for rule in self.blocked_list: - if (rule['action'] != 'deny' or - rule['type'] != 'group' or - rule['value'] != group): - new_blocked_list.append(rule) - - if not new_blocked_list: - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.set_default_list('') - self.del_privacy_list(self.default_list) - else: - self.set_privacy_list(self.default_list, new_blocked_list) - if not app.interface.roster.regroup: - show = self._con.status - else: # accounts merged - show = helpers.get_global_show() - - for contact in contact_list: - self._con.get_module('Presence').send_presence( - contact.jid, show=show, status=self._con.status_message) - - def _presence_probe(self, jid): - self._log.info('Presence probe: %s', jid) - # Send a presence Probe to get the current Status - probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) - self._con.connection.send(probe) - - -class PrivacyListsReceivedEvent(NetworkIncomingEvent): - name = 'privacy-lists-received' - - -class PrivacyListReceivedEvent(NetworkIncomingEvent): - name = 'privacy-list-received' - - -class PrivacyListRemovedEvent(NetworkIncomingEvent): - name = 'privacy-list-removed' - - -def get_instance(*args, **kwargs): - return PrivacyLists(*args, **kwargs), 'PrivacyLists' ===================================== gajim/dialog_messages.py ===================================== @@ -71,18 +71,6 @@ messages = { _('Custom hostname "%s" is wrong. It will be ignored.'), ErrorDialog), - 'privacy-list-error': Message( - _('Error While Removing Privacy List'), - _('Privacy list %s has not been removed. ' - 'It is probably active in one of your connected resources. ' - 'Please deactivate it and try again.'), - ErrorDialog), - - 'invisibility-not-supported': Message( - _('Invisibility Not Supported'), - _('This account %s doesn\'t support invisibility.'), - ErrorDialog), - 'agent-register-success': Message( _('Registration Succeeded'), _('Registration with agent %s succeeded.'), ===================================== gajim/groupchat_control.py ===================================== @@ -275,8 +275,6 @@ class GroupchatControl(ChatControlBase): ('invite-', None, self._on_invite), ('contact-information-', 's', self._on_contact_information), ('execute-command-', 's', self._on_execute_command), - ('block-', 's', self._on_block), - ('unblock-', 's', self._on_unblock), ('ban-', 's', self._on_ban), ('kick-', 's', self._on_kick), ('change-role-', 'as', self._on_change_role), @@ -440,13 +438,6 @@ class GroupchatControl(ChatControlBase): self._get_action('execute-command-').set_enabled(self.is_connected) - block_supported = con.get_module('PrivacyLists').supported - self._get_action('block-').set_enabled(self.is_connected and - block_supported) - - self._get_action('unblock-').set_enabled(self.is_connected and - block_supported) - self._get_action('ban-').set_enabled(self.is_connected) self._get_action('kick-').set_enabled(self.is_connected) @@ -661,20 +652,6 @@ class GroupchatControl(ChatControlBase): app.interface.instances[self.account]['infos'][contact.jid] = \ vcard.VcardWindow(contact, self.account, gc_contact) - def _on_block(self, _action, param): - nick = param.get_string() - fjid = self.room_jid + '/' + nick - con = app.connections[self.account] - con.get_module('PrivacyLists').block_gc_contact(fjid) - self.roster.draw_contact(nick) - - def _on_unblock(self, _action, param): - nick = param.get_string() - fjid = self.room_jid + '/' + nick - con = app.connections[self.account] - con.get_module('PrivacyLists').unblock_gc_contact(fjid) - self.roster.draw_contact(nick) - def _on_kick(self, _action, param): nick = param.get_string() self._kick_nick = nick ===================================== gajim/gtk/const.py ===================================== @@ -101,7 +101,6 @@ WINDOW_MODULES = { 'StartChatDialog': 'gajim.gtk.start_chat', 'AddNewContactWindow': 'gajim.gtk.add_contact', 'SingleMessageWindow': 'gajim.gtk.single_message', - 'PrivacyListsWindow': 'gajim.gtk.privacy_list', 'Bookmarks': 'gajim.gtk.bookmarks', 'AccountWizard': 'gajim.gtk.account_wizard', 'HistoryWindow': 'gajim.gtk.history', ===================================== gajim/gtk/privacy_list.py deleted ===================================== @@ -1,530 +0,0 @@ -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import GLib -from gi.repository import GObject - -from gajim.common import app -from gajim.common import ged -from gajim.common.i18n import _ -from gajim.common.nec import EventHelper - -from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.util import get_builder - - -class PrivacyListWindow(EventHelper): - def __init__(self, account, privacy_list_name, action): - # action is 'EDIT' or 'NEW' depending on if we create a new priv list - # or edit an already existing one - EventHelper.__init__(self) - self.account = account - self.privacy_list_name = privacy_list_name - - # Dicts and Default Values - self.active_rule = '' - self.global_rules = {} - self.list_of_groups = {} - - self.max_order = 0 - - # Default Edit Values - self.edit_rule_type = 'jid' - self.allow_deny = 'allow' - - # Connect to gtk builder - self._ui = get_builder('privacy_list_window.ui') - self.window = self._ui.get_object('privacy_list_edit_window') - - self._ui.privacy_lists_title_label.set_label( - _('Privacy List %s') % - GLib.markup_escape_text(self.privacy_list_name)) - - if len(app.connections) > 1: - title = _('Privacy List for %s') % self.account - else: - title = _('Privacy List') - - self._ui.delete_rule_button.set_sensitive(False) - self._ui.open_rule_button.set_sensitive(False) - self._ui.privacy_list_active_checkbutton.set_sensitive(False) - self._ui.privacy_list_default_checkbutton.set_sensitive(False) - self._ui.list_of_rules_combobox.set_sensitive(False) - - # set jabber id completion - jids_list_store = Gtk.ListStore(GObject.TYPE_STRING) - for jid in app.contacts.get_jid_list(self.account): - jids_list_store.append([jid]) - jid_entry_completion = Gtk.EntryCompletion() - jid_entry_completion.set_text_column(0) - jid_entry_completion.set_model(jids_list_store) - jid_entry_completion.set_popup_completion(True) - self._ui.edit_type_jabberid_entry.set_completion(jid_entry_completion) - if action == 'EDIT': - self.refresh_rules() - - model = self._ui.edit_type_group_combobox.get_model() - count = 0 - for group in app.groups[self.account]: - self.list_of_groups[group] = count - count += 1 - model.append([group]) - self._ui.edit_type_group_combobox.set_active(0) - - self.window.set_title(title) - - # pylint: disable=line-too-long - self.register_events([ - ('privacy-list-received', ged.GUI1, self._nec_privacy_list_received), - ('privacy-lists-received', ged.GUI1, self._nec_privacy_lists_received) - ]) - # pylint: enable=line-too-long - - self.window.show_all() - self._ui.add_edit_vbox.hide() - - self._ui.connect_signals(self) - - def on_key_press_event(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self.window.destroy() - - def _on_edit_window_destroy(self, _widget): - key_name = 'privacy_list_%s' % self.privacy_list_name - if key_name in app.interface.instances[self.account]: - del app.interface.instances[self.account][key_name] - self.unregister_events() - - def _nec_privacy_lists_received(self, obj): - if obj.conn.name != self.account: - return - if obj.active_list == self.privacy_list_name: - self._ui.privacy_list_active_checkbutton.set_active(True) - else: - self._ui.privacy_list_active_checkbutton.set_active(False) - if obj.default_list == self.privacy_list_name: - self._ui.privacy_list_default_checkbutton.set_active(True) - else: - self._ui.privacy_list_default_checkbutton.set_active(False) - - def privacy_list_received(self, rules): - model = self._ui.list_of_rules_combobox.get_model() - model.clear() - self.global_rules = {} - for rule in rules: - if 'type' in rule: - text_item = _( - 'Order: %(order)s, action: %(action)s, type: %(type)s' - ', value: %(value)s') % { - 'order': rule['order'], - 'action': rule['action'], - 'type': rule['type'], - 'value': rule['value']} - else: - text_item = _('Order: %(order)s, action: %(action)s') % \ - {'order': rule['order'], 'action': rule['action']} - if int(rule['order']) > self.max_order: - self.max_order = int(rule['order']) - self.global_rules[text_item] = rule - model.append([text_item]) - if not rules: - self._ui.title_hbox.set_sensitive(False) - self._ui.list_of_rules_combobox.set_sensitive(False) - self._ui.delete_rule_button.set_sensitive(False) - self._ui.open_rule_button.set_sensitive(False) - self._ui.privacy_list_active_checkbutton.set_sensitive(False) - self._ui.privacy_list_default_checkbutton.set_sensitive(False) - else: - self._ui.list_of_rules_combobox.set_active(0) - self._ui.title_hbox.set_sensitive(True) - self._ui.list_of_rules_combobox.set_sensitive(True) - self._ui.delete_rule_button.set_sensitive(True) - self._ui.open_rule_button.set_sensitive(True) - self._ui.privacy_list_active_checkbutton.set_sensitive(True) - self._ui.privacy_list_default_checkbutton.set_sensitive(True) - self.reset_fields() - con = app.connections[self.account] - con.get_module('PrivacyLists').get_privacy_lists() - - def _nec_privacy_list_received(self, obj): - if obj.conn.name != self.account: - return - if obj.list_name != self.privacy_list_name: - return - self.privacy_list_received(obj.rules) - - def refresh_rules(self): - con = app.connections[self.account] - con.get_module('PrivacyLists').get_privacy_list(self.privacy_list_name) - - def on_delete_rule_button_clicked(self, _widget): - model = self._ui.list_of_rules_combobox.get_model() - iter_ = self._ui.list_of_rules_combobox.get_active_iter() - _rule = model[iter_][0] - tags = [] - for rule in self.global_rules: - if rule != _rule: - tags.append(self.global_rules[rule]) - con = app.connections[self.account] - con.get_module('PrivacyLists').set_privacy_list( - self.privacy_list_name, tags) - self.privacy_list_received(tags) - self._ui.add_edit_vbox.hide() - if not tags: # we removed latest rule - if 'privacy_lists' in app.interface.instances[self.account]: - win = app.interface.instances[self.account]['privacy_lists'] - win.remove_privacy_list(self.privacy_list_name) - win.draw_widgets() - - def on_open_rule_button_clicked(self, _widget): - self._ui.add_edit_rule_label.set_label(_('Edit a rule')) - active_num = self._ui.list_of_rules_combobox.get_active() - if active_num == -1: - self.active_rule = '' - else: - model = self._ui.list_of_rules_combobox.get_model() - iter_ = self._ui.list_of_rules_combobox.get_active_iter() - self.active_rule = model[iter_][0] - if self.active_rule != '': - rule_info = self.global_rules[self.active_rule] - self._ui.edit_order_spinbutton.set_value(int(rule_info['order'])) - if 'type' in rule_info: - if rule_info['type'] == 'jid': - self._ui.edit_type_jabberid_radiobutton.set_active(True) - self._ui.edit_type_jabberid_entry.set_text( - rule_info['value']) - elif rule_info['type'] == 'group': - self._ui.edit_type_group_radiobutton.set_active(True) - if rule_info['value'] in self.list_of_groups: - self._ui.edit_type_group_combobox.set_active( - self.list_of_groups[rule_info['value']]) - else: - self._ui.edit_type_group_combobox.set_active(0) - elif rule_info['type'] == 'subscription': - self._ui.edit_type_subscription_radiobutton.set_active(True) - sub_value = rule_info['value'] - if sub_value == 'none': - self._ui.edit_type_subscription_combobox.set_active(0) - elif sub_value == 'both': - self._ui.edit_type_subscription_combobox.set_active(1) - elif sub_value == 'from': - self._ui.edit_type_subscription_combobox.set_active(2) - elif sub_value == 'to': - self._ui.edit_type_subscription_combobox.set_active(3) - else: - self._ui.edit_type_select_all_radiobutton.set_active(True) - else: - self._ui.edit_type_select_all_radiobutton.set_active(True) - self._ui.edit_send_messages_checkbutton.set_active(False) - self._ui.edit_queries_send_checkbutton.set_active(False) - self._ui.edit_view_status_checkbutton.set_active(False) - self._ui.edit_send_status_checkbutton.set_active(False) - self._ui.edit_all_checkbutton.set_active(False) - if not rule_info['child']: - self._ui.edit_all_checkbutton.set_active(True) - else: - if 'presence-out' in rule_info['child']: - self._ui.edit_send_status_checkbutton.set_active(True) - if 'presence-in' in rule_info['child']: - self._ui.edit_view_status_checkbutton.set_active(True) - if 'iq' in rule_info['child']: - self._ui.edit_queries_send_checkbutton.set_active(True) - if 'message' in rule_info['child']: - self._ui.edit_send_messages_checkbutton.set_active(True) - - if rule_info['action'] == 'allow': - self._ui.edit_allow_radiobutton.set_active(True) - else: - self._ui.edit_deny_radiobutton.set_active(True) - self._ui.add_edit_vbox.show() - - def on_edit_all_checkbutton_toggled(self, widget): - if widget.get_active(): - self._ui.edit_send_messages_checkbutton.set_active(True) - self._ui.edit_queries_send_checkbutton.set_active(True) - self._ui.edit_view_status_checkbutton.set_active(True) - self._ui.edit_send_status_checkbutton.set_active(True) - self._ui.edit_send_messages_checkbutton.set_sensitive(False) - self._ui.edit_queries_send_checkbutton.set_sensitive(False) - self._ui.edit_view_status_checkbutton.set_sensitive(False) - self._ui.edit_send_status_checkbutton.set_sensitive(False) - else: - self._ui.edit_send_messages_checkbutton.set_active(False) - self._ui.edit_queries_send_checkbutton.set_active(False) - self._ui.edit_view_status_checkbutton.set_active(False) - self._ui.edit_send_status_checkbutton.set_active(False) - self._ui.edit_send_messages_checkbutton.set_sensitive(True) - self._ui.edit_queries_send_checkbutton.set_sensitive(True) - self._ui.edit_view_status_checkbutton.set_sensitive(True) - self._ui.edit_send_status_checkbutton.set_sensitive(True) - - def _on_privacy_list_active_toggled(self, widget): - name = None - if widget.get_active(): - name = self.privacy_list_name - - con = app.connections[self.account] - con.get_module('PrivacyLists').set_active_list(name) - - def _on_privacy_list_default_toggled(self, widget): - name = None - if widget.get_active(): - name = self.privacy_list_name - - con = app.connections[self.account] - con.get_module('PrivacyLists').set_default_list(name) - - def on_new_rule_button_clicked(self, _widget): - self.reset_fields() - self._ui.add_edit_vbox.show() - - def reset_fields(self): - self._ui.edit_type_jabberid_entry.set_text('') - self._ui.edit_allow_radiobutton.set_active(True) - self._ui.edit_type_jabberid_radiobutton.set_active(True) - self.active_rule = '' - self._ui.edit_send_messages_checkbutton.set_active(False) - self._ui.edit_queries_send_checkbutton.set_active(False) - self._ui.edit_view_status_checkbutton.set_active(False) - self._ui.edit_send_status_checkbutton.set_active(False) - self._ui.edit_all_checkbutton.set_active(False) - self._ui.edit_order_spinbutton.set_value(self.max_order + 1) - self._ui.edit_type_group_combobox.set_active(0) - self._ui.edit_type_subscription_combobox.set_active(0) - self._ui.add_edit_rule_label.set_label(_('Add a rule')) - - def get_current_tags(self): - if self._ui.edit_type_jabberid_radiobutton.get_active(): - edit_type = 'jid' - edit_value = self._ui.edit_type_jabberid_entry.get_text() - elif self._ui.edit_type_group_radiobutton.get_active(): - edit_type = 'group' - model = self._ui.edit_type_group_combobox.get_model() - iter_ = self._ui.edit_type_group_combobox.get_active_iter() - edit_value = model[iter_][0] - elif self._ui.edit_type_subscription_radiobutton.get_active(): - edit_type = 'subscription' - subs = ['none', 'both', 'from', 'to'] - edit_value = subs[ - self._ui.edit_type_subscription_combobox.get_active()] - elif self._ui.edit_type_select_all_radiobutton.get_active(): - edit_type = '' - edit_value = '' - edit_order = str(self._ui.edit_order_spinbutton.get_value_as_int()) - if self._ui.edit_allow_radiobutton.get_active(): - edit_deny = 'allow' - else: - edit_deny = 'deny' - child = [] - if not self._ui.edit_all_checkbutton.get_active(): - if self._ui.edit_send_messages_checkbutton.get_active(): - child.append('message') - if self._ui.edit_queries_send_checkbutton.get_active(): - child.append('iq') - if self._ui.edit_send_status_checkbutton.get_active(): - child.append('presence-out') - if self._ui.edit_view_status_checkbutton.get_active(): - child.append('presence-in') - if edit_type != '': - return {'order': edit_order, 'action': edit_deny, - 'type': edit_type, 'value': edit_value, 'child': child} - return {'order': edit_order, 'action': edit_deny, 'child': child} - - def on_save_rule_button_clicked(self, _widget): - tags = [] - current_tags = self.get_current_tags() - if int(current_tags['order']) > self.max_order: - self.max_order = int(current_tags['order']) - if self.active_rule == '': - tags.append(current_tags) - - for rule in self.global_rules: - if rule != self.active_rule: - tags.append(self.global_rules[rule]) - else: - tags.append(current_tags) - - con = app.connections[self.account] - con.get_module('PrivacyLists').set_privacy_list( - self.privacy_list_name, tags) - self.refresh_rules() - self._ui.add_edit_vbox.hide() - if 'privacy_lists' in app.interface.instances[self.account]: - win = app.interface.instances[self.account]['privacy_lists'] - win.add_privacy_list_to_combobox(self.privacy_list_name) - win.draw_widgets() - - def _on_list_of_rules_changed(self, _widget): - self._ui.add_edit_vbox.hide() - - def _on_edit_type_changed(self, widget, radiobutton): - active_bool = widget.get_active() - if active_bool: - self.edit_rule_type = radiobutton - - def _on_edit_allow_changed(self, widget, radiobutton): - active_bool = widget.get_active() - if active_bool: - self.allow_deny = radiobutton - - def _on_close_clicked(self, _widget): - self.window.destroy() - - -class PrivacyListsWindow(EventHelper): - """ - Window that is the main window for Privacy Lists; we can list there the - privacy lists and ask to create a new one or edit an already there one - """ - def __init__(self, account): - EventHelper.__init__(self) - self.account = account - self.privacy_lists_save = [] - - self._ui = get_builder('privacy_lists_window.ui') - - self.window = self._ui.get_object('privacy_lists_first_window') - - self.draw_privacy_lists_in_combobox([]) - self.privacy_lists_refresh() - - self.enabled = True - - if len(app.connections) > 1: - title = _('Privacy Lists for %s') % self.account - else: - title = _('Privacy Lists') - - self.window.set_title(title) - - # pylint: disable=line-too-long - self.register_events([ - ('privacy-lists-received', ged.GUI1, self._nec_privacy_lists_received), - ('privacy-list-removed', ged.GUI1, self._nec_privacy_lists_removed), - ]) - # pylint: enable=line-too-long - - self.window.show_all() - - self._ui.connect_signals(self) - - def on_key_press_event(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - self.window.destroy() - - def _on_privacy_lists_first_destroy(self, _widget): - if 'privacy_lists' in app.interface.instances[self.account]: - del app.interface.instances[self.account]['privacy_lists'] - self.unregister_events() - - def remove_privacy_list(self, privacy_list): - if privacy_list not in self.privacy_lists_save: - return - - model = self._ui.list_of_privacy_lists_combobox.get_model() - for entry in model: - if entry[0] == privacy_list: - model.remove(entry.iter) - - self.privacy_lists_save.remove(privacy_list) - - def add_privacy_list_to_combobox(self, privacy_list): - if privacy_list in self.privacy_lists_save: - return - model = self._ui.list_of_privacy_lists_combobox.get_model() - model.append([privacy_list]) - self.privacy_lists_save.append(privacy_list) - - def draw_privacy_lists_in_combobox(self, privacy_lists): - self._ui.list_of_privacy_lists_combobox.set_active(-1) - self._ui.list_of_privacy_lists_combobox.get_model().clear() - self.privacy_lists_save = [] - for add_item in privacy_lists: - self.add_privacy_list_to_combobox(add_item) - self.draw_widgets() - - def draw_widgets(self): - if not self.privacy_lists_save: - self._ui.list_of_privacy_lists_combobox.set_sensitive(False) - self._ui.open_privacy_list_button.set_sensitive(False) - self._ui.delete_privacy_list_button.set_sensitive(False) - else: - self._ui.list_of_privacy_lists_combobox.set_sensitive(True) - self._ui.list_of_privacy_lists_combobox.set_active(0) - self._ui.open_privacy_list_button.set_sensitive(True) - self._ui.delete_privacy_list_button.set_sensitive(True) - - def _on_close_clicked(self, _widget): - self.window.destroy() - - def _on_delete_privacy_list_clicked(self, _widget): - active_list = self.privacy_lists_save[ - self._ui.list_of_privacy_lists_combobox.get_active()] - con = app.connections[self.account] - con.get_module('PrivacyLists').del_privacy_list(active_list) - - def privacy_list_removed(self, active_list): - self.privacy_lists_save.remove(active_list) - self.privacy_lists_received(self.privacy_lists_save) - - def _nec_privacy_lists_removed(self, obj): - if obj.conn.name != self.account: - return - self.privacy_list_removed(obj.list_name) - - def privacy_lists_received(self, lists): - privacy_lists = [] - for privacy_list in lists: - privacy_lists.append(privacy_list) - self.draw_privacy_lists_in_combobox(privacy_lists) - - def _nec_privacy_lists_received(self, obj): - if obj.conn.name != self.account: - return - self.privacy_lists_received(obj.lists) - - def privacy_lists_refresh(self): - con = app.connections[self.account] - con.get_module('PrivacyLists').get_privacy_lists() - - def _on_new_privacy_list_clicked(self, _widget): - name = self._ui.new_privacy_list_entry.get_text() - if not name: - ErrorDialog( - _('Invalid List Name'), - _('You must enter a name to create a privacy list.'), - transient_for=self.window) - return - key_name = 'privacy_list_%s' % name - if key_name in app.interface.instances[self.account]: - app.interface.instances[self.account][key_name].window.present() - else: - app.interface.instances[self.account][key_name] = \ - PrivacyListWindow(self.account, name, 'NEW') - self._ui.new_privacy_list_entry.set_text('') - - def _on_privacy_lists_refresh_clicked(self, _widget): - self.privacy_lists_refresh() - - def _on_open_privacy_list_clicked(self, _widget): - name = self.privacy_lists_save[ - self._ui.list_of_privacy_lists_combobox.get_active()] - key_name = 'privacy_list_%s' % name - if key_name in app.interface.instances[self.account]: - app.interface.instances[self.account][key_name].window.present() - else: - app.interface.instances[self.account][key_name] = \ - PrivacyListWindow(self.account, name, 'EDIT') ===================================== gajim/gtk/server_info.py ===================================== @@ -258,8 +258,6 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): max_file_size return [ - Feature('XEP-0016: Privacy Lists', - con.get_module('PrivacyLists').supported), Feature('XEP-0045: Multi-User Chat', con.get_module('MUC').supported), Feature('XEP-0054: vcard-temp', ===================================== gajim/gui_menu_builder.py ===================================== @@ -391,8 +391,7 @@ control=None, gc_contact=None, is_anonymous=True): con = app.connections[account] - if con and (con.get_module('PrivacyLists').supported or - con.get_module('Blocking').supported): + if con.get_module('Blocking').supported: transport = app.get_transport_name_from_jid(jid, use_config_setting=False) if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) @@ -681,7 +680,6 @@ def get_account_menu(account): ('-bookmarks', _('Bookmarks')), ('-pep-config', _('PEP Configuration')), ('-sync-history', _('Synchronise History…')), - ('-privacylists', _('Privacy Lists')), ]), (_('Admin'), [ ('-send-server-message', _('Send Server Message…')), @@ -872,17 +870,6 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): menu.append(Gtk.SeparatorMenuItem()) - if helpers.jid_is_blocked(account, contact.get_full_jid()): - action = 'win.unblock-%s::%s' % (control_id, contact.name) - label = _('Unblock') - else: - action = 'win.block-%s::%s' % (control_id, contact.name) - label = _('Block') - - item = Gtk.MenuItem(label=label) - item.set_detailed_action_name(action) - menu.append(item) - item = Gtk.MenuItem(label=_('Kick')) action = 'win.kick-%s::%s' % (control_id, contact.name) if is_role_change_allowed(self_contact, contact): ===================================== gajim/roster_window.py ===================================== @@ -2748,14 +2748,14 @@ class RosterWindow: accounts = [] for _, account in list_: con = app.connections[account] - if (con.get_module('PrivacyLists').supported or - con.get_module('Blocking').supported): + if con.get_module('Blocking').supported: accounts.append(account) for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] con = app.connections[acct] - con.get_module('PrivacyLists').block_contacts(l_, msg) + jid_list = [contact.jid for contact in l_] + con.get_module('Blocking').block(jid_list) for contact in l_: ctrl = app.interface.msg_win_mgr.get_control( contact.jid, acct) @@ -2801,21 +2801,17 @@ class RosterWindow: accounts = [] for _, account in list_: con = app.connections[account] - if (con.get_module('PrivacyLists').supported or - con.get_module('Blocking').supported): + if con.get_module('Blocking').supported: accounts.append(account) for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] con = app.connections[acct] - con.get_module('PrivacyLists').unblock_contacts(l_) + jid_list = [contact.jid for contact in l_] + con.get_module('Blocking').unblock(jid_list) for contact in l_: self.draw_contact(contact.jid, acct) - for acct in accounts: - if 'privacy_list_block' in app.interface.instances[acct]: - del app.interface.instances[acct]['privacy_list_block'] - def on_rename(self, widget, row_type, jid, account): # This function is called either by F2 or by Rename menuitem if 'rename' in app.interface.instances: @@ -4913,8 +4909,7 @@ class RosterWindow: one_account_offline = True con = app.connections[account] - if (not con.get_module('PrivacyLists').supported and - not con.get_module('Blocking').supported): + if not con.get_module('Blocking').supported: blocking_supported = False contact = app.contacts.get_contact_with_highest_priority( account, jid) @@ -5063,75 +5058,6 @@ class RosterWindow: menu.show_all() menu.popup(None, None, None, None, event_button, event.time) - def get_and_connect_advanced_menuitem_menu(self, account): - """ - Add FOR ACCOUNT options - """ - xml = get_builder('advanced_menuitem_menu.ui') - advanced_menuitem_menu = xml.get_object('advanced_menuitem_menu') - - xml_console_menuitem = xml.get_object('xml_console_menuitem') - archiving_preferences_menuitem = xml.get_object( - 'archiving_preferences_menuitem') - privacy_lists_menuitem = xml.get_object('privacy_lists_menuitem') - administrator_menuitem = xml.get_object('administrator_menuitem') - send_server_message_menuitem = xml.get_object( - 'send_server_message_menuitem') - set_motd_menuitem = xml.get_object('set_motd_menuitem') - update_motd_menuitem = xml.get_object('update_motd_menuitem') - delete_motd_menuitem = xml.get_object('delete_motd_menuitem') - - xml_console_menuitem.connect('activate', - self.on_xml_console_menuitem_activate, account) - - if app.connections[account]: - if app.connections[account].get_module('PrivacyLists').supported: - privacy_lists_menuitem.connect('activate', - self.on_privacy_lists_menuitem_activate, account) - else: - privacy_lists_menuitem.set_sensitive(False) - if app.connections[account].get_module('MAM').available: - archiving_preferences_menuitem.connect( - 'activate', - self.on_archiving_preferences_menuitem_activate, account) - else: - archiving_preferences_menuitem.set_sensitive(False) - - if app.connections[account].is_zeroconf: - administrator_menuitem.set_sensitive(False) - send_server_message_menuitem.set_sensitive(False) - set_motd_menuitem.set_sensitive(False) - update_motd_menuitem.set_sensitive(False) - delete_motd_menuitem.set_sensitive(False) - else: - send_server_message_menuitem.connect('activate', - self.on_send_server_message_menuitem_activate, account) - - set_motd_menuitem.connect('activate', - self.on_set_motd_menuitem_activate, account) - - update_motd_menuitem.connect('activate', - self.on_update_motd_menuitem_activate, account) - - delete_motd_menuitem.connect('activate', - self.on_delete_motd_menuitem_activate, account) - - advanced_menuitem_menu.show_all() - - return advanced_menuitem_menu - - def add_history_manager_menuitem(self, menu): - """ - Add a separator and History Manager menuitem BELOW for account menuitems - """ - item = Gtk.SeparatorMenuItem.new() # separator - menu.append(item) - - # History manager - item = Gtk.MenuItem.new_with_mnemonic(_('History Manager')) - menu.append(item) - item.connect('activate', self.on_history_manager_menuitem_activate) - def show_appropriate_context_menu(self, event, iters): # iters must be all of the same type model = self.modelfilter View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6881c6968e6bcb2f1ec9edb249118c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6881c6968e6bcb2f1ec9edb249118c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Smacks: Don't fail on saving error replies
by Philipp Hörist 05 Jul '20

05 Jul '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: db8cea4d by lovetox at 2020-07-05T22:35:23+02:00 Smacks: Don't fail on saving error replies - - - - - 1 changed file: - nbxmpp/smacks.py Changes: ===================================== nbxmpp/smacks.py ===================================== @@ -23,6 +23,7 @@ from nbxmpp.simplexml import Node from nbxmpp.const import StreamState from nbxmpp.util import LogAdapter from nbxmpp.structs import StanzaHandler +from nbxmpp.protocol import Error log = logging.getLogger('nbxmpp.smacks') @@ -139,7 +140,9 @@ class Smacks: # Make a full copy so we dont run into problems when # the stanza is modified after sending for some reason - stanza = type(stanza)(node=str(stanza)) + # TODO: Make also copies of Protocol.Error objects + if not isinstance(stanza, Error): + stanza = type(stanza)(node=str(stanza)) self._add_delay(stanza) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/db8cea4d9322963d27b74b81… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/db8cea4d9322963d27b74b81… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Roster: Remove blocking whole group feature
by Philipp Hörist 05 Jul '20

05 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d22961dc by lovetox at 2020-07-05T21:35:55+02:00 Roster: Remove blocking whole group feature Multiselecting contacts should be efficient enough for such rare action - - - - - 6881c696 by lovetox at 2020-07-05T21:56:12+02:00 Roster: Don't depend on Privacy lists for multiple contact block - - - - - 2 changed files: - gajim/common/helpers.py - gajim/roster_window.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -837,11 +837,6 @@ def jid_is_blocked(account, jid): jid in con.get_module('PrivacyLists').blocked_contacts or con.get_module('PrivacyLists').blocked_all) -def group_is_blocked(account, group): - con = app.connections[account] - return (group in con.get_module('PrivacyLists').blocked_groups or - con.get_module('PrivacyLists').blocked_all) - def get_subscription_request_msg(account=None): s = app.config.get_per('accounts', account, 'subscription_request_msg') if s: ===================================== gajim/roster_window.py ===================================== @@ -1073,8 +1073,6 @@ class RosterWindow: else: accounts = [account] text = GLib.markup_escape_text(group) - if helpers.group_is_blocked(account, group): - text = '%s' % text if app.config.get('show_contacts_number'): nbr_on, nbr_total = app.contacts.get_nb_online_total_contacts( accounts=accounts, groups=[group]) @@ -1165,14 +1163,7 @@ class RosterWindow: name = '%s [%s]' % (name, str(nb_unread)) # Strike name if blocked - strike = False - if helpers.jid_is_blocked(account, jid): - strike = True - else: - for group in contact.get_shown_groups(): - if helpers.group_is_blocked(account, group): - strike = True - break + strike = helpers.jid_is_blocked(account, jid) if strike: name = '%s' % name @@ -2744,7 +2735,7 @@ class RosterWindow: for jid in obj.changed: self.draw_contact(jid, obj.conn.name) - def on_block(self, widget, list_, group=None): + def on_block(self, widget, list_): """ When clicked on the 'block' button in context menu. list_ is a list of (contact, account) @@ -2757,34 +2748,25 @@ class RosterWindow: accounts = [] for _, account in list_: con = app.connections[account] - if con.get_module('PrivacyLists').supported or ( - group is None and con.get_module('Blocking').supported): + if (con.get_module('PrivacyLists').supported or + con.get_module('Blocking').supported): accounts.append(account) - if group is None: - for acct in accounts: - l_ = [i[0] for i in list_ if i[1] == acct] - con = app.connections[acct] - con.get_module('PrivacyLists').block_contacts(l_, msg) - for contact in l_: - ctrl = app.interface.msg_win_mgr.get_control( - contact.jid, acct) - if ctrl: - ctrl.parent_win.remove_tab( - ctrl, ctrl.parent_win.CLOSE_COMMAND, force=True) - if contact.show == 'not in roster': - self.remove_contact(contact.jid, acct, force=True, - backend=True) - return - self.draw_contact(contact.jid, acct) - else: - for acct in accounts: - l_ = [i[0] for i in list_ if i[1] == acct] - con = app.connections[acct] - con.get_module('PrivacyLists').block_group(group, l_, msg) - self.draw_group(group, acct) - for contact in l_: - self.draw_contact(contact.jid, acct) + for acct in accounts: + l_ = [i[0] for i in list_ if i[1] == acct] + con = app.connections[acct] + con.get_module('PrivacyLists').block_contacts(l_, msg) + for contact in l_: + ctrl = app.interface.msg_win_mgr.get_control( + contact.jid, acct) + if ctrl: + ctrl.parent_win.remove_tab( + ctrl, ctrl.parent_win.CLOSE_COMMAND, force=True) + if contact.show == 'not in roster': + self.remove_contact(contact.jid, acct, force=True, + backend=True) + return + self.draw_contact(contact.jid, acct) def _block_it(is_checked=None): if is_checked is not None: # Dialog has been shown @@ -2800,22 +2782,11 @@ class RosterWindow: _block_it() return - # Set dialog's labels depending on if it is a group or a single contact - if group is None: - title = _('Block Contact') - pritext = _('Really block this contact?') - sectext = _('You will appear offline for this contact and you ' - 'will not receive further messages.') - else: - title = _('Block Group') - pritext = _('Really block this group?') - sectext = _('You will appear offline for these contacts ' - 'and you will not receive further messages.') - NewConfirmationCheckDialog( - title, - pritext, - sectext, + _('Block Contact'), + _('Really block this contact?'), + _('You will appear offline for this contact and you ' + 'will not receive further messages.'), _('_Do not ask again'), [DialogButton.make('Cancel'), DialogButton.make('Remove', @@ -2823,32 +2794,24 @@ class RosterWindow: callback=_block_it)], modal=False).show() - def on_unblock(self, widget, list_, group=None): + def on_unblock(self, widget, list_): """ When clicked on the 'unblock' button in context menu. """ accounts = [] for _, account in list_: con = app.connections[account] - if con.get_module('PrivacyLists').supported or ( - group is None and con.get_module('Blocking').supported): + if (con.get_module('PrivacyLists').supported or + con.get_module('Blocking').supported): accounts.append(account) - if group is None: - for acct in accounts: - l_ = [i[0] for i in list_ if i[1] == acct] - con = app.connections[acct] - con.get_module('PrivacyLists').unblock_contacts(l_) - for contact in l_: - self.draw_contact(contact.jid, acct) - else: - for acct in accounts: - l_ = [i[0] for i in list_ if i[1] == acct] - con = app.connections[acct] - con.get_module('PrivacyLists').unblock_group(group, l_) - self.draw_group(group, acct) - for contact in l_: - self.draw_contact(contact.jid, acct) + for acct in accounts: + l_ = [i[0] for i in list_ if i[1] == acct] + con = app.connections[acct] + con.get_module('PrivacyLists').unblock_contacts(l_) + for contact in l_: + self.draw_contact(contact.jid, acct) + for acct in accounts: if 'privacy_list_block' in app.interface.instances[acct]: del app.interface.instances[acct]['privacy_list_block'] @@ -4899,28 +4862,6 @@ class RosterWindow: rename_item.connect('activate', self.on_rename, 'group', group, account) - # Block group - is_blocked = False - if self.regroup: - for g_account in app.connections: - if helpers.group_is_blocked(g_account, group): - is_blocked = True - else: - if helpers.group_is_blocked(account, group): - is_blocked = True - - if is_blocked and app.connections[account].get_module('PrivacyLists').supported: - unblock_menuitem = Gtk.MenuItem.new_with_mnemonic(_('_Unblock')) - unblock_menuitem.connect('activate', self.on_unblock, list_, - group) - menu.append(unblock_menuitem) - else: - block_menuitem = Gtk.MenuItem.new_with_mnemonic(_('_Block')) - block_menuitem.connect('activate', self.on_block, list_, group) - menu.append(block_menuitem) - if not app.connections[account].get_module('PrivacyLists').supported: - block_menuitem.set_sensitive(False) - # Remove group remove_item = Gtk.MenuItem.new_with_mnemonic(_('Remo_ve')) menu.append(remove_item) @@ -4964,16 +4905,19 @@ class RosterWindow: list_ = [] # list of (jid, account) tuples one_account_offline = False is_blocked = True - privacy_rules_supported = True + blocking_supported = True for titer in iters: jid = model[titer][Column.JID] account = model[titer][Column.ACCOUNT] if not app.account_is_available(account): one_account_offline = True - if not app.connections[account].get_module('PrivacyLists').supported: - privacy_rules_supported = False - contact = app.contacts.get_contact_with_highest_priority(account, - jid) + + con = app.connections[account] + if (not con.get_module('PrivacyLists').supported and + not con.get_module('Blocking').supported): + blocking_supported = False + contact = app.contacts.get_contact_with_highest_priority( + account, jid) if not helpers.jid_is_blocked(account, jid): is_blocked = False list_.append((contact, account)) @@ -5024,7 +4968,7 @@ class RosterWindow: manage_contacts_submenu.append(item) # Block - if is_blocked and privacy_rules_supported: + if is_blocked and blocking_supported: unblock_menuitem = Gtk.MenuItem.new_with_mnemonic(_('_Unblock')) unblock_menuitem.connect('activate', self.on_unblock, list_) manage_contacts_submenu.append(unblock_menuitem) @@ -5033,7 +4977,7 @@ class RosterWindow: block_menuitem.connect('activate', self.on_block, list_) manage_contacts_submenu.append(block_menuitem) - if not privacy_rules_supported: + if not blocking_supported: block_menuitem.set_sensitive(False) # Remove View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e9a0e679612fdcc1d424e8ad5eb409d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e9a0e679612fdcc1d424e8ad5eb409d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ChatControl: Add menu item for blocking/reporting
by Philipp Hörist 05 Jul '20

05 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 64c81bdc by wurstsalat at 2020-07-05T18:12:51+02:00 ChatControl: Add menu item for blocking/reporting - - - - - e9a0e679 by wurstsalat at 2020-07-05T18:12:51+02:00 Roster: Adapt strings in blocking dialog - - - - - 3 changed files: - gajim/chat_control.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -251,8 +251,9 @@ class ChatControl(ChatControlBase): actions = [ ('invite-contacts-', self._on_invite_contacts), ('add-to-roster-', self._on_add_to_roster), + ('block-contact-', self._on_block_contact), ('information-', self._on_information), - ] + ] for action in actions: action_name, func = action @@ -300,6 +301,11 @@ class ChatControl(ChatControlBase): win.lookup_action( 'add-to-roster-' + self.control_id).set_enabled(False) + # Block contact + win.lookup_action( + 'block-contact-' + self.control_id).set_enabled( + online and con.get_module('Blocking').supported) + # Audio win.lookup_action('toggle-audio-' + self.control_id).set_enabled( online and self.jingle['audio'].available) @@ -376,6 +382,33 @@ class ChatControl(ChatControlBase): def _on_add_to_roster(self, _action, _param): AddNewContactWindow(self.account, self.contact.jid) + def _on_block_contact(self, _action, _param): + def _block_contact(report=None): + con = app.connections[self.account] + con.get_module('Blocking').block([self.contact.jid], report=report) + + self.parent_win.remove_tab(self, None, force=True) + if _('Not in contact list') in self.contact.get_shown_groups(): + app.interface.roster.remove_contact( + self.contact.jid, self.account, force=True, backend=True) + return + app.interface.roster.draw_contact(self.contact.jid, self.account) + + NewConfirmationDialog( + _('Block Contact'), + _('Really block this contact?'), + _('You will appear offline for this contact and you will ' + 'not receive further messages.'), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('_Report Spam'), + callback=_block_contact, + kwargs={'report': 'spam'}), + DialogButton.make('Remove', + text=_('_Block'), + callback=_block_contact)], + modal=False).show() + def _on_information(self, _action, _param): app.interface.roster.on_info(None, self.contact, self.account) ===================================== gajim/gui_menu_builder.py ===================================== @@ -522,6 +522,7 @@ def get_singlechat_menu(control_id, account, jid): (_('Send Chatstate'), ['chatstate']), ('win.invite-contacts-', _('Invite Contacts…')), ('win.add-to-roster-', _('Add to Contact List…')), + ('win.block-contact-', _('Block Contact…')), ('win.toggle-audio-', _('Voice Chat')), ('win.toggle-video-', _('Video Chat')), ('win.information-', _('Information')), ===================================== gajim/roster_window.py ===================================== @@ -2787,8 +2787,8 @@ class RosterWindow: self.draw_contact(contact.jid, acct) def _block_it(is_checked=None): - if is_checked is not None: # dialog has been shown - if is_checked: # user does not want to be asked again + if is_checked is not None: # Dialog has been shown + if is_checked: app.config.set('confirm_block', 'no') else: app.config.set('confirm_block', 'yes') @@ -2804,25 +2804,22 @@ class RosterWindow: if group is None: title = _('Block Contact') pritext = _('Really block this contact?') - sectext = _('This contact will see you offline and you will not ' - 'receive any messages sent to you by this contact.') - button_text = _('_Block Contact') + sectext = _('You will appear offline for this contact and you ' + 'will not receive further messages.') else: title = _('Block Group') pritext = _('Really block this group?') - sectext = _('All contacts of this group will see you as offline ' - 'and you will not receive any messages sent to you ' - 'by any one of these contacts.') - button_text = _('_Block Group') + sectext = _('You will appear offline for these contacts ' + 'and you will not receive further messages.') NewConfirmationCheckDialog( title, pritext, sectext, - _('_Do not ask me again'), + _('_Do not ask again'), [DialogButton.make('Cancel'), DialogButton.make('Remove', - text=button_text, + text=_('_Block'), callback=_block_it)], modal=False).show() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6ad2dfb8d2b1c76429ed4b0ce2a9407… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6ad2dfb8d2b1c76429ed4b0ce2a9407… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Remove account string from banner
by Philipp Hörist 05 Jul '20

05 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6ad2dfb8 by wurstsalat at 2020-07-05T15:42:39+02:00 ChatControl: Remove account string from banner - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -802,37 +802,15 @@ class ChatControl(ChatControlBase): name, jid """ contact = self.contact - jid = contact.jid - name = contact.get_shown_name() if self.resource: name += '/' + self.resource if self._type.is_privatechat: - name = i18n.direction_mark + _( + name = i18n.direction_mark + _( '%(nickname)s from group chat %(room_name)s') % \ {'nickname': name, 'room_name': self.room_name} name = i18n.direction_mark + GLib.markup_escape_text(name) - # We know our contacts nick, but if another contact has the same nick - # in another account we need to also display the account. - # except if we are talking to two different resources of the - # same contact - acct_info = '' - for account in app.contacts.get_accounts(): - if account == self.account: - continue - if acct_info: # We already found a contact with same nick - break - for jid in app.contacts.get_jid_list(account): - other_contact_ = \ - app.contacts.get_first_contact_from_jid(account, jid) - if other_contact_.get_shown_name() == \ - self.contact.get_shown_name(): - acct_info = i18n.direction_mark + ' (%s)' % \ - GLib.markup_escape_text( - app.get_account_label(self.account)) - break - status = contact.status if status is not None: status_reduced = helpers.reduce_chars_newlines(status, max_lines=1) @@ -849,17 +827,12 @@ class ChatControl(ChatControlBase): if app.config.get('show_chatstate_in_banner'): chatstate = helpers.get_uf_chatstate(cs) - label_text = '%s%s %s' \ - % (name, acct_info, chatstate) - if acct_info: - acct_info = i18n.direction_mark + ' ' + acct_info - label_tooltip = '%s%s %s' % (name, acct_info, chatstate) + label_text = '%s %s' % \ + (name, chatstate) + label_tooltip = '%s %s' % (name, chatstate) else: - label_text = '%s%s' % \ - (name, acct_info) - if acct_info: - acct_info = i18n.direction_mark + ' ' + acct_info - label_tooltip = '%s%s' % (name, acct_info) + label_text = '%s' % name + label_tooltip = name if status_escaped: status_text = make_href_markup(status_escaped) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ad2dfb8d2b1c76429ed4b0ce2a94073… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ad2dfb8d2b1c76429ed4b0ce2a94073… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 11 commits: MamPreferences: Correctly display preference state for JID
by Philipp Hörist 05 Jul '20

05 Jul '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 73030407 by lovetox at 2020-07-05T11:00:33+02:00 MamPreferences: Correctly display preference state for JID - - - - - f8c68062 by lovetox at 2020-07-05T11:00:33+02:00 Interface: Store password with correct backend On account creation use the passwords module to store the password correctly - - - - - 644b4374 by lovetox at 2020-07-05T11:00:33+02:00 Remove comment - - - - - ad0ef193 by lovetox at 2020-07-05T11:00:33+02:00 CertStore: Add cert to cache on add_certificate() Otherwise the cert is only available after a restart Fixes #10160 - - - - - 221345f9 by lovetox at 2020-07-05T11:00:33+02:00 Determine correctly if block/unblock menuitem is shown - - - - - 1e53583e by André Apitzsch at 2020-07-05T11:00:33+02:00 MusicTrackListener: Catch all errors Fixes #10164. - - - - - 0deda0f8 by Daniel Brötzmann at 2020-07-05T11:00:33+02:00 Preferences: Fix tooltip string for auto copy - - - - - 32db5e3b by Daniel Brötzmann at 2020-07-05T11:00:33+02:00 MessageWindow: Fix deprecated properties, don’t expand label - - - - - 25252179 by Daniel Brötzmann at 2020-07-05T11:00:33+02:00 SubscriptionRequest: Add block/report features - - - - - 037b0aba by lovetox at 2020-07-05T11:00:33+02:00 Rename methods/vars SSL -> TLS - - - - - 12b81860 by lovetox at 2020-07-05T11:00:33+02:00 Remove unused code Its impossible to get connected by accident without TLS. Connecting unencrypted is now a feature for developers. So showing a icon that reflects transport encryption seems not useful anymore. We still show TLS information in the Server Info window - - - - - 15 changed files: - gajim/common/app.py - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/dbus/music_track.py - gajim/common/helpers.py - gajim/data/gui/message_window.ui - gajim/data/gui/preferences_window.ui - gajim/data/gui/subscription_request_window.ui - gajim/gtk/mam_preferences.py - gajim/gtk/ssl_error_dialog.py - gajim/gtk/subscription_request.py - gajim/gtk/tooltips.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/common/app.py ===================================== @@ -115,9 +115,6 @@ nicks = {} # type: Dict[str, str] # from this transport block_signed_in_notifications = {} # type: Dict[str, bool] - # type of each connection (ssl, tls, tcp, ...) -con_types = {} # type: Dict[str, Optional[str]] - proxy65_manager = None cert_store = None @@ -466,21 +463,6 @@ def in_groupchat(account, room_jid): return False return gc_connected[account][room_jid] -def get_number_of_securely_connected_accounts(): - """ - Return the number of the accounts that are SSL/TLS connected - """ - num_of_secured = 0 - for account in connections: - if account_is_securely_connected(account): - num_of_secured += 1 - return num_of_secured - -def account_is_securely_connected(account): - if not account_is_connected(account): - return False - return con_types.get(account) in ('tls', 'ssl') - def get_transport_name_from_jid(jid, use_config_setting=True): """ Returns 'gg', 'irc' etc ===================================== gajim/common/cert_store.py ===================================== @@ -62,6 +62,7 @@ class CertificateStore: def add_certificate(self, certificate): log.info('Add certificate to trust store') + self._certs.append(certificate) pem = certificate.props.certificate_pem path = self._get_random_path() write_file_async(path, ===================================== gajim/common/client.py ===================================== @@ -33,7 +33,7 @@ from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource -from gajim.common.helpers import get_ignored_ssl_errors +from gajim.common.helpers import get_ignored_tls_errors from gajim.common.helpers import get_idle_status_message from gajim.common.idle import Monitor from gajim.common.i18n import _ @@ -79,7 +79,7 @@ class Client(ConnectionHandlers): self._destroy_client = False self._remove_account = False - self._ssl_errors = set() + self._tls_errors = set() self._destroyed = False @@ -178,7 +178,7 @@ class Client(ConnectionHandlers): app.cert_store.get_certificates()) self._client.set_ignored_tls_errors( - get_ignored_ssl_errors(self._account)) + get_ignored_tls_errors(self._account)) if app.config.get_per('accounts', self._account, 'use_plain_connection'): @@ -200,8 +200,8 @@ class Client(ConnectionHandlers): for handler in modules.get_handlers(self): self._client.register_handler(handler) - def process_ssl_errors(self): - if not self._ssl_errors: + def process_tls_errors(self): + if not self._tls_errors: self.connect(ignore_all_errors=True) return @@ -209,7 +209,7 @@ class Client(ConnectionHandlers): account=self._account, connection=self, cert=self._client.peer_certificate[0], - error_num=self._ssl_errors.pop()) + error_num=self._tls_errors.pop()) def _on_resume_failed(self, _client, _signal_name): log.info('Resume failed') @@ -261,13 +261,13 @@ class Client(ConnectionHandlers): self._reconnect = False elif domain == StreamError.BAD_CERTIFICATE: - self._ssl_errors = self._client.peer_certificate[1] + self._tls_errors = self._client.peer_certificate[1] self.get_module('Chatstate').enabled = False self._reconnect = False self._after_disconnect() app.nec.push_incoming_event(NetworkEvent( 'our-show', account=self._account, show='offline')) - self.process_ssl_errors() + self.process_tls_errors() elif domain in (StreamError.STREAM, StreamError.BIND): if error == 'conflict': ===================================== gajim/common/dbus/music_track.py ===================================== @@ -85,10 +85,8 @@ class MusicTrackListener: -1, None) except GLib.Error as error: - if error.domain == 'g-dbus-error-quark': - log.debug("Could not list names: %s", error.message) - return - raise + log.debug("Could not list names: %s", error.message) + return for name in result[0]: if name.startswith(MPRIS_PLAYER_PREFIX): @@ -199,12 +197,10 @@ class MusicTrackListener: -1, None) except GLib.Error as error: - if error.domain == 'g-dbus-error-quark': - log.debug("Could not enable music listener: %s", error.message) - return None - raise - else: - return self._get_music_info(result[0]) + log.debug("Could not enable music listener: %s", error.message) + return None + + return self._get_music_info(result[0]) def enable(): ===================================== gajim/common/helpers.py ===================================== @@ -1545,7 +1545,7 @@ def warn_about_plain_connection(account, connection_types): return False -def get_ignored_ssl_errors(account): +def get_ignored_tls_errors(account): ignore_ssl_errors = app.config.get_per( 'accounts', account, 'ignore_ssl_errors').split() return {Gio.TlsCertificateFlags(int(err)) for err in ignore_ssl_errors} ===================================== gajim/data/gui/message_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkEventBox" id="chat_tab_ebox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -17,7 +17,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="stock">gtk-missing-image</property> </object> <packing> <property name="expand">False</property> @@ -30,8 +29,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="margin_left">3</property> - <property name="hexpand">True</property> + <property name="margin_start">3</property> <property name="use_markup">True</property> <property name="ellipsize">end</property> <property name="single_line_mode">True</property> @@ -48,17 +46,16 @@ </child> <child> <object class="GtkButton" id="tab_close_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">end</property> <property name="relief">none</property> <child> - <object class="GtkImage" id="image1329"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-close</property> + <property name="icon_name">window-close</property> <property name="icon_size">1</property> </object> </child> @@ -78,9 +75,6 @@ <property name="default_width">480</property> <property name="default_height">440</property> <property name="show_menubar">False</property> - <child type="titlebar"> - <placeholder/> - </child> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> @@ -88,5 +82,8 @@ <property name="scrollable">True</property> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -585,7 +585,7 @@ <property name="label" translatable="yes">Enable auto copy</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If enabled, selecting Text will be copied to the clipboard, otherwise you can copy text with CTRL + SHIFT + C</property> + <property name="tooltip_text" translatable="yes">If enabled, selected text will automatically be copied to the clipboard, otherwise you can copy text with CTRL + SHIFT + C</property> <property name="halign">start</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> ===================================== gajim/data/gui/subscription_request_window.ui ===================================== @@ -1,7 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> + <object class="GtkPopoverMenu" id="deny_popover"> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkModelButton" id="deny_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="text" translatable="yes">_Deny</property> + <signal name="clicked" handler="_on_deny_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkModelButton" id="block_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="text" translatable="yes">_Block User</property> + <signal name="clicked" handler="_on_block_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkModelButton" id="report_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="text" translatable="yes">_Report as Spam</property> + <signal name="clicked" handler="_on_report_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="submenu">main</property> + <property name="position">1</property> + </packing> + </child> + </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -26,22 +86,20 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="jid_label"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label"><XMPP address></property> + <property name="label">Subscription Request</property> <property name="wrap">True</property> <property name="wrap_mode">word-char</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> <style> <class name="large-header"/> </style> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> <child> @@ -84,38 +142,35 @@ </packing> </child> <child> - <object class="GtkButton" id="contact_info_button"> + <object class="GtkButton" id="start_chat_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Contact Information</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Start Chat</property> <property name="valign">center</property> - <property name="image">image2</property> - <signal name="clicked" handler="_on_contact_info_clicked" swapped="no"/> + <property name="image">image1</property> + <signal name="clicked" handler="_on_start_chat_clicked" swapped="no"/> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkButton" id="start_chat_button"> + <object class="GtkButton" id="contact_info_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Start Chat</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Contact Information</property> <property name="valign">center</property> - <property name="image">image1</property> - <signal name="clicked" handler="_on_start_chat_clicked" swapped="no"/> + <property name="image">image2</property> + <signal name="clicked" handler="_on_contact_info_clicked" swapped="no"/> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> @@ -144,15 +199,20 @@ <property name="spacing">12</property> <property name="homogeneous">True</property> <child> - <object class="GtkButton" id="deny_button"> - <property name="label" translatable="yes">_Deny</property> + <object class="GtkMenuButton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Deny authorization from contact so the contact cannot know if you are connected</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_deny_clicked" swapped="no"/> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="popover">deny_popover</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Deny…</property> + <property name="use_underline">True</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -166,9 +226,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Authorize contact so the contact can know if you are connected</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Allows the contact to see your online status</property> <property name="use_underline">True</property> <signal name="clicked" handler="_on_authorize_clicked" swapped="no"/> <style> @@ -178,7 +237,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -78,10 +78,10 @@ class MamPreferences(Gtk.ApplicationWindow, EventHelper): self._ui.default_combo.set_active_id(result.default) self._ui.preferences_store.clear() for jid in result.always: - self._ui.preferences_store.append((str(jid), 'Always')) + self._ui.preferences_store.append((str(jid), True)) for jid in result.never: - self._ui.preferences_store.append((str(jid), 'Never')) + self._ui.preferences_store.append((str(jid), False)) @ensure_not_destroyed def _mam_prefs_saved(self, result): @@ -137,8 +137,8 @@ class MamPreferences(Gtk.ApplicationWindow, EventHelper): never = [] default = self._ui.default_combo.get_active_id() for item in self._ui.preferences_store: - jid, type_ = item - if type_ == 'Always': + jid, archive = item + if archive: always.append(jid) else: never.append(jid) ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -80,4 +80,4 @@ class SSLErrorDialog(Gtk.ApplicationWindow): app.cert_store.add_certificate(self._cert) self.destroy() - self._con.process_ssl_errors() + self._con.process_tls_errors() ===================================== gajim/gtk/subscription_request.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gtk +from gi.repository import Gdk from gajim import vcard @@ -33,25 +34,38 @@ class SubscriptionRequest(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_title(_('Subscription Request')) - self._ui = get_builder('subscription_request_window.ui') - self.add(self._ui.subscription_box) self.jid = jid self.account = account self.user_nick = user_nick - self._ui.jid_label.set_text(self.jid) + + self._ui = get_builder('subscription_request_window.ui') + self.add(self._ui.subscription_box) + self._ui.authorize_button.grab_default() + if len(app.connections) >= 2: - prompt_text = \ - _('Subscription request for account %(account)s from %(jid)s')\ - % {'account': account, 'jid': self.jid} + prompt_text = _( + 'Subscription request for account %(account)s from ' + '%(jid)s') % {'account': self.account, 'jid': self.jid} else: prompt_text = _('Subscription request from %s') % self.jid self._ui.request_label.set_text(prompt_text) self._ui.subscription_text.set_text(text) + con = app.connections[self.account] + if con.get_module('Blocking').supported: + self._ui.block_button.set_sensitive(True) + self._ui.report_button.set_sensitive(True) + + self.connect('key-press-event', self._on_key_press) + self._ui.connect_signals(self) self.show_all() + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + def _on_authorize_clicked(self, _widget): """ Accept the request @@ -86,12 +100,28 @@ class SubscriptionRequest(Gtk.ApplicationWindow): app.interface.new_chat_from_jid(self.account, self.jid) def _on_deny_clicked(self, _widget): - """ - Refuse the request - """ + self._deny_request() + self._remove_contact() + + def _on_block_clicked(self, _widget): + self._deny_request() + con = app.connections[self.account] + con.get_module('Blocking').block([self.jid]) + self._remove_contact() + + def _on_report_clicked(self, _widget): + self._deny_request() + con = app.connections[self.account] + con.get_module('Blocking').block([self.jid], report='spam') + self._remove_contact() + + def _deny_request(self): con = app.connections[self.account] con.get_module('Presence').unsubscribed(self.jid) + + def _remove_contact(self): contact = app.contacts.get_contact(self.account, self.jid) if contact and _('Not in contact list') in contact.get_shown_groups(): - app.interface.roster.remove_contact(self.jid, self.account) + app.interface.roster.remove_contact( + self.jid, self.account, force=True, backend=True) self.destroy() ===================================== gajim/gtk/tooltips.py ===================================== @@ -91,8 +91,7 @@ class StatusTable: 1) self.current_row += 1 - def add_status_row(self, show, str_status, show_lock=False, - indent=True, transport=None): + def add_status_row(self, show, str_status, indent=True, transport=None): """ Append a new row with status icon to the table """ @@ -117,10 +116,6 @@ class StatusTable: status_label.set_ellipsize(Pango.EllipsizeMode.END) status_label.set_max_width_chars(30) self.table.attach(status_label, 3, self.current_row, 1, 1) - if show_lock: - lock_image = Gtk.Image() - lock_image.set_from_icon_name('dialog-password', Gtk.IconSize.MENU) - self.table.attach(lock_image, 4, self.current_row, 1, 1) self.current_row += 1 def fill_table_with_accounts(self, accounts): @@ -128,8 +123,6 @@ class StatusTable: message = acct['message'] message = helpers.reduce_chars_newlines(message, 100, 1) message = GLib.markup_escape_text(message) - con_type = app.con_types.get(acct['name']) - show_lock = con_type in ('tls', 'ssl') account_label = GLib.markup_escape_text(acct['account_label']) if message: @@ -137,10 +130,7 @@ class StatusTable: else: status = account_label - self.add_status_row(acct['show'], - status, - show_lock=show_lock, - indent=False) + self.add_status_row(acct['show'], status, indent=False) for line in acct['event_lines']: self.add_text_row(' ' + line, 1) ===================================== gajim/gui_interface.py ===================================== @@ -1521,7 +1521,6 @@ class Interface: '%s@%s' % (username, domain)) config['hostname'] = domain config['savepass'] = True - config['password'] = password config['anonymous_auth'] = anonymous config['autoconnect'] = True config['sync_with_global_status'] = True @@ -1542,10 +1541,14 @@ class Interface: for opt in config: app.config.set_per('accounts', account, opt, config[opt]) + # Password module depends on existing config + passwords.save_password(account, password) + app.css_config.refresh() - # refresh accounts window + # Action must be added before account window is updated app.app.add_account_actions(account) + window = get_app_window('AccountsWindow') if window is not None: window.add_account(account) ===================================== gajim/gui_menu_builder.py ===================================== @@ -397,7 +397,7 @@ control=None, gc_contact=None, is_anonymous=True): if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) block_menuitem.hide() - if transport != 'jabber': + if transport not in ('jabber', None): unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() unignore_menuitem.set_no_show_all(False) @@ -409,7 +409,7 @@ control=None, gc_contact=None, is_anonymous=True): else: unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() - if transport != 'jabber': + if transport not in ('jabber', None): block_menuitem.set_no_show_all(True) block_menuitem.hide() ignore_menuitem.set_no_show_all(False) ===================================== gajim/roster_window.py ===================================== @@ -290,13 +290,9 @@ class RosterWindow: show = helpers.get_connection_status(account) our_jid = app.get_jid_from_account(account) - tls_pixbuf = None - if app.account_is_securely_connected(account): - tls_pixbuf = 'changes-prevent' - it = self.model.append(None, [get_icon_name(show), GLib.markup_escape_text(account), 'account', our_jid, - account, None, None, None, None, None, tls_pixbuf, True] + + account, None, None, None, None, None, None, True] + [None] * self.nb_ext_renderers) self._iters[account]['account'] = it @@ -1009,15 +1005,6 @@ class RosterWindow: if not child_iter: return - num_of_accounts = app.get_number_of_connected_accounts() - num_of_secured = app.get_number_of_securely_connected_accounts() - - tls_pixbuf = None - if app.account_is_securely_connected(account) and not self.regroup or\ - self.regroup and num_of_secured and num_of_secured == num_of_accounts: - tls_pixbuf = 'changes-prevent' - self.model[child_iter][Column.PADLOCK_PIXBUF] = tls_pixbuf - if self.regroup: account_name = _('Merged accounts') accounts = [] @@ -2188,8 +2175,6 @@ class RosterWindow: # No need to redraw contacts if we're quitting if child_iterA: self.model[child_iterA][Column.AVATAR_IMG] = None - if account in app.con_types: - app.con_types[account] = None for jid in list(app.contacts.get_jid_list(account)): lcontact = app.contacts.get_contacts(account, jid) ctrl = app.interface.msg_win_mgr.get_gc_control(jid, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/85c1c83559353229de2462a9ad0af79… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/85c1c83559353229de2462a9ad0af79… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Rename methods/vars
by Philipp Hörist 05 Jul '20

05 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 47bf21d2 by lovetox at 2020-07-05T10:52:51+02:00 Rename methods/vars SSL -> TLS - - - - - fdc7998a by lovetox at 2020-07-05T10:52:51+02:00 Remove unused code Its impossible to get connected by accident without TLS. Connecting unencrypted is now a feature for developers. So showing a icon that reflects transport encryption seems not useful anymore. We still show TLS information in the Server Info window - - - - - 6 changed files: - gajim/common/app.py - gajim/common/client.py - gajim/common/helpers.py - gajim/gtk/ssl_error_dialog.py - gajim/gtk/tooltips.py - gajim/roster_window.py Changes: ===================================== gajim/common/app.py ===================================== @@ -115,9 +115,6 @@ nicks = {} # type: Dict[str, str] # from this transport block_signed_in_notifications = {} # type: Dict[str, bool] - # type of each connection (ssl, tls, tcp, ...) -con_types = {} # type: Dict[str, Optional[str]] - proxy65_manager = None cert_store = None @@ -466,21 +463,6 @@ def in_groupchat(account, room_jid): return False return gc_connected[account][room_jid] -def get_number_of_securely_connected_accounts(): - """ - Return the number of the accounts that are SSL/TLS connected - """ - num_of_secured = 0 - for account in connections: - if account_is_securely_connected(account): - num_of_secured += 1 - return num_of_secured - -def account_is_securely_connected(account): - if not account_is_connected(account): - return False - return con_types.get(account) in ('tls', 'ssl') - def get_transport_name_from_jid(jid, use_config_setting=True): """ Returns 'gg', 'irc' etc ===================================== gajim/common/client.py ===================================== @@ -33,7 +33,7 @@ from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource -from gajim.common.helpers import get_ignored_ssl_errors +from gajim.common.helpers import get_ignored_tls_errors from gajim.common.helpers import get_idle_status_message from gajim.common.idle import Monitor from gajim.common.i18n import _ @@ -79,7 +79,7 @@ class Client(ConnectionHandlers): self._destroy_client = False self._remove_account = False - self._ssl_errors = set() + self._tls_errors = set() self._destroyed = False @@ -178,7 +178,7 @@ class Client(ConnectionHandlers): app.cert_store.get_certificates()) self._client.set_ignored_tls_errors( - get_ignored_ssl_errors(self._account)) + get_ignored_tls_errors(self._account)) if app.config.get_per('accounts', self._account, 'use_plain_connection'): @@ -200,8 +200,8 @@ class Client(ConnectionHandlers): for handler in modules.get_handlers(self): self._client.register_handler(handler) - def process_ssl_errors(self): - if not self._ssl_errors: + def process_tls_errors(self): + if not self._tls_errors: self.connect(ignore_all_errors=True) return @@ -209,7 +209,7 @@ class Client(ConnectionHandlers): account=self._account, connection=self, cert=self._client.peer_certificate[0], - error_num=self._ssl_errors.pop()) + error_num=self._tls_errors.pop()) def _on_resume_failed(self, _client, _signal_name): log.info('Resume failed') @@ -261,13 +261,13 @@ class Client(ConnectionHandlers): self._reconnect = False elif domain == StreamError.BAD_CERTIFICATE: - self._ssl_errors = self._client.peer_certificate[1] + self._tls_errors = self._client.peer_certificate[1] self.get_module('Chatstate').enabled = False self._reconnect = False self._after_disconnect() app.nec.push_incoming_event(NetworkEvent( 'our-show', account=self._account, show='offline')) - self.process_ssl_errors() + self.process_tls_errors() elif domain in (StreamError.STREAM, StreamError.BIND): if error == 'conflict': ===================================== gajim/common/helpers.py ===================================== @@ -1545,7 +1545,7 @@ def warn_about_plain_connection(account, connection_types): return False -def get_ignored_ssl_errors(account): +def get_ignored_tls_errors(account): ignore_ssl_errors = app.config.get_per( 'accounts', account, 'ignore_ssl_errors').split() return {Gio.TlsCertificateFlags(int(err)) for err in ignore_ssl_errors} ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -80,4 +80,4 @@ class SSLErrorDialog(Gtk.ApplicationWindow): app.cert_store.add_certificate(self._cert) self.destroy() - self._con.process_ssl_errors() + self._con.process_tls_errors() ===================================== gajim/gtk/tooltips.py ===================================== @@ -91,8 +91,7 @@ class StatusTable: 1) self.current_row += 1 - def add_status_row(self, show, str_status, show_lock=False, - indent=True, transport=None): + def add_status_row(self, show, str_status, indent=True, transport=None): """ Append a new row with status icon to the table """ @@ -117,10 +116,6 @@ class StatusTable: status_label.set_ellipsize(Pango.EllipsizeMode.END) status_label.set_max_width_chars(30) self.table.attach(status_label, 3, self.current_row, 1, 1) - if show_lock: - lock_image = Gtk.Image() - lock_image.set_from_icon_name('dialog-password', Gtk.IconSize.MENU) - self.table.attach(lock_image, 4, self.current_row, 1, 1) self.current_row += 1 def fill_table_with_accounts(self, accounts): @@ -128,8 +123,6 @@ class StatusTable: message = acct['message'] message = helpers.reduce_chars_newlines(message, 100, 1) message = GLib.markup_escape_text(message) - con_type = app.con_types.get(acct['name']) - show_lock = con_type in ('tls', 'ssl') account_label = GLib.markup_escape_text(acct['account_label']) if message: @@ -137,10 +130,7 @@ class StatusTable: else: status = account_label - self.add_status_row(acct['show'], - status, - show_lock=show_lock, - indent=False) + self.add_status_row(acct['show'], status, indent=False) for line in acct['event_lines']: self.add_text_row(' ' + line, 1) ===================================== gajim/roster_window.py ===================================== @@ -290,13 +290,9 @@ class RosterWindow: show = helpers.get_connection_status(account) our_jid = app.get_jid_from_account(account) - tls_pixbuf = None - if app.account_is_securely_connected(account): - tls_pixbuf = 'changes-prevent' - it = self.model.append(None, [get_icon_name(show), GLib.markup_escape_text(account), 'account', our_jid, - account, None, None, None, None, None, tls_pixbuf, True] + + account, None, None, None, None, None, None, True] + [None] * self.nb_ext_renderers) self._iters[account]['account'] = it @@ -1009,15 +1005,6 @@ class RosterWindow: if not child_iter: return - num_of_accounts = app.get_number_of_connected_accounts() - num_of_secured = app.get_number_of_securely_connected_accounts() - - tls_pixbuf = None - if app.account_is_securely_connected(account) and not self.regroup or\ - self.regroup and num_of_secured and num_of_secured == num_of_accounts: - tls_pixbuf = 'changes-prevent' - self.model[child_iter][Column.PADLOCK_PIXBUF] = tls_pixbuf - if self.regroup: account_name = _('Merged accounts') accounts = [] @@ -2188,8 +2175,6 @@ class RosterWindow: # No need to redraw contacts if we're quitting if child_iterA: self.model[child_iterA][Column.AVATAR_IMG] = None - if account in app.con_types: - app.con_types[account] = None for jid in list(app.contacts.get_jid_list(account)): lcontact = app.contacts.get_contacts(account, jid) ctrl = app.interface.msg_win_mgr.get_gc_control(jid, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1f8d766ae8949ed4fb5cbec669978bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1f8d766ae8949ed4fb5cbec669978bd… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2020