Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Refactor Privacy and Blocking into own modules
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd79fe62 by Philipp Hörist at 2018-07-08T16:44:14+02:00 Refactor Privacy and Blocking into own modules - - - - - 10 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/helpers.py - + gajim/common/modules/blocking.py - + gajim/common/modules/privacylists.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/roster_window.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -103,11 +103,6 @@ class CommonConnection: self.priority = app.get_priority(name, 'offline') self.time_to_reconnect = None - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.blocked_all = False - self.seclabel_supported = False self.seclabel_catalogues = {} @@ -631,8 +626,6 @@ class Connection(CommonConnection, ConnectionHandlers): # Register all modules modules.register(self) - app.ged.register_event_handler('privacy-list-received', ged.CORE, - self._nec_privacy_list_received) app.ged.register_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error_received) app.ged.register_event_handler('agent-info-received', ged.CORE, @@ -651,8 +644,6 @@ class Connection(CommonConnection, ConnectionHandlers): ConnectionHandlers.cleanup(self) modules.unregister(self) - app.ged.remove_event_handler('privacy-list-received', ged.CORE, - self._nec_privacy_list_received) app.ged.remove_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error_received) app.ged.remove_event_handler('agent-info-received', ged.CORE, @@ -702,7 +693,7 @@ class Connection(CommonConnection, ConnectionHandlers): # Do not try to reco while we are already trying self.time_to_reconnect = None if self.connected < 2: # connection failed - log.debug('reconnect') + log.info('Reconnect') self.connected = 1 app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='connecting')) @@ -710,12 +701,14 @@ class Connection(CommonConnection, ConnectionHandlers): self.on_connect_auth = self._discover_server_at_connection self.connect_and_init(self.old_show, self.status, self.USE_GPG) else: + log.info('Reconnect successfull') # reconnect succeeded self.time_to_reconnect = None self.retrycount = 0 # We are doing disconnect at so many places, better use one function in all def disconnect(self, on_purpose=False): + log.info('Disconnect: on_purpose: %s', on_purpose) app.interface.music_track_changed(None, None, self.name) self.get_module('PEP').reset_stored_publish() self.on_purpose = on_purpose @@ -798,7 +791,7 @@ class Connection(CommonConnection, ConnectionHandlers): # END disconnectedReconnCB def _connection_lost(self): - log.debug('_connection_lost') + log.info('_connection_lost') self.disconnect(on_purpose = False) if self.removing_account: return @@ -882,38 +875,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(RegisterAgentInfoReceivedEvent( None, conn=self, agent=data[0], config=conf, is_form=is_form)) - elif realm == nbxmpp.NS_PRIVACY: - if event == nbxmpp.features_nb.PRIVACY_LISTS_RECEIVED: - # data is (list) - app.nec.push_incoming_event(PrivacyListsReceivedEvent(None, - conn=self, lists_list=data)) - elif event == nbxmpp.features_nb.PRIVACY_LIST_RECEIVED: - # data is (resp) - if not data: - return - rules = [] - name = data.getTag('query').getTag('list').getAttr('name') - for child in data.getTag('query').getTag('list').getChildren(): - dict_item = child.getAttrs() - childs = [] - if 'type' in dict_item: - for scnd_child in child.getChildren(): - childs += [scnd_child.getName()] - rules.append({'action':dict_item['action'], - 'type':dict_item['type'], 'order':dict_item['order'], - 'value':dict_item['value'], 'child':childs}) - else: - for scnd_child in child.getChildren(): - childs.append(scnd_child.getName()) - rules.append({'action':dict_item['action'], - 'order':dict_item['order'], 'child':childs}) - app.nec.push_incoming_event(PrivacyListReceivedEvent(None, - conn=self, list_name=name, rules=rules)) - elif event == nbxmpp.features_nb.PRIVACY_LISTS_ACTIVE_DEFAULT: - # data is (dict) - app.nec.push_incoming_event(PrivacyListActiveDefaultEvent( - None, conn=self, active_list=data['active'], - default_list=data['default'])) def _select_next_host(self, hosts): """ @@ -952,6 +913,7 @@ class Connection(CommonConnection, ConnectionHandlers): if self.connection: return self.connection, '' + log.info('Connect') if self.sm.resuming and self.sm.location: # If resuming and server gave a location, connect from there hostname = self.sm.location @@ -1086,7 +1048,6 @@ class Connection(CommonConnection, ConnectionHandlers): app.config.set_per('proxies', p, 'type', 'bosh') app.config.set_per('proxies', p, 'bosh_uri', url) - def _connect_to_next_host(self, retry=False): log.debug('Connection to next host') if not self._hosts: @@ -1233,6 +1194,7 @@ class Connection(CommonConnection, ConnectionHandlers): if not self.connected: # We went offline during connecting process # FIXME - not possible, maybe it was when we used threads return + log.info('Connect successfull') _con_type = con_type if _con_type != self._current_type: log.info('Connecting to next host beacuse desired type is %s and returned is %s' @@ -1269,6 +1231,7 @@ class Connection(CommonConnection, ConnectionHandlers): msg=_('Connection with account %s has been lost. Retry ' 'connecting.') % self.name)) return + log.info('Connection accepted') self._hosts = [] self.connection_auto_accepted = False self.connected_hostname = self._current_host['host'] @@ -1389,6 +1352,7 @@ class Connection(CommonConnection, ConnectionHandlers): 'Retry connecting.') % self.name)) return + log.info('SSL Cert accepted') name = None if not app.config.get_per('accounts', self.name, 'anonymous_auth'): name = app.config.get_per('accounts', self.name, 'name') @@ -1420,6 +1384,7 @@ class Connection(CommonConnection, ConnectionHandlers): ConnectionHandlers._register_handlers(self, con, con_type) def __on_auth(self, con, auth): + log.info('auth') if not con: self.disconnect(on_purpose=True) app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, @@ -1472,207 +1437,11 @@ class Connection(CommonConnection, ConnectionHandlers): def add_lang(self, stanza): stanza.setAttr('xml:lang', i18n.LANG) - def get_privacy_lists(self): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.getPrivacyLists(self.connection) - def send_keepalive(self): # nothing received for the last foo seconds if self.connection: self.connection.send(' ') - def get_active_default_lists(self): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.getActiveAndDefaultPrivacyLists(self.connection) - - def del_privacy_list(self, privacy_list): - if not app.account_is_connected(self.name): - return - def _on_del_privacy_list_result(result): - if result: - app.nec.push_incoming_event(PrivacyListRemovedEvent(None, - conn=self, list_name=privacy_list)) - else: - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='privacy-list-error', args=privacy_list)) - nbxmpp.features_nb.delPrivacyList(self.connection, privacy_list, - _on_del_privacy_list_result) - - def get_privacy_list(self, title): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.getPrivacyList(self.connection, title) - - def set_privacy_list(self, listname, tags): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.setPrivacyList(self.connection, listname, tags) - - def set_active_list(self, listname): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.setActivePrivacyList(self.connection, listname, - 'active') - - def set_default_list(self, listname): - if not app.account_is_connected(self.name): - return - nbxmpp.features_nb.setDefaultPrivacyList(self.connection, listname) - - def build_privacy_rule(self, name, action, order=1): - """ - Build a Privacy rule stanza for invisibility - """ - iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, xmlns='') - l = iq.setQuery().setTag('list', {'name': name}) - i = l.setTag('item', {'action': action, 'order': str(order)}) - i.setTag('presence-out') - return iq - - def build_invisible_rule(self): - iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, xmlns='') - l = iq.setQuery().setTag('list', {'name': 'invisible'}) - if self.name in app.interface.status_sent_to_groups and \ - len(app.interface.status_sent_to_groups[self.name]) > 0: - for group in app.interface.status_sent_to_groups[self.name]: - i = l.setTag('item', {'type': 'group', 'value': group, - 'action': 'allow', 'order': '1'}) - i.setTag('presence-out') - if self.name in app.interface.status_sent_to_users and \ - len(app.interface.status_sent_to_users[self.name]) > 0: - for jid in app.interface.status_sent_to_users[self.name]: - i = l.setTag('item', {'type': 'jid', 'value': jid, - 'action': 'allow', 'order': '2'}) - i.setTag('presence-out') - i = l.setTag('item', {'action': 'deny', 'order': '3'}) - i.setTag('presence-out') - return iq - - def set_invisible_rule(self): - if not app.account_is_connected(self.name): - return - iq = self.build_invisible_rule() - self.connection.send(iq) - - 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_contacts(self, contact_list, message): - if self.privacy_default_list is None: - self.privacy_default_list = 'block' - if not self.privacy_rules_supported: - if self.blocking_supported: #XEP-0191 - iq = nbxmpp.Iq('set', xmlns='') - query = iq.setQuery(name='block') - query.setNamespace(nbxmpp.NS_BLOCKING) - for contact in contact_list: - query.addChild(name='item', attrs={'jid': contact.jid}) - self.connection.send(iq) - return - for contact in contact_list: - contact.show = 'offline' - self.send_custom_status('offline', message, contact.jid) - 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.privacy_default_list, self.blocked_list) - if len(self.blocked_list) == 1: - self.set_default_list(self.privacy_default_list) - - def unblock_contacts(self, contact_list): - if not self.privacy_rules_supported: - if self.blocking_supported: #XEP-0191 - iq = nbxmpp.Iq('set', xmlns='') - query = iq.setQuery(name='unblock') - query.setNamespace(nbxmpp.NS_BLOCKING) - for contact in contact_list: - query.addChild(name='item', attrs={'jid': contact.jid}) - self.connection.send(iq) - return - self.new_blocked_list = [] - self.to_unblock = [] - for contact in contact_list: - self.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 self.to_unblock: - self.new_blocked_list.append(rule) - if len(self.new_blocked_list) == 0: - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.set_default_list('') - self.del_privacy_list(self.privacy_default_list) - else: - self.set_privacy_list(self.privacy_default_list, self.new_blocked_list) - if not app.interface.roster.regroup: - show = app.SHOW_LIST[self.connected] - else: # accounts merged - show = helpers.get_global_show() - if show == 'invisible': - return - for contact in contact_list: - self.send_custom_status(show, self.status, contact.jid) - # Send a presence Probe to get the current Status - probe = nbxmpp.Presence(contact.jid, 'probe', frm=self.get_own_jid()) - self.connection.send(probe) - - def block_group(self, group, contact_list, message): - if not self.privacy_rules_supported: - return - self.blocked_groups.append(group) - for contact in contact_list: - self.send_custom_status('offline', message, contact.jid) - 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.privacy_default_list, self.blocked_list) - if len(self.blocked_list) == 1: - self.set_default_list(self.privacy_default_list) - - def unblock_group(self, group, contact_list): - if not self.privacy_rules_supported: - return - if group in self.blocked_groups: - self.blocked_groups.remove(group) - self.new_blocked_list = [] - for rule in self.blocked_list: - if rule['action'] != 'deny' or rule['type'] != 'group' or \ - rule['value'] != group: - self.new_blocked_list.append(rule) - if len(self.new_blocked_list) == 0: - self.blocked_list = [] - self.blocked_contacts = [] - self.blocked_groups = [] - self.set_default_list('') - self.del_privacy_list(self.privacy_default_list) - else: - self.set_privacy_list(self.privacy_default_list, self.new_blocked_list) - if not app.interface.roster.regroup: - show = app.SHOW_LIST[self.connected] - else: # accounts merged - show = helpers.get_global_show() - if show == 'invisible': - return - for contact in contact_list: - self.send_custom_status(show, self.status, contact.jid) - def send_invisible_presence(self, msg, signed, initial = False): if not app.account_is_connected(self.name): return @@ -1694,15 +1463,17 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(p) # try to set the privacy rule - iq = self.build_invisible_rule() - self.connection.SendAndCallForResponse(iq, self._continue_invisible, - {'msg': msg, 'signed': signed, 'initial': initial}) + iq = self.get_module('PrivacyLists').set_invisible_rule( + callback=self._continue_invisible, + msg=msg, + signed=signed, + initial=initial) def _continue_invisible(self, con, iq_obj, msg, signed, initial): if iq_obj.getType() == 'error': # server doesn't support privacy lists return # active the privacy rule - self.set_active_list('invisible') + self.get_module('PrivacyLists').set_active_list('invisible') self.connected = app.SHOW_LIST.index('invisible') self.status = msg priority = app.get_priority(self.name, 'invisible') @@ -1777,42 +1548,35 @@ class Connection(CommonConnection, ConnectionHandlers): if len(result_array) != 0: self._stun_servers = self._hosts = [i for i in result_array] - def _request_privacy(self): - if not app.account_is_connected(self.name) or not self.connection: - return - iq = nbxmpp.Iq('get', nbxmpp.NS_PRIVACY, xmlns='') - id_ = self.connection.getAnID() - iq.setID(id_) - self.awaiting_answers[id_] = (PRIVACY_ARRIVED, ) - self.connection.send(iq) - - def _request_blocking(self): - if not app.account_is_connected(self.name) or not self.connection: - return - iq = nbxmpp.Iq('get', xmlns=None) - iq.setQuery('blocklist').setNamespace(nbxmpp.NS_BLOCKING) - self.connection.send(iq) - def _continue_connection_request_privacy(self): if self.privacy_rules_supported: if not self.privacy_rules_requested: self.privacy_rules_requested = True - self._request_privacy() + self.get_module('PrivacyLists').get_privacy_lists( + self._received_privacy) else: - if self.continue_connect_info and self.continue_connect_info[0]\ - == 'invisible': + # Privacy lists not supported + log.info('Privacy Lists not supported') + self._received_privacy(False) + + def _received_privacy(self, result): + if not result: + if (self.continue_connect_info and + self.continue_connect_info[0] == 'invisible'): # Trying to login as invisible but privacy list not # supported self.disconnect(on_purpose=True) - app.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) + app.nec.push_incoming_event(OurShowEvent( + None, conn=self, show='offline')) app.nec.push_incoming_event(InformationEvent( - None, dialog_name='invisibility-not-supported', args=self.name)) + None, dialog_name='invisibility-not-supported', + args=self.name)) return if self.blocking_supported: - self._request_blocking() - # Ask metacontacts before roster - self.get_metacontacts() + self.get_module('Blocking').get_blocking_list() + + # Ask metacontacts before roster + self.get_metacontacts() def _nec_agent_info_error_received(self, obj): if obj.conn.name != self.name: @@ -1937,7 +1701,7 @@ class Connection(CommonConnection, ConnectionHandlers): def _change_from_invisible(self): if self.privacy_rules_supported: - self.set_active_list('') + self.get_module('PrivacyLists').set_active_list(None) def _update_status(self, show, msg, idle_time=None): xmpp_show = helpers.get_xmpp_show(show) @@ -2156,43 +1920,6 @@ class Connection(CommonConnection, ConnectionHandlers): iq2.setAttr('to', to) self.connection.send(iq) - def _nec_privacy_list_received(self, obj): - roster = app.interface.roster - if obj.conn.name != self.name: - return - if obj.list_name != self.privacy_default_list: - return - self.blocked_contacts = [] - self.blocked_groups = [] - self.blocked_list = [] - self.blocked_all = False - for rule in obj.rules: - if rule['action'] == 'allow': - if not 'type' in rule: - self.blocked_all = False - elif rule['type'] == 'jid' and rule['value'] in \ - self.blocked_contacts: - self.blocked_contacts.remove(rule['value']) - elif rule['type'] == 'group' and rule['value'] in \ - self.blocked_groups: - self.blocked_groups.remove(rule['value']) - elif rule['action'] == 'deny': - if not 'type' in rule: - self.blocked_all = True - elif rule['type'] == 'jid' and rule['value'] not in \ - self.blocked_contacts: - self.blocked_contacts.append(rule['value']) - elif rule['type'] == 'group' and 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.name) - if rule['type'] == 'group': - roster.draw_group(rule['value'], self.name) - def bookmarks_available(self): if self.private_storage_supported: return True ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -771,8 +771,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.continue_connect_info = None - self.privacy_default_list = None - app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(MessageReceivedEvent) app.nec.register_incoming_event(ArchivingErrorReceivedEvent) @@ -798,8 +796,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - app.ged.register_event_handler('blocking', ged.CORE, - self._nec_blocking) def cleanup(self): ConnectionHandlersBase.cleanup(self) @@ -823,7 +819,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - app.ged.remove_event_handler('blocking', ged.CORE, self._nec_blocking) def add_sha(self, p, send_caps=True): p = self.get_module('VCardAvatars').add_update_node(p) @@ -912,21 +907,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): conn=self)) GLib.timeout_add_seconds(10, self.discover_servers) del self.awaiting_answers[id_] - elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: - del self.awaiting_answers[id_] - if iq_obj.getType() != 'error': - for list_ in iq_obj.getQueryPayload(): - if list_.getName() == 'default': - self.privacy_default_list = list_.getAttr('name') - self.get_privacy_list(self.privacy_default_list) - break - # Ask metacontacts before roster - self.get_metacontacts() - else: - # That should never happen, but as it's blocking in the - # connection process, we don't take the risk - self.privacy_rules_supported = False - self._continue_connection_request_privacy() def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: @@ -1181,27 +1161,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): app.nec.push_incoming_event(MucAdminReceivedEvent(None, conn=self, stanza=iq_obj)) - def _PrivacySetCB(self, con, iq_obj): - """ - Privacy lists (XEP 016) - - A list has been set. - """ - log.debug('PrivacySetCB') - if not self.connection or self.connected < 2: - return - result = iq_obj.buildReply('result') - q = result.getTag('query') - if q: - result.delChild(q) - self.connection.send(result) - - for list_ in iq_obj.getQueryPayload(): - if list_.getName() == 'list': - self.get_privacy_list(list_.getAttr('name')) - - raise nbxmpp.NodeProcessed - def _getRoster(self): log.debug('getRosterCB') if not self.connection: @@ -1342,42 +1301,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): jid_from = helpers.get_full_jid_from_iq(iq_obj) jingle_xtls.handle_new_cert(con, iq_obj, jid_from) - def _BlockingSetCB(self, con, iq_obj): - log.debug('_BlockingSetCB') - app.nec.push_incoming_event( - BlockingEvent(None, conn=self, stanza=iq_obj)) - reply = nbxmpp.Iq(typ='result', attrs={'id': iq_obj.getID()}, - to=iq_obj.getFrom(), frm=iq_obj.getTo(), xmlns=None) - self.connection.send(reply) - raise nbxmpp.NodeProcessed - - def _BlockingResultCB(self, con, iq_obj): - log.debug('_BlockingResultCB') - app.nec.push_incoming_event( - BlockingEvent(None, conn=self, stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_blocking(self, obj): - if obj.conn.name != self.name: - return - if obj.unblock_all: - self.blocked_contacts = [] - elif obj.blocklist: - self.blocked_contacts = obj.blocklist - else: - for jid in obj.blocked_jids: - if jid not in self.blocked_contacts: - self.blocked_contacts.append(jid) - contact_list = app.contacts.get_contacts(self.name, jid) - for contact in contact_list: - contact.show = 'offline' - for jid in obj.unblocked_jids: - if jid in self.blocked_contacts: - self.blocked_contacts.remove(jid) - # Send a presence Probe to get the current Status - probe = nbxmpp.Presence(jid, 'probe', frm=self.get_own_jid()) - self.connection.send(probe) - def _StreamCB(self, con, obj): log.debug('StreamCB') app.nec.push_incoming_event(StreamReceivedEvent(None, @@ -1422,7 +1345,7 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get', nbxmpp.NS_DISCO_ITEMS) - con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY) + con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_1) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_2) con.RegisterHandler('iq', self._JingleCB, 'result') @@ -1437,10 +1360,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): nbxmpp.NS_PUBKEY_PUBKEY) con.RegisterHandler('iq', self._PubkeyResultCB, 'result', nbxmpp.NS_PUBKEY_PUBKEY) - con.RegisterHandler('iq', self._BlockingSetCB, 'set', - nbxmpp.NS_BLOCKING) - con.RegisterHandler('iq', self._BlockingResultCB, 'result', - nbxmpp.NS_BLOCKING) for handler in modules.get_handlers(self): con.RegisterHandler(*handler) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1759,22 +1759,6 @@ class UniqueRoomIdNotSupportedEvent(nec.NetworkIncomingEvent): name = 'unique-room-id-not-supported' base_network_events = [] -class PrivacyListsReceivedEvent(nec.NetworkIncomingEvent): - name = 'privacy-lists-received' - base_network_events = [] - -class PrivacyListReceivedEvent(nec.NetworkIncomingEvent): - name = 'privacy-list-received' - base_network_events = [] - -class PrivacyListRemovedEvent(nec.NetworkIncomingEvent): - name = 'privacy-list-removed' - base_network_events = [] - -class PrivacyListActiveDefaultEvent(nec.NetworkIncomingEvent): - name = 'privacy-list-active-default' - base_network_events = [] - class NonAnonymousServerErrorEvent(nec.NetworkIncomingEvent): name = 'non-anonymous-server-error' base_network_events = [] @@ -2479,43 +2463,3 @@ class InformationEvent(nec.NetworkIncomingEvent): else: self.args = (self.args,) return True - -class BlockingEvent(nec.NetworkIncomingEvent): - name = 'blocking' - base_network_events = [] - - def init(self): - self.blocklist = [] - self.blocked_jids = [] - self.unblocked_jids = [] - self.unblock_all = False - - def generate(self): - block_list = self.stanza.getTag( - 'blocklist', namespace=nbxmpp.NS_BLOCKING) - if block_list is not None: - for item in block_list.getTags('item'): - self.blocklist.append(item.getAttr('jid')) - app.log('blocking').info( - 'Blocklist Received: %s', self.blocklist) - return True - - block_tag = self.stanza.getTag('block', namespace=nbxmpp.NS_BLOCKING) - if block_tag is not None: - for item in block_tag.getTags('item'): - self.blocked_jids.append(item.getAttr('jid')) - app.log('blocking').info( - 'Blocking Push - blocked JIDs: %s', self.blocked_jids) - - unblock_tag = self.stanza.getTag( - 'unblock', namespace=nbxmpp.NS_BLOCKING) - if unblock_tag is not None: - if not unblock_tag.getTags('item'): - self.unblock_all = True - app.log('blocking').info('Blocking Push - unblocked all') - return True - for item in unblock_tag.getTags('item'): - self.unblocked_jids.append(item.getAttr('jid')) - app.log('blocking').info( - 'Blocking Push - unblocked JIDs: %s', self.unblocked_jids) - return True ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1385,12 +1385,15 @@ def update_optional_features(account = None): app.connections[a].status) def jid_is_blocked(account, jid): - return ((jid in app.connections[account].blocked_contacts) or \ - app.connections[account].blocked_all) + 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) def group_is_blocked(account, group): - return ((group in app.connections[account].blocked_groups) or \ - app.connections[account].blocked_all) + 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') ===================================== gajim/common/modules/blocking.py ===================================== --- /dev/null +++ b/gajim/common/modules/blocking.py @@ -0,0 +1,156 @@ +# 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-0191: Blocking Command + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.blocking') + + +class Blocking: + def __init__(self, con): + self._con = con + self._account = con.name + + self.blocked = [] + + self.handlers = [ + ('iq', self._blocking_push_received, 'set', nbxmpp.NS_BLOCKING) + ] + + def get_blocking_list(self): + iq = nbxmpp.Iq('get', nbxmpp.NS_BLOCKING) + iq.setQuery('blocklist') + log.info('Request list') + self._con.connection.SendAndCallForResponse( + iq, self._blocking_list_received) + + def _blocking_list_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + return + + self.blocked = [] + blocklist = stanza.getTag('blocklist', namespace=nbxmpp.NS_BLOCKING) + if blocklist is None: + log.error('No blocklist node') + return + + for item in blocklist.getTags('item'): + self.blocked.append(item.getAttr('jid')) + log.info('Received list: %s', self.blocked) + + app.nec.push_incoming_event( + BlockingEvent(None, conn=self._con, changed=self.blocked)) + + def _blocking_push_received(self, conn, stanza): + reply = stanza.buildReply('result') + childs = reply.getChildren() + for child in childs: + reply.delChild(child) + self._con.connection.send(reply) + + changed_list = [] + + unblock = stanza.getTag('unblock', namespace=nbxmpp.NS_BLOCKING) + if unblock is not None: + items = unblock.getTags('item') + if not items: + # Unblock all + changed_list = list(self.blocked) + self.blocked = [] + for jid in self.blocked: + self._presence_probe(jid) + log.info('Unblock all Push') + return + + for item in items: + # Unblock some contacts + jid = item.getAttr('jid') + changed_list.append(jid) + if jid not in self.blocked: + continue + self.blocked.remove(jid) + self._presence_probe(jid) + log.info('Unblock Push: %s', jid) + + block = stanza.getTag('block', namespace=nbxmpp.NS_BLOCKING) + if block is not None: + for item in block.getTags('item'): + jid = item.getAttr('jid') + if jid in self.blocked: + continue + changed_list.append(jid) + self.blocked.append(jid) + self._set_contact_offline(jid) + log.info('Block Push: %s', jid) + + app.nec.push_incoming_event( + BlockingEvent(None, conn=self._con, changed=changed_list)) + + raise nbxmpp.NodeProcessed + + def _set_contact_offline(self, jid): + contact_list = app.contacts.get_contacts(self._account, jid) + for contact in contact_list: + contact.show = 'offline' + + def _presence_probe(self, jid): + 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) + + def block(self, contact_list): + if not self._con.blocking_supported: + return + iq = nbxmpp.Iq('set', nbxmpp.NS_BLOCKING) + query = iq.setQuery(name='block') + + for contact in contact_list: + query.addChild(name='item', attrs={'jid': contact.jid}) + log.info('Block: %s', contact.jid) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def unblock(self, contact_list): + if not self._con.blocking_supported: + return + iq = nbxmpp.Iq('set', nbxmpp.NS_BLOCKING) + query = iq.setQuery(name='unblock') + + for contact in contact_list: + query.addChild(name='item', attrs={'jid': contact.jid}) + log.info('Unblock: %s', contact.jid) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def _default_result_handler(self, conn, stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('Operation failed: %s', stanza.getError()) + + +class BlockingEvent(NetworkIncomingEvent): + name = 'blocking' + base_network_events = [] + + +def get_instance(*args, **kwargs): + return Blocking(*args, **kwargs), 'Blocking' ===================================== gajim/common/modules/privacylists.py ===================================== --- /dev/null +++ b/gajim/common/modules/privacylists.py @@ -0,0 +1,450 @@ +# 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 logging + +import nbxmpp + +from gajim.common import app +from gajim.common import helpers +from gajim.common.nec import NetworkIncomingEvent +from gajim.common.connection_handlers_events import InformationEvent + + +log = logging.getLogger('gajim.c.m.privacylists') + + +class PrivacyLists: + def __init__(self, con): + self._con = con + self._account = con.name + + self.default_list = None + self.active_list = None + self.blocked_contacts = [] + self.blocked_groups = [] + self.blocked_list = [] + self.blocked_all = False + + self.handlers = [ + ('iq', self._list_push_received, 'set', nbxmpp.NS_PRIVACY) + ] + + def _list_push_received(self, con, stanza): + 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') + log.info('Received Push: %s', name) + self.get_privacy_list(name) + + raise nbxmpp.NodeProcessed + + def get_privacy_lists(self, callback=None): + log.info('Request lists') + iq = nbxmpp.Iq('get', nbxmpp.NS_PRIVACY) + self._con.connection.SendAndCallForResponse( + iq, self._privacy_lists_received, {'callback': callback}) + + def _privacy_lists_received(self, conn, stanza, callback): + lists = [] + new_default = None + result = nbxmpp.isResultNode(stanza) + if not result: + 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) + + log.info('Received lists: %s', lists) + + # Download default list if we dont have it + if self.default_list != new_default: + self.default_list = new_default + if new_default is not None: + 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): + log.info('Request list: %s', name) + list_ = nbxmpp.Node('list', {'name': name}) + iq = nbxmpp.Iq('get', nbxmpp.NS_PRIVACY, payload=[list_]) + self._con.connection.SendAndCallForResponse( + iq, self._privacy_list_received) + + def _privacy_list_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + 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() + + childs = [] + for scnd_child in child.getChildren(): + childs.append(scnd_child.getName()) + + item['child'] = childs + if len(item) not in (3, 5): + log.warning('Wrong count of attrs: %s', stanza) + continue + rules.append(item) + + 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): + log.info('Remove list: %s', name) + + def _del_privacy_list_result(stanza): + if not nbxmpp.isResultNode(stanza): + 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', nbxmpp.NS_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', nbxmpp.NS_PRIVACY, payload=[node]) + for item in rules: + childs = item.get('child', []) + for child in childs: + node.setTag(child) + item.pop('child', None) + node.setTag('item', item) + 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): + log.info('Set active list: %s', name) + attr = {} + if name: + attr['name'] = name + node = nbxmpp.Node('active', attr) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def set_default_list(self, name=None): + log.info('Set default list: %s', name) + attr = {} + if name: + attr['name'] = name + node = nbxmpp.Node('default', attr) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) + self._con.connection.SendAndCallForResponse( + iq, self._default_result_handler, {}) + + def _default_result_handler(self, conn, stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('Operation failed: %s', stanza.getError()) + + def _build_invisible_rule(self): + node = nbxmpp.Node('list', {'name': 'invisible'}) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVACY, payload=[node]) + if self._account in app.interface.status_sent_to_groups and \ + len(app.interface.status_sent_to_groups[self._account]) > 0: + for group in app.interface.status_sent_to_groups[self._account]: + item = node.setTag('item', {'type': 'group', + 'value': group, + 'action': 'allow', + 'order': '1'}) + item.setTag('presence-out') + + if self._account in app.interface.status_sent_to_users and \ + len(app.interface.status_sent_to_users[self._account]) > 0: + for jid in app.interface.status_sent_to_users[self._account]: + item = node.setTag('item', {'type': 'jid', + 'value': jid, + 'action': 'allow', + 'order': '2'}) + item.setTag('presence-out') + + item = node.setTag('item', {'action': 'deny', 'order': '3'}) + item.setTag('presence-out') + return iq + + def set_invisible_rule(self, callback=None, **kwargs): + log.info('Update invisible list') + iq = self._build_invisible_rule() + if callback is None: + callback = self._default_result_handler + self._con.connection.SendAndCallForResponse( + iq, callback, kwargs) + + 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 + 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._con.privacy_rules_supported: + self._con.get_module('Blocking').block(contact_list) + return + + if self.default_list is None: + self.default_list = 'block' + for contact in contact_list: + log.info('Block contacts: %s', contact.jid) + contact.show = 'offline' + self._con.send_custom_status('offline', message, contact.jid) + 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) + + 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 len(new_blocked_list) == 0: + 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._con.privacy_rules_supported: + self._con.get_module('Blocking').unblock(contact_list) + return + + new_blocked_list = [] + to_unblock = [] + for contact in contact_list: + 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 len(new_blocked_list) == 0: + 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 = app.SHOW_LIST[self._con.connected] + else: # accounts merged + show = helpers.get_global_show() + if show == 'invisible': + return + for contact in contact_list: + self._con.send_custom_status(show, self._con.status, contact.jid) + self._presence_probe(contact.jid) + + def block_group(self, group, contact_list, message): + if not self._con.privacy_rules_supported: + return + if group in self.blocked_groups: + return + self.blocked_groups.append(group) + + log.info('Block group: %s', group) + + if self.default_list is None: + self.default_list = 'block' + + for contact in contact_list: + self._con.send_custom_status('offline', message, contact.jid) + + 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._con.privacy_rules_supported: + return + + if group not in self.blocked_groups: + return + self.blocked_groups.remove(group) + + 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 len(new_blocked_list) == 0: + 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 = app.SHOW_LIST[self._con.connected] + else: # accounts merged + show = helpers.get_global_show() + if show == 'invisible': + return + for contact in contact_list: + self._con.send_custom_status(show, self._con.status, contact.jid) + + def _presence_probe(self, jid): + 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' + base_network_events = [] + + +class PrivacyListReceivedEvent(NetworkIncomingEvent): + name = 'privacy-list-received' + base_network_events = [] + + +class PrivacyListRemovedEvent(NetworkIncomingEvent): + name = 'privacy-list-removed' + base_network_events = [] + + +def get_instance(*args, **kwargs): + return PrivacyLists(*args, **kwargs), 'PrivacyLists' ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -4100,8 +4100,8 @@ class PrivacyListWindow: app.ged.register_event_handler('privacy-list-received', ged.GUI1, self._nec_privacy_list_received) - app.ged.register_event_handler('privacy-list-active-default', - ged.GUI1, self._nec_privacy_list_active_default) + app.ged.register_event_handler('privacy-lists-received', ged.GUI1, + self._nec_privacy_lists_received) self.window.show_all() self.add_edit_vbox.hide() @@ -4118,10 +4118,10 @@ class PrivacyListWindow: del app.interface.instances[self.account][key_name] app.ged.remove_event_handler('privacy-list-received', ged.GUI1, self._nec_privacy_list_received) - app.ged.remove_event_handler('privacy-list-active-default', - ged.GUI1, self._nec_privacy_list_active_default) + app.ged.remove_event_handler('privacy-lists-received', ged.GUI1, + self._nec_privacy_lists_received) - def _nec_privacy_list_active_default(self, obj): + def _nec_privacy_lists_received(self, obj): if obj.conn.name != self.account: return if obj.active_list == self.privacy_list_name: @@ -4166,7 +4166,8 @@ class PrivacyListWindow: self.privacy_list_active_checkbutton.set_sensitive(True) self.privacy_list_default_checkbutton.set_sensitive(True) self.reset_fields() - app.connections[self.account].get_active_default_lists() + 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: @@ -4176,7 +4177,8 @@ class PrivacyListWindow: self.privacy_list_received(obj.rules) def refresh_rules(self): - app.connections[self.account].get_privacy_list(self.privacy_list_name) + 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.list_of_rules_combobox.get_model() @@ -4186,8 +4188,9 @@ class PrivacyListWindow: for rule in self.global_rules: if rule != _rule: tags.append(self.global_rules[rule]) - app.connections[self.account].set_privacy_list( - self.privacy_list_name, tags) + con = app.connections[self.account] + con.get_module('PrivacyLists').set_privacy_list( + self.privacy_list_name, tags) self.privacy_list_received(tags) self.add_edit_vbox.hide() if not tags: # we removed latest rule @@ -4279,18 +4282,20 @@ class PrivacyListWindow: self.edit_send_status_checkbutton.set_sensitive(True) def on_privacy_list_active_checkbutton_toggled(self, widget): + name = None if widget.get_active(): - app.connections[self.account].set_active_list( - self.privacy_list_name) - else: - app.connections[self.account].set_active_list(None) + name = self.privacy_list_name + + con = app.connections[self.account] + con.get_module('PrivacyLists').set_active_list(name) def on_privacy_list_default_checkbutton_toggled(self, widget): + name = None if widget.get_active(): - app.connections[self.account].set_default_list( - self.privacy_list_name) - else: - app.connections[self.account].set_default_list(None) + 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() @@ -4362,8 +4367,9 @@ class PrivacyListWindow: else: tags.append(current_tags) - app.connections[self.account].set_privacy_list( - self.privacy_list_name, tags) + con = app.connections[self.account] + con.get_module('PrivacyLists').set_privacy_list( + self.privacy_list_name, tags) self.refresh_rules() self.add_edit_vbox.hide() if 'privacy_lists' in app.interface.instances[self.account]: @@ -4419,7 +4425,7 @@ class PrivacyListsWindow: app.ged.register_event_handler('privacy-lists-received', ged.GUI1, self._nec_privacy_lists_received) - app.ged.register_event_handler('privacy-lists-removed', ged.GUI1, + app.ged.register_event_handler('privacy-list-removed', ged.GUI1, self._nec_privacy_lists_removed) self.window.show_all() @@ -4435,14 +4441,18 @@ class PrivacyListsWindow: del app.interface.instances[self.account]['privacy_lists'] app.ged.remove_event_handler('privacy-lists-received', ged.GUI1, self._nec_privacy_lists_received) - app.ged.remove_event_handler('privacy-lists-removed', ged.GUI1, + app.ged.remove_event_handler('privacy-list-removed', ged.GUI1, self._nec_privacy_lists_removed) def remove_privacy_list_from_combobox(self, privacy_list): if privacy_list not in self.privacy_lists_save: return - privacy_list_index = self.privacy_lists_save.index(privacy_list) - self.list_of_privacy_lists_combobox.remove_text(privacy_list_index) + + model = self.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): @@ -4477,32 +4487,32 @@ class PrivacyListsWindow: def on_delete_privacy_list_button_clicked(self, widget): active_list = self.privacy_lists_save[ self.list_of_privacy_lists_combobox.get_active()] - app.connections[self.account].del_privacy_list(active_list) + 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({'lists': self.privacy_lists_save}) + 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.lists_list) + self.privacy_list_removed(obj.list_name) def privacy_lists_received(self, lists): - if not lists: - return privacy_lists = [] - for privacy_list in lists['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_list) + self.privacy_lists_received(obj.lists) def privacy_lists_refresh(self): - app.connections[self.account].get_privacy_lists() + con = app.connections[self.account] + con.get_module('PrivacyLists').get_privacy_lists() def on_new_privacy_list_button_clicked(self, widget): name = self.new_privacy_list_entry.get_text() ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2919,46 +2919,15 @@ class GroupchatControl(ChatControlBase): def on_block(self, widget, nick): fjid = self.room_jid + '/' + nick - connection = app.connections[self.account] - default = connection.privacy_default_list - if fjid in connection.blocked_contacts: - return - max_order = connection.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), 'type': 'jid', - 'action': 'deny', 'value' : fjid, 'child': ['message', 'iq', - 'presence-out']} - connection.blocked_list.append(new_rule) - connection.blocked_contacts.append(fjid) + con = app.connections[self.account] + con.get_module('PrivacyLists').block_gc_contact(fjid) self.draw_contact(nick) - connection.set_privacy_list(default, connection.blocked_list) - if len(connection.blocked_list) == 1: - connection.set_default_list(default) def on_unblock(self, widget, nick): fjid = self.room_jid + '/' + nick - connection = app.connections[self.account] - default = connection.privacy_default_list - connection.new_blocked_list = [] - # needed for draw_contact: - if fjid in connection.blocked_contacts: - connection.blocked_contacts.remove(fjid) + con = app.connections[self.account] + con.get_module('PrivacyLists').unblock_gc_contact(fjid) self.draw_contact(nick) - for rule in connection.blocked_list: - if rule['action'] != 'deny' or rule['type'] != 'jid' \ - or rule['value'] != fjid: - connection.new_blocked_list.append(rule) - - if len(connection.new_blocked_list) == 0: - connection.blocked_list = [] - connection.blocked_contacts = [] - connection.blocked_groups = [] - connection.set_default_list('') - connection.del_privacy_list(default) - if 'privay_list_block' in app.interface.instances[self.account]: - del app.interface.instances[self.account]\ - ['privay_list_block'] - else: - connection.set_privacy_list(default, connection.new_blocked_list) def on_voice_checkmenuitem_activate(self, widget, nick): if widget.get_active(): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2812,12 +2812,8 @@ class RosterWindow: on_response_ok = (remove, list_), transient_for=self.window) def _nec_blocking(self, obj): - if obj.unblock_all or obj.blocklist: - jids = app.contacts.get_jid_list(obj.conn.name) - self._idle_draw_jids_of_account(jids, obj.conn.name) - else: - for jid in obj.blocked_jids + obj.unblocked_jids: - self.draw_contact(jid, obj.conn.name) + for jid in obj.changed: + self.draw_contact(jid, obj.conn.name) def on_block(self, widget, list_, group=None): """ @@ -2834,13 +2830,15 @@ class RosterWindow: if group is None: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] - app.connections[acct].block_contacts(l_, msg) + con = app.connections[acct] + con.get_module('PrivacyLists').block_contacts(l_, msg) 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] - app.connections[acct].block_group(group, l_, msg) + 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) @@ -2874,13 +2872,15 @@ class RosterWindow: if group is None: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] - app.connections[acct].unblock_contacts(l_) + 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] - app.connections[acct].unblock_group(group, l_) + 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) @@ -3462,7 +3462,8 @@ class RosterWindow: for account in account_list: if app.SHOW_LIST[app.connections[account].connected] == \ 'invisible': - app.connections[account].set_invisible_rule() + con = app.connections[account] + con.get_module('PrivacyLists').set_invisible_rule() # 3. send directed presence for (contact, account) in contact_list: ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -20,8 +20,6 @@ class MockConnection(Mock, ConnectionHandlers): self.connected = 2 self.pep = {} - self.blocked_contacts = {} - self.blocked_groups = {} self.sessions = {} self.nested_group_delimiter = '::' self.server_resource = 'Gajim' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd79fe629f7fbaaead18694dd52b5bd56d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd79fe629f7fbaaead18694dd52b5bd56d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix method call
by Philipp Hörist 08 Jul '18

08 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3cfd82b0 by Philipp Hörist at 2018-07-08T10:31:05+02:00 Fix method call - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2467,7 +2467,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(iq) i = 0 self.get_module('Bookmarks').bookmarks.pop(jid, None) - self.store_bookmarks() + self.get_module('Bookmarks').store_bookmarks() def send_gc_status(self, nick, jid, show, status, auto=False): if not app.account_is_connected(self.name): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3cfd82b0c2a654cc860a3f6418e567179c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3cfd82b0c2a654cc860a3f6418e567179c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Fix pylint errors in dataforms module
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: af7ac921 by Philipp Hörist at 2018-07-07T19:36:24+02:00 Fix pylint errors in dataforms module - - - - - e918ac85 by Philipp Hörist at 2018-07-07T20:00:09+02:00 Remove streamhost redirect After asking around this is a dead feature. Because servers cannot be sure if clients support redirection, a server using this feature would essentially risk that his users are not able to connect at all. - - - - - 3a6f6670 by Philipp Hörist at 2018-07-07T20:01:47+02:00 Check if we have a nbxmpp Client object In some cases the XMPPDispatcher which handles the callbacks is not yet created. - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/dataforms.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -593,7 +593,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connected_hostname = None # Holds the full jid we received on the bind event self.registered_name = None - self.redirected = None self.last_time_to_reconnect = None self.new_account_info = None self.new_account_form = None @@ -794,12 +793,7 @@ class Connection(CommonConnection, ConnectionHandlers): # show error dialog self._connection_lost() else: - if self.redirected: - self.disconnect(on_purpose=True) - self.connect() - return - else: - self.disconnect() + self.disconnect() self.on_purpose = False # END disconnectedReconnCB @@ -988,25 +982,21 @@ class Connection(CommonConnection, ConnectionHandlers): self.name, 'try_connecting_for_foo_secs') proxy = helpers.get_proxy_info(self.name) use_srv = app.config.get_per('accounts', self.name, 'use_srv') - if self.redirected: - use_custom = True - custom_h = self.redirected['host'] - custom_p = self.redirected['port'] - else: - use_custom = app.config.get_per('accounts', self.name, - 'use_custom_host') - if use_custom: - custom_h = app.config.get_per('accounts', self.name, - 'custom_host') - custom_p = app.config.get_per('accounts', self.name, - 'custom_port') - try: - helpers.idn_to_ascii(custom_h) - except Exception: - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='invalid-custom-hostname', - args=custom_h)) - use_custom = False + + use_custom = app.config.get_per('accounts', self.name, + 'use_custom_host') + if use_custom: + custom_h = app.config.get_per('accounts', self.name, + 'custom_host') + custom_p = app.config.get_per('accounts', self.name, + 'custom_port') + try: + helpers.idn_to_ascii(custom_h) + except Exception: + app.nec.push_incoming_event(InformationEvent( + None, dialog_name='invalid-custom-hostname', + args=custom_h)) + use_custom = False # create connection if it doesn't already exist self.connected = 1 @@ -1018,10 +1008,8 @@ class Connection(CommonConnection, ConnectionHandlers): h = custom_h p = custom_p ssl_p = custom_p - if not self.redirected: - use_srv = False + use_srv = False - self.redirected = None # SRV resolver self._proxy = proxy self._hosts = [ @@ -1148,11 +1136,6 @@ class Connection(CommonConnection, ConnectionHandlers): self._current_host = host - if self.redirected: - self.disconnect(on_purpose=True) - self.connect() - return - self._current_type = self._current_host['type'] port = self._current_host['port'] ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -774,7 +774,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.privacy_default_list = None app.nec.register_incoming_event(StreamConflictReceivedEvent) - app.nec.register_incoming_event(StreamOtherHostReceivedEvent) app.nec.register_incoming_event(MessageReceivedEvent) app.nec.register_incoming_event(ArchivingErrorReceivedEvent) app.nec.register_incoming_event( @@ -799,8 +798,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - app.ged.register_event_handler('stream-other-host-received', ged.CORE, - self._nec_stream_other_host_received) app.ged.register_event_handler('blocking', ged.CORE, self._nec_blocking) @@ -826,8 +823,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ged.POSTGUI, self._nec_unsubscribed_presence_received_end) app.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - app.ged.remove_event_handler('stream-other-host-received', ged.CORE, - self._nec_stream_other_host_received) app.ged.remove_event_handler('blocking', ged.CORE, self._nec_blocking) def add_sha(self, p, send_caps=True): @@ -1383,11 +1378,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): probe = nbxmpp.Presence(jid, 'probe', frm=self.get_own_jid()) self.connection.send(probe) - def _nec_stream_other_host_received(self, obj): - if obj.conn.name != self.name: - return - self.redirected = obj.redirected - def _StreamCB(self, con, obj): log.debug('StreamCB') app.nec.push_incoming_event(StreamReceivedEvent(None, @@ -1456,5 +1446,7 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler(*handler) def _unregister_handlers(self): + if not self.connection: + return for handler in modules.get_handlers(self): self.connection.UnregisterHandler(*handler) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -331,28 +331,6 @@ class StreamConflictReceivedEvent(nec.NetworkIncomingEvent): self.conn = self.base_event.conn return True -class StreamOtherHostReceivedEvent(nec.NetworkIncomingEvent): - name = 'stream-other-host-received' - base_network_events = ['stream-received'] - - def generate(self): - self.conn = self.base_event.conn - self.stanza = self.base_event.stanza - other_host = self.stanza.getTag('see-other-host') - if other_host and self.conn._current_type in ('ssl', 'tls'): - host = other_host.getData() - if ':' in host: - host_l = host.split(':', 1) - h = host_l[0] - p = host_l[1] - else: - h = host - p = 5222 - if h.startswith('[') and h.endswith(']'): - h = h[1:-1] - self.redirected = {'host': h, 'port': p} - return True - class PresenceHelperEvent: def _generate_show(self): self.show = self.stanza.getShow() ===================================== gajim/common/dataforms.py ===================================== --- a/gajim/common/dataforms.py +++ b/gajim/common/dataforms.py @@ -1,46 +1,50 @@ -# this will go to src/common/xmpp later, for now it is in src/common -# -*- coding:utf-8 -*- -## src/common/dataforms.py -## -## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> -## -## 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/>. -## +# Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> +# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> +# +# 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/>. """ -This module contains wrappers for different parts of data forms (JEP 0004). For +This module contains wrappers for different parts of data forms (XEP-0004). For information how to use them, read documentation """ import nbxmpp + from gajim.common import helpers + # exceptions used in this module -# base class -class Error(Exception): pass +class Error(Exception): + pass + + # when we get nbxmpp.Node which we do not understand -class UnknownDataForm(Error): pass +class UnknownDataForm(Error): + pass + + # when we get nbxmpp.Node which contains bad fields -class WrongFieldValue(Error): pass +class WrongFieldValue(Error): + pass + # helper class to change class of already existing object class ExtendedNode(nbxmpp.Node, object): @classmethod - def __new__(cls, *a, **b): + def __new__(cls, *a, **b): if 'extend' not in b.keys() or not b['extend']: return object.__new__(cls) @@ -49,23 +53,25 @@ class ExtendedNode(nbxmpp.Node, object): extend.__class__ = cls return extend + # helper to create fields from scratch def Field(typ, **attrs): ''' Helper function to create a field of given type. ''' f = { - 'boolean': BooleanField, - 'fixed': StringField, - 'hidden': StringField, - 'text-private': StringField, - 'text-single': StringField, - 'jid-multi': JidMultiField, - 'jid-single': JidSingleField, - 'list-multi': ListMultiField, - 'list-single': ListSingleField, - 'text-multi': TextMultiField, + 'boolean': BooleanField, + 'fixed': StringField, + 'hidden': StringField, + 'text-private': StringField, + 'text-single': StringField, + 'jid-multi': JidMultiField, + 'jid-single': JidSingleField, + 'list-multi': ListMultiField, + 'list-single': ListSingleField, + 'text-multi': TextMultiField, }[typ](typ=typ, **attrs) return f + def ExtendField(node): """ Helper function to extend a node to field of appropriate type @@ -73,23 +79,24 @@ def ExtendField(node): # when validation (XEP-122) will go in, we could have another classes # like DateTimeField - so that dicts in Field() and ExtendField() will # be different... - typ=node.getAttr('type') + typ = node.getAttr('type') f = { - 'boolean': BooleanField, - 'fixed': StringField, - 'hidden': StringField, - 'text-private': StringField, - 'text-single': StringField, - 'jid-multi': JidMultiField, - 'jid-single': JidSingleField, - 'list-multi': ListMultiField, - 'list-single': ListSingleField, - 'text-multi': TextMultiField, + 'boolean': BooleanField, + 'fixed': StringField, + 'hidden': StringField, + 'text-private': StringField, + 'text-single': StringField, + 'jid-multi': JidMultiField, + 'jid-single': JidSingleField, + 'list-multi': ListMultiField, + 'list-single': ListSingleField, + 'text-multi': TextMultiField, } if typ not in f: typ = 'text-single' return f[typ](extend=node) + def ExtendForm(node): """ Helper function to extend a node to form of appropriate type @@ -99,6 +106,7 @@ def ExtendForm(node): else: return SimpleDataForm(extend=node) + class DataField(ExtendedNode): """ Keeps data about one field - var, field type, labels, instructions... Base @@ -107,7 +115,7 @@ class DataField(ExtendedNode): """ def __init__(self, typ=None, var=None, value=None, label=None, desc=None, - required=False, options=None, extend=None): + required=False, options=None, extend=None): if extend is None: ExtendedNode.__init__(self, 'field') @@ -118,7 +126,7 @@ class DataField(ExtendedNode): self.value = value if label is not None: self.label = label - if desc is not None: + if desc is not None: self.desc = desc self.required = required self.options = options @@ -162,10 +170,10 @@ class DataField(ExtendedNode): """ Human-readable field name """ - l = self.getAttr('label') - if not l: - l = self.var - return l + label_ = self.getAttr('label') + if not label_: + label_ = self.var + return label_ @label.setter def label(self, value): @@ -236,6 +244,7 @@ class DataField(ExtendedNode): def is_valid(self): return True + class Uri(nbxmpp.Node): def __init__(self, uri_tag): nbxmpp.Node.__init__(self, node=uri_tag) @@ -270,6 +279,7 @@ class Uri(nbxmpp.Node): def uri_data(self): self.setData(None) + class Media(nbxmpp.Node): def __init__(self, media_tag): nbxmpp.Node.__init__(self, node=media_tag) @@ -292,6 +302,7 @@ class Media(nbxmpp.Node): for element in self.getTags('uri'): self.delChild(element) + class BooleanField(DataField): @property def value(self): @@ -304,7 +315,7 @@ class BooleanField(DataField): if v in ('1', 'true'): return True if v is None: - return False # default value is False + return False # default value is False raise WrongFieldValue @value.setter @@ -317,6 +328,7 @@ class BooleanField(DataField): if t is not None: self.delChild(t) + class StringField(DataField): """ Covers fields of types: fixed, hidden, text-private, text-single @@ -341,9 +353,10 @@ class StringField(DataField): def value(self): try: self.delChild(self.getTag('value')) - except ValueError: # if there already were no value tag + except ValueError: # if there already were no value tag pass + class ListField(DataField): """ Covers fields of types: jid-multi, jid-single, list-multi, list-single @@ -359,17 +372,18 @@ class ListField(DataField): v = element.getTagData('value') if v is None: raise WrongFieldValue - l = element.getAttr('label') - if not l: - l = v - options.append((l, v)) + label = element.getAttr('label') + if not label: + label = v + options.append((label, v)) return options @options.setter def options(self, values): del self.options for value, label in values: - self.addChild('option', {'label': label}).setTagData('value', value) + self.addChild('option', + {'label': label}).setTagData('value', value) @options.deleter def options(self): @@ -381,10 +395,11 @@ class ListField(DataField): v = element.getTagData('value') if v is None: raise WrongFieldValue - l = element.getAttr('label') - if not l: - l = v - yield (v, l) + label = element.getAttr('label') + if not label: + label = v + yield (v, label) + class ListSingleField(ListField, StringField): """ @@ -397,6 +412,7 @@ class ListSingleField(ListField, StringField): return False return True + class JidSingleField(ListSingleField): """ Covers jid-single fields @@ -406,12 +422,13 @@ class JidSingleField(ListSingleField): try: helpers.parse_jid(self.value) return True - except: + except Exception: return False if self.required: return False return True + class ListMultiField(ListField): """ Covers list-multi fields @@ -449,6 +466,7 @@ class ListMultiField(ListField): return False return True + class JidMultiField(ListMultiField): """ Covers jid-multi fields @@ -458,13 +476,14 @@ class JidMultiField(ListMultiField): for value in self.values: try: helpers.parse_jid(value) - except: + except Exception: return False return True if self.required: return False return True + class TextMultiField(DataField): @property def value(self): @@ -489,6 +508,7 @@ class TextMultiField(DataField): for element in self.getTags('value'): self.delChild(element) + class DataRecord(ExtendedNode): """ The container for data fields - an xml element which has DataField elements @@ -560,6 +580,7 @@ class DataRecord(ExtendedNode): return False return True + class DataForm(ExtendedNode): def __init__(self, type_=None, title=None, instructions=None, extend=None): if extend is None: @@ -567,11 +588,11 @@ class DataForm(ExtendedNode): nbxmpp.Node.__init__(self, 'x', attrs={'xmlns': nbxmpp.NS_DATA}) if type_ is not None: - self.type_=type_ + self.type_ = type_ if title is not None: - self.title=title + self.title = title if instructions is not None: - self.instructions=instructions + self.instructions = instructions @property def type_(self): @@ -623,7 +644,8 @@ class DataForm(ExtendedNode): @instructions.setter def instructions(self, value): del self.instructions - if value == '': return + if value == '': + return for line in value.split('\n'): self.addChild('instructions').setData(line) @@ -632,11 +654,12 @@ class DataForm(ExtendedNode): for value in self.getTags('instructions'): self.delChild(value) + class SimpleDataForm(DataForm, DataRecord): - def __init__(self, type_=None, title=None, instructions=None, fields=None, \ - extend=None): + def __init__(self, type_=None, title=None, instructions=None, fields=None, + extend=None): DataForm.__init__(self, type_=type_, title=title, - instructions=instructions, extend=extend) + instructions=instructions, extend=extend) DataRecord.__init__(self, fields=fields, extend=self, associated=self) def get_purged(self): @@ -647,12 +670,12 @@ class SimpleDataForm(DataForm, DataRecord): for f in c.iter_fields(): if f.required: # add <value> if there is not - if hasattr(f, 'value') and not f.value: + if hasattr(f, 'value') and not f.value: f.value = '' # Keep all required fields continue - if (hasattr(f, 'value') and not f.value and f.value != 0) or ( - hasattr(f, 'values') and len(f.values) == 0): + if ((hasattr(f, 'value') and not f.value and f.value != 0) or + (hasattr(f, 'values') and len(f.values) == 0)): to_be_removed.append(f) else: del f.label @@ -662,11 +685,12 @@ class SimpleDataForm(DataForm, DataRecord): c.delChild(f) return c + class MultipleDataForm(DataForm): def __init__(self, type_=None, title=None, instructions=None, items=None, - extend=None): + extend=None): DataForm.__init__(self, type_=type_, title=title, - instructions=instructions, extend=extend) + instructions=instructions, extend=extend) # all records, recorded into DataRecords if extend is None: if items is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ff2fab73a15732511ba6d4490b35347e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ff2fab73a15732511ba6d4490b35347e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Parse input sent via XMLConsole
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ff2fab73 by Philipp Hörist at 2018-07-07T19:20:28+02:00 Parse input sent via XMLConsole This allows us to show the user an error if the stanza is invalid. Until now the server would instantly disconnect us. Also this fixes the problem that XMLConsole input was not counted for streammanagement. Fixes #8563 - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3503,7 +3503,14 @@ class XMLConsoleWindow(Gtk.Window): begin_iter, end_iter = buffer_.get_bounds() stanza = buffer_.get_text(begin_iter, end_iter, True) if stanza: - app.connections[self.account].send_stanza(stanza) + try: + node = nbxmpp.Protocol(node=stanza) + if node.getNamespace() == 'http://www.gajim.org/xmlns/undeclared': + node.setNamespace(nbxmpp.NS_CLIENT) + except Exception as error: + ErrorDialog(_('Invalid Node'), str(error)) + return + app.connections[self.account].connection.send(node) buffer_.set_text('') def on_input(self, button, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff2fab73a15732511ba6d4490b35347e7b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff2fab73a15732511ba6d4490b35347e7b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Change nbxmpp event we use for XMLConsole
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e4cf4a0 by Philipp Hörist at 2018-07-07T18:28:43+02:00 Change nbxmpp event we use for XMLConsole - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -510,12 +510,12 @@ class CommonConnection: def _event_dispatcher(self, realm, event, data): if realm == '': - if event == nbxmpp.transports_nb.DATA_RECEIVED: - app.nec.push_incoming_event(StanzaReceivedEvent(None, - conn=self, stanza_str=data)) - elif event == nbxmpp.transports_nb.DATA_SENT: - app.nec.push_incoming_event(StanzaSentEvent(None, conn=self, - stanza_str=data)) + if event == 'STANZA_RECEIVED': + app.nec.push_incoming_event(StanzaReceivedEvent( + None, conn=self, stanza_str=str(data))) + elif event == 'STANZA_SENT': + app.nec.push_incoming_event(StanzaSentEvent( + None, conn=self, stanza_str=str(data))) def change_status(self, show, msg, auto=False): if not msg: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3e4cf4a07d3ba872e2fbaa98cf472649d5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3e4cf4a07d3ba872e2fbaa98cf472649d5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add stanza received/sent event
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d022a925 by Philipp Hörist at 2018-07-07T18:19:36+02:00 Add stanza received/sent event We only had a data received/sent event which was enough for a long time because servers used one tcp packet per stanza. Now servers send multiple stanzas in one tcp packet, data received/sent can contain more than one stanza which makes this new event necessary - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== --- a/nbxmpp/dispatcher_nb.py +++ b/nbxmpp/dispatcher_nb.py @@ -417,6 +417,9 @@ class XMPPDispatcher(PlugIn): #log.info('dispatch called: stanza = %s, session = %s, direct= %s' # % (stanza, session, direct)) + + self.Event('', 'STANZA_RECEIVED', stanza) + if not session: session = self session.Stream._mini_dom = None @@ -571,6 +574,8 @@ class XMPPDispatcher(PlugIn): if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from', self._owner._registered_name) + self.Event('', 'STANZA_SENT', stanza) + self._owner.Connection.send(stanza, now) # If no ID then it is a whitespace View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d022a925797716b1d59d7e5113… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d022a925797716b1d59d7e5113… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Register all available modules automatically
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 59428d2f by Philipp Hörist at 2018-07-07T13:52:44+02:00 Register all available modules automatically - - - - - 24 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - gajim/common/modules/annotations.py - gajim/common/modules/bookmarks.py - gajim/common/modules/entity_time.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/common/modules/last_activity.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/pubsub.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/search.py - gajim/common/modules/software_version.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_avatar.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py - gajim/common/modules/vcard_avatars.py - gajim/common/modules/vcard_temp.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -61,29 +61,9 @@ from gajim.common import gpg from gajim.common import passwords from gajim.common import i18n from gajim.common import idle -from gajim.common.helpers import ModuleMock -from gajim.common.modules.entity_time import EntityTime -from gajim.common.modules.software_version import SoftwareVersion -from gajim.common.modules.ping import Ping -from gajim.common.modules.search import Search -from gajim.common.modules.annotations import Annotations -from gajim.common.modules.roster_item_exchange import RosterItemExchange -from gajim.common.modules.last_activity import LastActivity -from gajim.common.modules.http_auth import HTTPAuth -from gajim.common.modules.vcard_temp import VCardTemp -from gajim.common.modules.vcard_avatars import VCardAvatars -from gajim.common.modules.pubsub import PubSub -from gajim.common.modules.bookmarks import Bookmarks -from gajim.common.modules.pep import PEP -from gajim.common.modules.user_avatar import UserAvatar -from gajim.common.modules.user_activity import UserActivity -from gajim.common.modules.user_tune import UserTune -from gajim.common.modules.user_mood import UserMood -from gajim.common.modules.user_location import UserLocation -from gajim.common.modules.user_nickname import UserNickname -from gajim.common.modules.httpupload import HTTPUpload from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact +from gajim.common import modules from gajim.gtkgui_helpers import get_action @@ -182,19 +162,7 @@ class CommonConnection: app.ged.raise_event(event, self.name, data) def get_module(self, name): - try: - return self._modules[name] - except KeyError: - return ModuleMock() - - def get_module_handlers(self): - handlers = [] - for module in self._modules.values(): - handlers += module.handlers - return handlers - - def register_module(self, name, cls, *args, **kwargs): - self._modules[name] = cls(*args, **kwargs) + return modules.get(self.name, name) def reconnect(self): """ @@ -661,26 +629,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.sm = Smacks(self) # Stream Management - self.register_module('EntityTime', EntityTime, self) - self.register_module('SoftwareVersion', SoftwareVersion, self) - self.register_module('Ping', Ping, self) - self.register_module('Search', Search, self) - self.register_module('Annotations', Annotations, self) - self.register_module('RosterItemExchange', RosterItemExchange, self) - self.register_module('LastActivity', LastActivity, self) - self.register_module('HTTPAuth', HTTPAuth, self) - self.register_module('VCardTemp', VCardTemp, self) - self.register_module('VCardAvatars', VCardAvatars, self) - self.register_module('PubSub', PubSub, self) - self.register_module('PEP', PEP, self) - self.register_module('Bookmarks', Bookmarks, self) - self.register_module('UserAvatar', UserAvatar, self) - self.register_module('UserActivity', UserActivity, self) - self.register_module('UserTune', UserTune, self) - self.register_module('UserMood', UserMood, self) - self.register_module('UserLocation', UserLocation, self) - self.register_module('UserNickname', UserNickname, self) - self.register_module('HTTPUpload', HTTPUpload, self) + # Register all modules + modules.register(self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) @@ -700,6 +650,8 @@ class Connection(CommonConnection, ConnectionHandlers): def cleanup(self): ConnectionHandlers.cleanup(self) + modules.unregister(self) + app.ged.remove_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) app.ged.remove_event_handler('agent-info-error-received', ged.CORE, @@ -780,6 +732,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.terminate_sessions() self.remove_all_transfers() self.connection.disconnect() + ConnectionHandlers._unregister_handlers(self) self.connection = None def set_oldst(self): # Set old state ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -37,6 +37,7 @@ from gi.repository import GLib import nbxmpp from gajim.common import caps_cache as capscache +from gajim.common import modules from gajim.common import helpers from gajim.common import app from gajim.common import jingle_xtls @@ -1451,5 +1452,9 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler('iq', self._BlockingResultCB, 'result', nbxmpp.NS_BLOCKING) - for handler in self.get_module_handlers(): + for handler in modules.get_handlers(self): con.RegisterHandler(*handler) + + def _unregister_handlers(self): + for handler in modules.get_handlers(self): + self.connection.UnregisterHandler(*handler) ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -165,13 +165,6 @@ class InvalidFormat(Exception): pass -class ModuleMock: - def __getattr__(self, key): - def _mock(self, *args, **kwargs): - return - return _mock - - def decompose_jid(jidstring): user = None server = None ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -0,0 +1,65 @@ +# 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/>. + +import logging +from importlib import import_module +from pathlib import Path + +log = logging.getLogger('gajim.c.m') + +imported_modules = [] +_modules = {} + +for file in Path(__file__).parent.iterdir(): + if file.stem == '__init__': + continue + + module = import_module('.%s' % file.stem, package='gajim.common.modules') + if hasattr(module, 'get_instance'): + log.info('Load module: %s', file.stem) + imported_modules.append(module) + + +class ModuleMock: + def __getattr__(self, key): + def _mock(self, *args, **kwargs): + return + return _mock + + +def register(con, *args, **kwargs): + if con in _modules: + return + _modules[con.name] = {} + for module in imported_modules: + instance, name = module.get_instance(con, *args, **kwargs) + _modules[con.name][name] = instance + + +def unregister(con): + del _modules[con.name] + + +def get(account, name): + try: + return _modules[account][name] + except KeyError: + return ModuleMock() + + +def get_handlers(con): + handlers = [] + for module in _modules[con.name].values(): + handlers += module.handlers + return handlers ===================================== gajim/common/modules/annotations.py ===================================== --- a/gajim/common/modules/annotations.py +++ b/gajim/common/modules/annotations.py @@ -90,3 +90,7 @@ class Annotations: log.warning('Storing rosternotes failed: %s', stanza.getError()) return log.info('Storing rosternotes successful') + + +def get_instance(*args, **kwargs): + return Annotations(*args, **kwargs), 'Annotations' ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -292,3 +292,7 @@ class Bookmarks: class BookmarksReceivedEvent(NetworkIncomingEvent): name = 'bookmarks-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return Bookmarks(*args, **kwargs), 'Bookmarks' ===================================== gajim/common/modules/entity_time.py ===================================== --- a/gajim/common/modules/entity_time.py +++ b/gajim/common/modules/entity_time.py @@ -162,3 +162,7 @@ class contact_tz(datetime.tzinfo): def dst(self, dt): return ZERO + + +def get_instance(*args, **kwargs): + return EntityTime(*args, **kwargs), 'EntityTime' ===================================== gajim/common/modules/http_auth.py ===================================== --- a/gajim/common/modules/http_auth.py +++ b/gajim/common/modules/http_auth.py @@ -75,3 +75,7 @@ class HTTPAuth: class HttpAuthReceivedEvent(NetworkIncomingEvent): name = 'http-auth-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return HTTPAuth(*args, **kwargs), 'HTTPAuth' ===================================== gajim/common/modules/httpupload.py ===================================== --- a/gajim/common/modules/httpupload.py +++ b/gajim/common/modules/httpupload.py @@ -436,3 +436,7 @@ class UploadAbortedException(Exception): class HTTPUploadProgressEvent(NetworkIncomingEvent): name = 'httpupload-progress' base_network_events = [] + + +def get_instance(*args, **kwargs): + return HTTPUpload(*args, **kwargs), 'HTTPUpload' ===================================== gajim/common/modules/last_activity.py ===================================== --- a/gajim/common/modules/last_activity.py +++ b/gajim/common/modules/last_activity.py @@ -50,3 +50,7 @@ class LastActivity: self._con.connection.send(iq) raise nbxmpp.NodeProcessed + + +def get_instance(*args, **kwargs): + return LastActivity(*args, **kwargs), 'LastActivity' ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -212,3 +212,7 @@ class AbstractPEPData: class PEPReceivedEvent(NetworkIncomingEvent): name = 'pep-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return PEP(*args, **kwargs), 'PEP' ===================================== gajim/common/modules/ping.py ===================================== --- a/gajim/common/modules/ping.py +++ b/gajim/common/modules/ping.py @@ -120,3 +120,7 @@ class PingReplyEvent(NetworkIncomingEvent): class PingErrorEvent(NetworkIncomingEvent): name = 'ping-error' base_network_events = [] + + +def get_instance(*args, **kwargs): + return Ping(*args, **kwargs), 'Ping' ===================================== gajim/common/modules/pubsub.py ===================================== --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -254,3 +254,7 @@ class PubSub: class PubSubConfigReceivedEvent(NetworkIncomingEvent): name = 'pubsub-config-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return PubSub(*args, **kwargs), 'PubSub' ===================================== gajim/common/modules/roster_item_exchange.py ===================================== --- a/gajim/common/modules/roster_item_exchange.py +++ b/gajim/common/modules/roster_item_exchange.py @@ -121,3 +121,7 @@ class RosterItemExchange: class RosterItemExchangeEvent(NetworkIncomingEvent): name = 'roster-item-exchange-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return RosterItemExchange(*args, **kwargs), 'RosterItemExchange' ===================================== gajim/common/modules/search.py ===================================== --- a/gajim/common/modules/search.py +++ b/gajim/common/modules/search.py @@ -112,3 +112,7 @@ class SearchFormReceivedEvent(NetworkIncomingEvent): class SearchResultReceivedEvent(NetworkIncomingEvent): name = 'search-result-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return Search(*args, **kwargs), 'Search' ===================================== gajim/common/modules/software_version.py ===================================== --- a/gajim/common/modules/software_version.py +++ b/gajim/common/modules/software_version.py @@ -104,3 +104,7 @@ class VersionResultReceivedEvent(NetworkIncomingEvent): def generate(self): return True + + +def get_instance(*args, **kwargs): + return SoftwareVersion(*args, **kwargs), 'SoftwareVersion' ===================================== gajim/common/modules/user_activity.py ===================================== --- a/gajim/common/modules/user_activity.py +++ b/gajim/common/modules/user_activity.py @@ -99,3 +99,7 @@ class UserActivity(AbstractPEPModule): i = item.addChild('text') i.addData(message) return item + + +def get_instance(*args, **kwargs): + return UserActivity(*args, **kwargs), 'UserActivity' ===================================== gajim/common/modules/user_avatar.py ===================================== --- a/gajim/common/modules/user_avatar.py +++ b/gajim/common/modules/user_avatar.py @@ -152,3 +152,7 @@ class UserAvatar(AbstractPEPModule): def retract(self): # Not implemented yet return + + +def get_instance(*args, **kwargs): + return UserAvatar(*args, **kwargs), 'UserAvatar' ===================================== gajim/common/modules/user_location.py ===================================== --- a/gajim/common/modules/user_location.py +++ b/gajim/common/modules/user_location.py @@ -83,3 +83,7 @@ class UserLocation(AbstractPEPModule): if data.get(field, False): item.addChild(field, payload=data[field]) return item + + +def get_instance(*args, **kwargs): + return UserLocation(*args, **kwargs), 'UserLocation' ===================================== gajim/common/modules/user_mood.py ===================================== --- a/gajim/common/modules/user_mood.py +++ b/gajim/common/modules/user_mood.py @@ -86,3 +86,7 @@ class UserMood(AbstractPEPModule): if text: item.addChild('text', payload=text) return item + + +def get_instance(*args, **kwargs): + return UserMood(*args, **kwargs), 'UserMood' ===================================== gajim/common/modules/user_nickname.py ===================================== --- a/gajim/common/modules/user_nickname.py +++ b/gajim/common/modules/user_nickname.py @@ -76,3 +76,7 @@ class UserNickname(AbstractPEPModule): else: app.nicks[self._account] = app.config.get_per( 'accounts', self._account, 'name') + + +def get_instance(*args, **kwargs): + return UserNickname(*args, **kwargs), 'UserNickname' ===================================== gajim/common/modules/user_tune.py ===================================== --- a/gajim/common/modules/user_tune.py +++ b/gajim/common/modules/user_tune.py @@ -96,3 +96,7 @@ class UserTune(AbstractPEPModule): if length: item.addChild('length', payload=length) return item + + +def get_instance(*args, **kwargs): + return UserTune(*args, **kwargs), 'UserTune' ===================================== gajim/common/modules/vcard_avatars.py ===================================== --- a/gajim/common/modules/vcard_avatars.py +++ b/gajim/common/modules/vcard_avatars.py @@ -190,3 +190,7 @@ class VCardAvatars: node.getTo() or own_jid, sha or 'no sha advertised') update.setTagData('photo', sha) return node + + +def get_instance(*args, **kwargs): + return VCardAvatars(*args, **kwargs), 'VCardAvatars' ===================================== gajim/common/modules/vcard_temp.py ===================================== --- a/gajim/common/modules/vcard_temp.py +++ b/gajim/common/modules/vcard_temp.py @@ -306,3 +306,7 @@ class VcardNotPublishedEvent(NetworkIncomingEvent): class VcardReceivedEvent(NetworkIncomingEvent): name = 'vcard-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return VCardTemp(*args, **kwargs), 'VCardTemp' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59428d2f2fd3fad2614cd82fe41e94c8c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59428d2f2fd3fad2614cd82fe41e94c8c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Move httpupload into modules
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4bcdbde2 by Philipp Hörist at 2018-07-07T01:49:50+02:00 Move httpupload into modules - - - - - 09aead3e by Philipp Hörist at 2018-07-07T01:49:50+02:00 Remove unused imports - - - - - 3a3b3224 by Philipp Hörist at 2018-07-07T01:49:50+02:00 Fix requesting pubsub node config Regression from refactoring - - - - - 11 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/httpupload.py → gajim/common/modules/httpupload.py - gajim/common/modules/pubsub.py - gajim/config.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/server_info.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -274,6 +274,7 @@ class ChatControl(ChatControlBase): def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) + con = app.connections[self.account] # Add to roster if not isinstance(self.contact, GC_Contact) \ @@ -297,7 +298,7 @@ class ChatControl(ChatControlBase): httpupload = win.lookup_action( 'send-file-httpupload-' + self.control_id) httpupload.set_enabled( - online and app.connections[self.account].httpupload) + online and con.get_module('HTTPUpload').available) # Send file (Jingle) jingle_conditions = ( ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -759,19 +759,19 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # groupchat only supports httpupload on drag and drop if httpupload.get_enabled(): # use httpupload - con.check_file_before_transfer( + con.get_module('HTTPUpload').check_file_before_transfer( path, self.encryption, contact, self.session, groupchat=True) else: if httpupload.get_enabled() and jingle.get_enabled(): if ft_pref == 'httpupload': - con.check_file_before_transfer( + con.get_module('HTTPUpload').check_file_before_transfer( path, self.encryption, contact, self.session) else: ft = app.interface.instances['file_transfers'] ft.send_file(self.account, contact, path) elif httpupload.get_enabled(): - con.check_file_before_transfer( + con.get_module('HTTPUpload').check_file_before_transfer( path, self.encryption, contact, self.session) elif jingle.get_enabled(): ft = app.interface.instances['file_transfers'] ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -32,14 +32,12 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os import sys import random import socket import operator import string import time -import locale import hmac import hashlib import json @@ -83,6 +81,7 @@ from gajim.common.modules.user_tune import UserTune from gajim.common.modules.user_mood import UserMood from gajim.common.modules.user_location import UserLocation from gajim.common.modules.user_nickname import UserNickname +from gajim.common.modules.httpupload import HTTPUpload from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -681,6 +680,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_module('UserMood', UserMood, self) self.register_module('UserLocation', UserLocation, self) self.register_module('UserNickname', UserNickname, self) + self.register_module('HTTPUpload', HTTPUpload, self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -28,14 +28,9 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os -import base64 -import binascii import operator -import hashlib -from time import (altzone, daylight, gmtime, localtime, strftime, - time as time_time, timezone, tzname) +from time import time as time_time from gi.repository import GLib @@ -44,20 +39,16 @@ from gajim.common import caps_cache as capscache from gajim.common import helpers from gajim.common import app -from gajim.common import dataforms from gajim.common import jingle_xtls -from gajim.common import configpaths from gajim.common.caps_cache import muc_caps_cache from gajim.common.commands import ConnectionCommands from gajim.common.protocol.caps import ConnectionCaps from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream from gajim.common.protocol.bytestream import ConnectionIBBytestream from gajim.common.message_archiving import ConnectionArchive313 -from gajim.common.httpupload import ConnectionHTTPUpload from gajim.common.connection_handlers_events import * from gajim.common import ged -from gajim.common import nec from gajim.common.nec import NetworkEvent from gajim.common.const import KindConstant @@ -72,7 +63,6 @@ METACONTACTS_ARRIVED = 'metacontacts_arrived' ROSTER_ARRIVED = 'roster_arrived' DELIMITER_ARRIVED = 'delimiter_arrived' PRIVACY_ARRIVED = 'privacy_arrived' -PEP_CONFIG = 'pep_config' class ConnectionDisco: @@ -754,14 +744,12 @@ class ConnectionHandlersBase: class ConnectionHandlers(ConnectionArchive313, ConnectionSocks5Bytestream, ConnectionDisco, ConnectionCommands, ConnectionCaps, -ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream, -ConnectionHTTPUpload): +ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def __init__(self): ConnectionArchive313.__init__(self) ConnectionSocks5Bytestream.__init__(self) ConnectionIBBytestream.__init__(self) ConnectionCommands.__init__(self) - ConnectionHTTPUpload.__init__(self) # Handle presences BEFORE caps app.nec.register_incoming_event(PresenceReceivedEvent) @@ -819,7 +807,6 @@ ConnectionHTTPUpload): ConnectionHandlersBase.cleanup(self) ConnectionCaps.cleanup(self) ConnectionArchive313.cleanup(self) - ConnectionHTTPUpload.cleanup(self) app.ged.remove_event_handler('roster-set-received', ged.CORE, self._nec_roster_set_received) app.ged.remove_event_handler('roster-received', ged.CORE, @@ -944,21 +931,6 @@ ConnectionHTTPUpload): # connection process, we don't take the risk self.privacy_rules_supported = False self._continue_connection_request_privacy() - elif self.awaiting_answers[id_][0] == PEP_CONFIG: - del self.awaiting_answers[id_] - if iq_obj.getType() == 'error': - return - if not iq_obj.getTag('pubsub'): - return - conf = iq_obj.getTag('pubsub').getTag('configure') - if not conf: - return - node = conf.getAttr('node') - form_tag = conf.getTag('x', namespace=nbxmpp.NS_DATA) - if form_tag: - form = dataforms.ExtendForm(node=form_tag) - app.nec.push_incoming_event(PEPConfigReceivedEvent(None, - conn=self, node=node, form=form)) def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1822,10 +1822,6 @@ class UpdateRoomAvatarEvent(nec.NetworkIncomingEvent): def generate(self): return True -class PEPConfigReceivedEvent(nec.NetworkIncomingEvent): - name = 'pep-config-received' - base_network_events = [] - class MetacontactsReceivedEvent(nec.NetworkIncomingEvent): name = 'metacontacts-received' base_network_events = [] @@ -2545,17 +2541,3 @@ class BlockingEvent(nec.NetworkIncomingEvent): app.log('blocking').info( 'Blocking Push - unblocked JIDs: %s', self.unblocked_jids) return True - -class HTTPUploadStartEvent(nec.NetworkIncomingEvent): - name = 'httpupload-start' - base_network_events = [] - - def generate(self): - return True - -class HTTPUploadProgressEvent(nec.NetworkIncomingEvent): - name = 'httpupload-progress' - base_network_events = [] - - def generate(self): - return True \ No newline at end of file ===================================== gajim/common/httpupload.py → gajim/common/modules/httpupload.py ===================================== --- a/gajim/common/httpupload.py +++ b/gajim/common/modules/httpupload.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # This file is part of Gajim. # # Gajim is free software; you can redistribute it and/or modify @@ -14,13 +12,16 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +# XEP-0363: HTTP File Upload + + import os import sys import threading import ssl import urllib from urllib.request import Request, urlopen -from urllib.parse import urlparse, quote +from urllib.parse import urlparse import io import mimetypes import logging @@ -31,26 +32,28 @@ from gi.repository import GLib from gajim.common import app from gajim.common import ged +from gajim.common.nec import NetworkIncomingEvent from gajim.common.connection_handlers_events import InformationEvent -from gajim.common.connection_handlers_events import HTTPUploadProgressEvent from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.connection_handlers_events import GcMessageOutgoingEvent if sys.platform in ('win32', 'darwin'): import certifi -log = logging.getLogger('gajim.c.httpupload') +log = logging.getLogger('gajim.c.m.httpupload') + NS_HTTPUPLOAD_0 = NS_HTTPUPLOAD + ':0' -class ConnectionHTTPUpload: - """ - Implement HTTP File Upload - (XEP-0363, https://xmpp.org/extensions/xep-0363.html) - """ - def __init__(self): - self.httpupload = False - self.encrypted_upload = False + +class HTTPUpload: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [] + + self.available = False self.component = None self.httpupload_namespace = None self._allowed_headers = ['Authorization', 'Cookie', 'Expires'] @@ -81,7 +84,7 @@ class ConnectionHTTPUpload: def handle_agent_info_received(self, event): account = event.conn.name - if account != self.name: + if account != self._account: return if not app.jid_is_transport(event.jid): @@ -112,14 +115,14 @@ class ConnectionHTTPUpload: log.warning('%s does not provide maximum file size', account) else: log.info('%s has a maximum file size of: %s MiB', - account, self.max_file_size/(1024*1024)) + account, self.max_file_size / (1024 * 1024)) - self.httpupload = True - for ctrl in app.interface.msg_win_mgr.get_controls(acct=self.name): + self.available = True + for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): ctrl.update_actions() def handle_outgoing_stanza(self, event): - if event.conn.name != self.name: + if event.conn.name != self._account: return message = event.msg_iq.getTagData('body') if message and message in self.messages: @@ -177,9 +180,9 @@ class ConnectionHTTPUpload: return if encryption is not None: - app.interface.encrypt_file(file, self.request_slot) + app.interface.encrypt_file(file, self._request_slot) else: - self.request_slot(file) + self._request_slot(file) @staticmethod def raise_progress_event(status, file, seen=None, total=None): @@ -191,13 +194,13 @@ class ConnectionHTTPUpload: app.nec.push_incoming_event(InformationEvent( None, dialog_name=dialog_name, args=args)) - def request_slot(self, file): + def _request_slot(self, file): GLib.idle_add(self.raise_progress_event, 'request', file) iq = self._build_request(file) log.info("Sending request for slot") - app.connections[self.name].connection.SendAndCallForResponse( - iq, self.received_slot, {'file': file}) - + self._con.connection.SendAndCallForResponse( + iq, self._received_slot, {'file': file}) + def _build_request(self, file): iq = nbxmpp.Iq(typ='get', to=self.component) id_ = app.get_an_id() @@ -230,7 +233,7 @@ class ConnectionHTTPUpload: return stanza.getErrorMsg() - def received_slot(self, conn, stanza, file): + def _received_slot(self, conn, stanza, file): log.info("Received slot") if stanza.getType() == 'error': self.raise_progress_event('close', file) @@ -279,11 +282,11 @@ class ConnectionHTTPUpload: log.info('Uploading file to %s', file.put) log.info('Please download from %s', file.get) - thread = threading.Thread(target=self.upload_file, args=(file,)) + thread = threading.Thread(target=self._upload_file, args=(file,)) thread.daemon = True thread.start() - def upload_file(self, file): + def _upload_file(self, file): GLib.idle_add(self.raise_progress_event, 'upload', file) try: file.headers['User-Agent'] = 'Gajim %s' % app.version @@ -294,7 +297,7 @@ class ConnectionHTTPUpload: file.put, data=file.stream, headers=file.headers, method='PUT') log.info("Opening Urllib upload request...") - if not app.config.get_per('accounts', self.name, 'httpupload_verify'): + if not app.config.get_per('accounts', self._account, 'httpupload_verify'): context = ssl.create_default_context() context.check_hostname = False context.verify_mode = ssl.CERT_NONE @@ -309,7 +312,7 @@ class ConnectionHTTPUpload: file.stream.close() log.info('Urllib upload request done, response code: %s', transfer.getcode()) - GLib.idle_add(self.upload_complete, transfer.getcode(), file) + GLib.idle_add(self._upload_complete, transfer.getcode(), file) return except UploadAbortedException as exc: log.info(exc) @@ -326,9 +329,9 @@ class ConnectionHTTPUpload: log.exception("Exception during upload") error_msg = exc GLib.idle_add(self.raise_progress_event, 'close', file) - GLib.idle_add(self.on_upload_error, file, error_msg) + GLib.idle_add(self._on_upload_error, file, error_msg) - def upload_complete(self, response_code, file): + def _upload_complete(self, response_code, file): self.raise_progress_event('close', file) if 200 <= response_code < 300: log.info("Upload completed successfully") @@ -341,12 +344,12 @@ class ConnectionHTTPUpload: if file.groupchat: app.nec.push_outgoing_event(GcMessageOutgoingEvent( - None, account=self.name, jid=file.contact.jid, + None, account=self._account, jid=file.contact.jid, message=message, automatic_message=False, session=file.session)) else: app.nec.push_outgoing_event(MessageOutgoingEvent( - None, account=self.name, jid=file.contact.jid, + None, account=self._account, jid=file.contact.jid, message=message, keyID=file.keyID, type_='chat', automatic_message=False, session=file.session)) @@ -356,7 +359,7 @@ class ConnectionHTTPUpload: self.raise_information_event('httpupload-response-error', response_code) - def on_upload_error(self, file, reason): + def _on_upload_error(self, file, reason): self.raise_progress_event('close', file) self.raise_information_event('httpupload-error', str(reason)) @@ -428,3 +431,8 @@ class StreamFileWithProgress: class UploadAbortedException(Exception): def __str__(self): return "Upload Aborted" + + +class HTTPUploadProgressEvent(NetworkIncomingEvent): + name = 'httpupload-progress' + base_network_events = [] ===================================== gajim/common/modules/pubsub.py ===================================== --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -25,6 +25,8 @@ import logging import nbxmpp from gajim.common import app +from gajim.common import dataforms +from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.pubsub') @@ -185,7 +187,7 @@ class PubSub: self._con.connection.SendAndCallForResponse(query, cb) - def send_pb_configure(self, jid, node, form, cb=None): + def send_pb_configure(self, jid, node, form, cb=None, **kwargs): if not app.account_is_connected(self._account): return @@ -197,21 +199,58 @@ class PubSub: c = c.addChild('configure', {'node': node}) c.addChild(node=form) - self._con.connection.SendAndCallForResponse(query, cb) + log.info('Send node config for %s', node) + self._con.connection.SendAndCallForResponse(query, cb, kwargs) - def request_pb_configuration(self, jid, node, cb=None): + def request_pb_configuration(self, jid, node): if not app.account_is_connected(self._account): return - if cb is None: - cb = self._default_callback - query = nbxmpp.Iq('get', to=jid) e = query.addChild('pubsub', namespace=nbxmpp.NS_PUBSUB_OWNER) e = e.addChild('configure', {'node': node}) - self._con.connection.SendAndCallForResponse(query, cb) + log.info('Request node config for %s', node) + self._con.connection.SendAndCallForResponse( + query, self._received_pb_configuration, {'node': node}) + + def _received_pb_configuration(self, conn, stanza, node): + if not nbxmpp.isResultNode(stanza): + log.warning('Error: %s', stanza.getError()) + return + + pubsub = stanza.getTag('pubsub', namespace=nbxmpp.NS_PUBSUB_OWNER) + if pubsub is None: + log.warning('Malformed PubSub configure ' + 'stanza (no pubsub node): %s', stanza) + return + + configure = pubsub.getTag('configure') + if configure is None: + log.warning('Malformed PubSub configure ' + 'stanza (no configure node): %s', stanza) + return + + if configure.getAttr('node') != node: + log.warning('Malformed PubSub configure ' + 'stanza (wrong node): %s', stanza) + return + + form = configure.getTag('x', namespace=nbxmpp.NS_DATA) + if form is None: + log.warning('Malformed PubSub configure ' + 'stanza (no form): %s', stanza) + return + + app.nec.push_incoming_event(PubSubConfigReceivedEvent( + None, conn=self._con, node=node, + form=dataforms.ExtendForm(node=form))) def _default_callback(self, conn, stanza, *args, **kwargs): if not nbxmpp.isResultNode(stanza): log.warning('Error: %s', stanza.getError()) + + +class PubSubConfigReceivedEvent(NetworkIncomingEvent): + name = 'pubsub-config-received' + base_network_events = [] ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2839,7 +2839,7 @@ class ManagePEPServicesWindow: self.xml.get_object('services_treeview').get_selection().connect( 'changed', self.on_services_selection_changed) - app.ged.register_event_handler('pep-config-received', ged.GUI1, + app.ged.register_event_handler('pubsub-config-received', ged.GUI1, self._nec_pep_config_received) app.ged.register_event_handler('agent-items-received', ged.GUI1, self._nec_agent_items_received) @@ -2849,7 +2849,7 @@ class ManagePEPServicesWindow: def on_manage_pep_services_window_destroy(self, widget): '''close window''' del app.interface.instances[self.account]['pep_services'] - app.ged.remove_event_handler('pep-config-received', ged.GUI1, + app.ged.remove_event_handler('pubsub-config-received', ged.GUI1, self._nec_pep_config_received) app.ged.remove_event_handler('agent-items-received', ged.GUI1, self._nec_agent_items_received) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -574,6 +574,7 @@ class GroupchatControl(ChatControlBase): contact = app.contacts.get_gc_contact( self.account, self.room_jid, self.nick) online = app.gc_connected[self.account][self.room_jid] + con = app.connections[self.account] # Destroy Room win.lookup_action('destroy-' + self.control_id).set_enabled( @@ -615,7 +616,7 @@ class GroupchatControl(ChatControlBase): httpupload = win.lookup_action( 'send-file-httpupload-' + self.control_id) httpupload.set_enabled( - online and app.connections[self.account].httpupload) + online and con.get_module('HTTPUpload').available) win.lookup_action('send-file-' + self.control_id).set_enabled( httpupload.get_enabled()) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -93,8 +93,9 @@ from gajim.common import passwords from gajim.common import logging_helpers from gajim.common.connection_handlers_events import ( OurShowEvent, FileRequestErrorEvent, FileTransferCompletedEvent, - UpdateRosterAvatarEvent, UpdateGCAvatarEvent, UpdateRoomAvatarEvent, - HTTPUploadProgressEvent) + UpdateRosterAvatarEvent, UpdateGCAvatarEvent, UpdateRoomAvatarEvent) + +from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection from gajim.common.file_props import FilesProp from gajim import emoticons @@ -1142,11 +1143,12 @@ class Interface: con = app.connections[chat_control.account] groupchat = chat_control.type_id == message_control.TYPE_GC for path in paths: - con.check_file_before_transfer(path, - chat_control.encryption, - chat_control.contact, - chat_control.session, - groupchat) + con.get_module('HTTPUpload').check_file_before_transfer( + path, + chat_control.encryption, + chat_control.contact, + chat_control.session, + groupchat) def encrypt_file(self, file, callback): app.nec.push_incoming_event(HTTPUploadProgressEvent( ===================================== gajim/server_info.py ===================================== --- a/gajim/server_info.py +++ b/gajim/server_info.py @@ -177,7 +177,8 @@ class ServerInfoDialog(Gtk.Dialog): con.archiving_namespace, con.archiving_namespace, mam_enabled), Feature('XEP-0363: HTTP File Upload', - con.httpupload, con.httpupload_namespace, None)] + con.get_module('HTTPUpload').available, + con.get_module('HTTPUpload').httpupload_namespace, None)] def add_info(self, info): self.info_listbox.add(ServerInfoItem(info)) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0eeb111a02d23fd3dfc39f7e40620fb76… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0eeb111a02d23fd3dfc39f7e40620fb76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework Add Contact Dialog
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0eeb111a by Sophie Herold at 2018-07-07T00:46:23+02:00 Rework Add Contact Dialog - - - - - 3 changed files: - gajim/app_actions.py - gajim/data/gui/add_new_contact_window.ui - gajim/dialogs.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -134,7 +134,11 @@ def on_join_gc(action, param): def on_add_contact(action, param): - dialogs.AddNewContactWindow(param.get_string()) + window = app.get_app_window(dialogs.AddNewContactWindow) + if window is None: + dialogs.AddNewContactWindow(param.get_string()) + else: + window.present() def on_single_message(action, param): ===================================== gajim/data/gui/add_new_contact_window.ui ===================================== --- a/gajim/data/gui/add_new_contact_window.ui +++ b/gajim/data/gui/add_new_contact_window.ui @@ -1,132 +1,234 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="account_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkListStore" id="groups_liststore"> <columns>  <column type="gchararray"/> </columns> </object> - <object class="GtkListStore" id="liststore2"> + <object class="GtkTextBuffer" id="message_textbuffer"> + <property name="text" translatable="yes">I would like to add you to my contact list.</property> + <signal name="end-user-action" handler="on_message_textbuffer_changed" swapped="no"/> + </object> + <object class="GtkListStore" id="protocol"> <columns> -  +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  <column type="gchararray"/> </columns> </object> - <object class="GtkListStore" id="liststore3"> + <object class="GtkListStore" id="protocol_jid"> <columns>  <column type="gchararray"/> </columns> </object> - <object class="GtkTextBuffer" id="textbuffer1"> - <property name="text" translatable="yes">I would like to add you to my contact list.</property> - </object> - <object class="GtkWindow" id="add_new_contact_window"> + <object class="GtkBox" id="add_contact_box"> + <property name="width_request">400</property> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="title" translatable="yes">Add New Contact</property> - <property name="resizable">False</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_add_new_contact_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_add_new_contact_window_key_press_event" swapped="no"/> + <property name="margin_left">18</property> + <property name="margin_right">18</property> + <property name="margin_bottom">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="baseline_position">top</property> <child> - <object class="GtkBox" id="vbox8"> + <object class="GtkLabel" id="prompt_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="halign">center</property> + <property name="margin_top">18</property> + <property name="use_markup">True</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="prompt_label"> + <object class="GtkLabel" id="uid_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_markup">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Jabber ID</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="nickname_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Nickname</property> + <property name="use_underline">True</property> + <property name="xalign">0.03999999910593033</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="group_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Group</property> + <property name="use_underline">True</property> <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="uid_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">user(a)example.org</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="nickname_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkBox" id="account_hbox"> + <object class="GtkComboBoxText" id="group_comboboxentry"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="account_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">A_ccount:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">Choose or type new group name</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="account_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore3</property> - <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext3"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkBox" id="protocol_hbox"> + <object class="GtkLabel" id="account_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="protocol_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Protocol:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="halign">end</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes">A_ccount</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="protocol_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Protocol</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> <child> <object class="GtkComboBox" id="protocol_combobox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="model">protocol</property> <signal name="changed" handler="on_protocol_combobox_changed" swapped="no"/> + <child> + <object class="GtkCellRendererPixbuf"/> + <attributes> + <attribute name="icon-name">1</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererText"> + <property name="xpad">5</property> + </object> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -134,7 +236,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="model">liststore2</property> + <property name="model">protocol_jid</property> <signal name="changed" handler="on_protocol_jid_combobox_changed" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> @@ -146,285 +248,224 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkGrid" id="subscription_table"> + <object class="GtkComboBox" id="account_combobox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="uid_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_User ID:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label188"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Nickname:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label223"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Group:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="margin_bottom">12</property> + <property name="model">account_liststore</property> + <property name="entry_text_column">1</property> + <property name="id_column">0</property> + <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> <child> - <object class="GtkEntry" id="uid_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="placeholder_text" translatable="yes">Type User ID</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nickname_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="placeholder_text" translatable="yes">Type Nickname</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="group_comboboxentry"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> - <property name="placeholder_text" translatable="yes">Choose a group of type a new group</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="auto_authorize_checkbutton"> - <property name="label" translatable="yes">A_llow this contact to view my status</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">18</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="auto_authorize_checkbutton"> + <property name="label" translatable="yes">A_llow contact to view my status</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="message_scrolledwindow"> + <property name="height_request">60</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="margin_top">18</property> + <property name="shadow_type">etched-in</property> + <property name="min_content_height">5</property> <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="height_request">60</property> + <object class="GtkTextView" id="message_textview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="border_width">6</property> - <property name="shadow_type">etched-in</property> - <property name="min_content_height">5</property> - <child> - <object class="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word</property> - <property name="buffer">textbuffer1</property> - </object> - </child> + <property name="wrap_mode">word</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> + <property name="buffer">message_textbuffer</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkRevealer" id="save_message_revealer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="transition_type">crossfade</property> <child> <object class="GtkCheckButton" id="save_message_checkbutton"> <property name="label" translatable="yes">_Save subscription message</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkBox" id="register_hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="register_hbox"> + <object class="GtkLabel" id="label224"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label224"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">You have to register with this transport + <property name="label" translatable="yes">You have to register with this transport to be able to add a contact from this protocol. Click on Register button to proceed.</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="register_button"> - <property name="label" translatable="yes">_Register</property> - <property name="use_action_appearance">False</property> - <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="halign">center</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_register_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="connected_label"> + <object class="GtkButton" id="register_button"> + <property name="label" translatable="yes">_Register</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">You must be connected to the transport to be able + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_register_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">18</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="connected_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">You must be connected to the transport to be able to add a contact from this protocol.</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">18</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <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="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">8</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkButton" id="add_button"> + <property name="label">gtk-add</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> - <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="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="add_button"> - <property name="label">gtk-add</property> - <property name="use_action_appearance">False</property> - <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="use_stock">True</property> - <signal name="clicked" handler="on_add_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_add_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">9</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">9</property> + </packing> </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -845,64 +845,63 @@ class ChangeStatusMessageDialog(TimeoutDialog): ChangeMoodDialog(on_response, self.pep_dict['mood'], self.pep_dict['mood_text']) -class AddNewContactWindow: +class AddNewContactWindow(Gtk.ApplicationWindow): """ Class for AddNewContactWindow """ - uid_labels = {'jabber': _('JID:'), - 'gadu-gadu': _('GG Number:'), - 'icq': _('ICQ Number:')} + uid_labels = {'jabber': _('Jabber ID'), + 'gadu-gadu': _('GG Number'), + 'icq': _('ICQ Number')} def __init__(self, account=None, jid=None, user_nick=None, group=None): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_resizable(False) + self.set_title(_('Add Contact')) + + self.connect('destroy', self.on_add_new_contact_window_destroy) + self.connect('key-press-event', self.on_add_new_contact_window_key_press_event) + self.account = account self.adding_jid = False - if account is None: - # fill accounts with active accounts - accounts = [] - for account in app.connections.keys(): - if account == 'Local': - continue - if app.connections[account].connected > 1: - accounts.append(account) - if not accounts: - return - if len(accounts) == 1: - self.account = account - else: - accounts = [self.account] - if self.account: - location = app.interface.instances[self.account] - else: - location = app.interface.instances - if 'add_contact' in location: - location['add_contact'].window.present() - # An instance is already opened + + # fill accounts with active accounts + accounts = app.get_enabled_accounts_with_labels() + + if not accounts: return - location['add_contact'] = self + + if not account: + self.account = accounts[0][0] + self.xml = gtkgui_helpers.get_gtk_builder('add_new_contact_window.ui') + self.add(self.xml.get_object('add_contact_box')) self.xml.connect_signals(self) - self.window = self.xml.get_object('add_new_contact_window') - for w in ('account_combobox', 'account_hbox', 'account_label', + + for w in ('account_combobox', 'account_label', 'prompt_label', 'uid_label', 'uid_entry', 'protocol_combobox', 'protocol_jid_combobox', - 'protocol_hbox', 'nickname_entry', 'message_scrolledwindow', - 'save_message_checkbutton', 'register_hbox', 'subscription_table', + 'protocol_label', 'nickname_entry', 'message_scrolledwindow', + 'save_message_checkbutton', 'register_hbox', 'add_button', 'message_textview', 'connected_label', - 'group_comboboxentry', 'auto_authorize_checkbutton'): + 'group_comboboxentry', 'auto_authorize_checkbutton', + 'save_message_revealer', 'nickname_label', 'group_label'): self.__dict__[w] = self.xml.get_object(w) - if account and len(app.connections) >= 2: - self.default_desc = _('Please fill in the data of the contact you want ' - 'to add to your account <b>%s</b>') % account - else: - self.default_desc = _('Please fill in the data of the contact you ' - 'want to add') - self.xml.get_object('prompt_label').set_markup(self.default_desc) + + self.subscription_table = [self.uid_label, self.uid_entry, + self.nickname_label, self.nickname_entry, + self.group_label, self.group_comboboxentry] + + self.add_button.grab_default() + self.agents = {'jabber': []} self.gateway_prompt = {} # types to which we are not subscribed but account has an agent for it self.available_types = [] for acct in accounts: - for j in app.contacts.get_jid_list(acct): + for j in app.contacts.get_jid_list(acct[0]): if app.jid_is_transport(j): type_ = app.get_transport_name_from_jid(j, False) if not type_: @@ -914,28 +913,20 @@ class AddNewContactWindow: self.gateway_prompt[j] = {'desc': None, 'prompt': None} # Now add the one to which we can register for acct in accounts: - for type_ in app.connections[acct].available_transports: + for type_ in app.connections[acct[0]].available_transports: if type_ in self.agents: continue self.agents[type_] = [] - for jid_ in app.connections[acct].available_transports[type_]: + for jid_ in app.connections[acct[0]].available_transports[type_]: if not jid_ in self.agents[type_]: self.agents[type_].append(jid_) self.gateway_prompt[jid_] = {'desc': None, 'prompt': None} self.available_types.append(type_) - # Combobox with transport/jabber icons - liststore = Gtk.ListStore(str, str, str) - cell = Gtk.CellRendererPixbuf() - self.protocol_combobox.pack_start(cell, False) - self.protocol_combobox.add_attribute(cell, 'icon_name', 1) - cell = Gtk.CellRendererText() - cell.set_property('xpad', 5) - self.protocol_combobox.pack_start(cell, True) - self.protocol_combobox.add_attribute(cell, 'text', 0) - self.protocol_combobox.set_model(liststore) + uf_type = {'jabber': 'XMPP', 'gadu-gadu': 'Gadu Gadu', 'icq': 'ICQ'} # Jabber as first + liststore = self.protocol_combobox.get_model() liststore.append(['XMPP', 'xmpp', 'jabber']) for type_ in self.agents: if type_ == 'jabber': @@ -950,8 +941,7 @@ class AddNewContactWindow: app.connections[account].request_gateway_prompt(service) self.protocol_combobox.set_active(0) self.auto_authorize_checkbutton.show() - liststore = Gtk.ListStore(str) - self.protocol_jid_combobox.set_model(liststore) + if jid: self.jid_escaped = True type_ = app.get_transport_name_from_jid(jid) @@ -992,7 +982,7 @@ class AddNewContactWindow: self.uid_entry.grab_focus() group_names = [] for acct in accounts: - for g in app.groups[acct].keys(): + for g in app.groups[acct[0]].keys(): if g not in helpers.special_groups and g not in group_names: group_names.append(g) group_names.sort() @@ -1003,21 +993,25 @@ class AddNewContactWindow: self.group_comboboxentry.set_active(i) i += 1 - self.window.set_transient_for(app.interface.roster.window) - self.window.show_all() + self.show_all() - if self.account: - self.account_label.hide() - self.account_hbox.hide() + self.prompt_label.hide() + self.save_message_revealer.hide() + + if len(accounts) > 1: + liststore = self.account_combobox.get_model() + for acc in accounts: + liststore.append(acc) + + self.account_combobox.set_active_id(self.account) else: - liststore = Gtk.ListStore(str, str) - for acct in accounts: - liststore.append([acct, acct]) - self.account_combobox.set_model(liststore) - self.account_combobox.set_active(0) + self.account_label.hide() + self.account_combobox.hide() if len(self.agents) == 1: - self.protocol_hbox.hide() + self.protocol_label.hide() + self.protocol_combobox.hide() + self.protocol_jid_combobox.hide() if self.account: message_buffer = self.message_textview.get_buffer() @@ -1031,15 +1025,10 @@ class AddNewContactWindow: self._nec_presence_received) def on_add_new_contact_window_destroy(self, widget): - if self.account: - location = app.interface.instances[self.account] - else: - location = app.interface.instances - del location['add_contact'] app.ged.remove_event_handler('presence-received', ged.GUI1, - self._nec_presence_received) + self._nec_presence_received) app.ged.remove_event_handler('gateway-prompt-received', ged.GUI1, - self._nec_gateway_prompt_received) + self._nec_gateway_prompt_received) def on_register_button_clicked(self, widget): model = self.protocol_jid_combobox.get_model() @@ -1049,13 +1038,17 @@ class AddNewContactWindow: def on_add_new_contact_window_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: # ESCAPE - self.window.destroy() + self.destroy() def on_cancel_button_clicked(self, widget): """ When Cancel button is clicked """ - self.window.destroy() + self.destroy() + + def on_message_textbuffer_changed(self, widget): + self.save_message_revealer.show() + self.save_message_revealer.set_reveal_child(True) def on_add_button_clicked(self, widget): """ @@ -1063,6 +1056,11 @@ class AddNewContactWindow: """ jid = self.uid_entry.get_text().strip() if not jid: + ErrorDialog( + _('%s Missing') % self.uid_label.get_text(), + _('You must supply the %s of the new contact.' % + self.uid_label.get_text()) + ) return model = self.protocol_combobox.get_model() @@ -1102,6 +1100,13 @@ class AddNewContactWindow: ErrorDialog(pritext, _('You cannot add yourself to your roster.')) return + if not app.account_is_connected(self.account): + ErrorDialog( + _('Account Offline'), + _('Your account must be online to add new contacts.') + ) + return + nickname = self.nickname_entry.get_text() or '' # get value of account combobox, if account was not specified if not self.account: @@ -1135,14 +1140,13 @@ class AddNewContactWindow: auto_auth = self.auto_authorize_checkbutton.get_active() app.interface.roster.req_sub(self, jid, message, self.account, groups=groups, nickname=nickname, auto_auth=auto_auth) - self.window.destroy() + self.destroy() def on_account_combobox_changed(self, widget): - model = widget.get_model() - iter_ = widget.get_active_iter() - account = model[iter_][0] + account = widget.get_active_id() message_buffer = self.message_textview.get_buffer() message_buffer.set_text(helpers.get_subscription_request_msg(account)) + self.account = account def on_protocol_jid_combobox_changed(self, widget): model = widget.get_model() @@ -1153,12 +1157,16 @@ class AddNewContactWindow: model = self.protocol_combobox.get_model() iter_ = self.protocol_combobox.get_active_iter() type_ = model[iter_][2] + desc = None if self.agents[type_] and jid_ in self.gateway_prompt: desc = self.gateway_prompt[jid_]['desc'] - if not desc: - desc = self.default_desc - self.xml.get_object('prompt_label').set_markup(desc) + + if desc: + self.prompt_label.set_markup(desc) + self.prompt_label.show() + else: + self.prompt_label.hide() prompt = None if self.agents[type_] and jid_ in self.gateway_prompt: @@ -1185,9 +1193,13 @@ class AddNewContactWindow: jid_ = self.agents[type_][0] if jid_ in self.gateway_prompt: desc = self.gateway_prompt[jid_]['desc'] - if not desc: - desc = self.default_desc - self.xml.get_object('prompt_label').set_markup(desc) + + if desc: + self.prompt_label.set_markup(desc) + self.prompt_label.show() + else: + self.prompt_label.hide() + if len(self.agents[type_]) > 1: self.protocol_jid_combobox.show() else: @@ -1214,7 +1226,7 @@ class AddNewContactWindow: self.register_hbox.show() self.auto_authorize_checkbutton.hide() self.connected_label.hide() - self.subscription_table.hide() + self._subscription_table_hide() self.add_button.set_sensitive(False) else: self.register_hbox.hide() @@ -1224,13 +1236,13 @@ class AddNewContactWindow: jid = model[row][0] contact = app.contacts.get_first_contact_from_jid( self.account, jid) - if contact.show in ('offline', 'error'): - self.subscription_table.hide() + if contact is None or contact.show in ('offline', 'error'): + self._subscription_table_hide() self.connected_label.show() self.add_button.set_sensitive(False) self.auto_authorize_checkbutton.hide() return - self.subscription_table.show() + self._subscription_table_show() self.auto_authorize_checkbutton.show() self.connected_label.hide() self.add_button.set_sensitive(True) @@ -1242,7 +1254,7 @@ class AddNewContactWindow: if _jid == jid: self.register_hbox.hide() self.connected_label.hide() - self.subscription_table.show() + self._subscription_table_show() self.auto_authorize_checkbutton.show() self.add_button.set_sensitive(True) @@ -1251,7 +1263,7 @@ class AddNewContactWindow: row = self.protocol_jid_combobox.get_active() _jid = model[row][0] if _jid == jid: - self.subscription_table.hide() + self._subscription_table_hide() self.auto_authorize_checkbutton.hide() self.connected_label.show() self.add_button.set_sensitive(False) @@ -1283,6 +1295,14 @@ class AddNewContactWindow: if obj.prompt: self.gateway_prompt[obj.jid]['prompt'] = obj.prompt + def _subscription_table_hide(self): + for widget in self.subscription_table: + widget.hide() + + def _subscription_table_show(self): + for widget in self.subscription_table: + widget.show() + class AboutDialog(Gtk.AboutDialog): def __init__(self): Gtk.AboutDialog.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0eeb111a02d23fd3dfc39f7e40620fb76e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0eeb111a02d23fd3dfc39f7e40620fb76e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: remove plugin dependencies, they are provided by extensions
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 76403d74 by André Apitzsch at 2018-07-07T00:12:30+02:00 Flatpak: remove plugin dependencies, they are provided by extensions - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -228,71 +228,6 @@ } ] }, - /* gnupg support */ - { - "name": "python3-python-gnupg", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --prefix=/app python_gnupg-0.4.3-py2.py3-none-any.whl" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/4a/87/76ead690afc4c7710012ede242537…", - "sha256": "faa69bab58ed0936f0ccf96c99b92369b7a1819305d37dfe5c927d21a437a09d" - } - ] - }, - /* OMEMO support */ - { - "name": "protobuf", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --prefix=/app protobuf-3.6.0-py2.py3-none-any.whl" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/85/f8/d09e4bf21c4de65405ce053e90542…", - "sha256": "9f1087abb67b34e55108bc610936b34363a7aac692023bcbb17e065c253a1f80" - } - ] - }, - { - "name": "python3-axolotl-curve25519", - "ensure-writable": [ - "easy-install.pth" - ], - "buildsystem": "simple", - "build-commands": [ - "python3 setup.py install --prefix=/app" - ], - "sources": [ - { - "type": "archive", - "url": "https://files.pythonhosted.org/packages/59/ca/c8111718bcc8da18e9b9868e78429…", - "sha256": "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3" - } - ] - }, - { - "name": "python3-axolotl", - "ensure-writable": [ - "easy-install.pth", - "setuptools.pth" - ], - "buildsystem": "simple", - "build-commands": [ - "python3 setup.py install --prefix=/app" - ], - "sources": [ - { - "type": "archive", - "url": "https://files.pythonhosted.org/packages/27/99/3b905f0061aba53526408d286e53c…", - "sha256": "ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0" - } - ] - }, { "name": "python3-jeepney", "buildsystem": "simple", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/76403d748e1de99a7903a2e5151f6ea477… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/76403d748e1de99a7903a2e5151f6ea477… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits