changeset 975912558ebf in /home/hg/repos/gajim
author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=975912558ebf description: don't request privacy lists when connecting if server doesn't support that. Fixes #7990
diffstat:
src/common/connection.py | 41 ++++++++++++++++++++++++++++++++------ src/common/connection_handlers.py | 30 +++++---------------------- 2 files changed, 40 insertions(+), 31 deletions(-)
diffs (118 lines):
diff -r 9b500bc813bc -r 975912558ebf src/common/connection.py --- a/src/common/connection.py Sun Mar 01 15:07:14 2015 +0100 +++ b/src/common/connection.py Sat Mar 07 15:04:41 2015 +0100 @@ -1855,7 +1855,6 @@ if iq_obj.getType() == 'error': # server doesn't support privacy lists return # active the privacy rule - self.privacy_rules_supported = True self.activate_privacy_rule('invisible') self.connected = gajim.SHOW_LIST.index('invisible') self.status = msg @@ -1933,13 +1932,40 @@ self.awaiting_answers[id_] = (PRIVACY_ARRIVED, ) 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() + else: + 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) + gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, + show='offline')) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', pri_txt=_('Invisibility not ' + 'supported'), sec_txt=_('Account %s doesn't support ' + 'invisibility.') % self.name)) + return + if self.blocking_supported: + iq = nbxmpp.Iq('get', xmlns='') + query = iq.setQuery(name='blocklist') + query.setNamespace(nbxmpp.NS_BLOCKING) + id2_ = self.connection.getAnID() + iq.setID(id2_) + self.awaiting_answers[id2_] = (BLOCKING_ARRIVED, ) + self.connection.send(iq) + # Ask metacontacts before roster + self.get_metacontacts() + def _nec_agent_info_error_received(self, obj): if obj.conn.name != self.name: return if obj.id_[:6] == 'Gajim_': - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self._request_privacy() + self._continue_connection_request_privacy()
def _nec_agent_info_received(self, obj): if obj.conn.name != self.name: @@ -2010,6 +2036,9 @@ iq = nbxmpp.Iq('set') iq.setTag('enable', namespace=nbxmpp.NS_CARBONS) self.connection.send(iq) + if nbxmpp.NS_PRIVACY in obj.features: + self.privacy_rules_supported = True + if nbxmpp.NS_BYTESTREAM in obj.features and \ gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): our_fjid = helpers.parse_jid(our_jid + '/' + \ @@ -2026,9 +2055,7 @@ self.available_transports[transport_type].append(obj.fjid) else: self.available_transports[transport_type] = [obj.fjid] - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self._request_privacy() + self._continue_connection_request_privacy()
def send_custom_status(self, show, msg, jid): if not show in gajim.SHOW_LIST: diff -r 9b500bc813bc -r 975912558ebf src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Mar 01 15:07:14 2015 +0100 +++ b/src/common/connection_handlers.py Sat Mar 07 15:04:41 2015 +0100 @@ -574,32 +574,14 @@ elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: del self.awaiting_answers[id_] if iq_obj.getType() != 'error': - self.privacy_rules_supported = True self.get_privacy_list('block') + # Ask metacontacts before roster + self.get_metacontacts() else: - if self.blocking_supported: - iq = nbxmpp.Iq('get', xmlns='') - query = iq.setQuery(name='blocklist') - query.setNamespace(nbxmpp.NS_BLOCKING) - id2_ = self.connection.getAnID() - iq.setID(id2_) - self.awaiting_answers[id2_] = (BLOCKING_ARRIVED, ) - self.connection.send(iq) - - 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) - gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) - gajim.nec.push_incoming_event(InformationEvent(None, - conn=self, level='error', pri_txt=_('Invisibility not ' - 'supported'), sec_txt=_('Account %s doesn't support ' - 'invisibility.') % self.name)) - return - # Ask metacontacts before roster - self.get_metacontacts() + # 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() elif self.awaiting_answers[id_][0] == BLOCKING_ARRIVED: del self.awaiting_answers[id_] if iq_obj.getType() == 'result':