copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't reply to presence type=subscribe before we do the roster push when registering to a transport. Fixes #5549

This commit is contained in:
Yann Leboulanger 2010-01-13 11:12:14 +01:00
parent 7548a44c09
commit a1c8ec3ebd
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/connection.py
View File

@ -140,6 +140,8 @@ class CommonConnection:
# Do we continue connection when we get roster (send presence,get vcard..) # Do we continue connection when we get roster (send presence,get vcard..)
self.continue_connect_info = None self.continue_connect_info = None
# Remember where we are in the register agent process
self.agent_registrations = {}
# To know the groupchat jid associated with a sranza ID. Useful to # To know the groupchat jid associated with a sranza ID. Useful to
# request vcard or os info... to a real JID but act as if it comes from # request vcard or os info... to a real JID but act as if it comes from
# the fake jid # the fake jid

16
src/common/connection_handlers.py
View File

@ -123,6 +123,12 @@ class ConnectionDisco:
if resp.getType() == 'result': if resp.getType() == 'result':
self.dispatch('INFORMATION', (_('Registration succeeded'), self.dispatch('INFORMATION', (_('Registration succeeded'),
_('Registration with agent %s succeeded') % agent)) _('Registration with agent %s succeeded') % agent))
self.request_subscription(agent, auto_auth=True)
self.agent_registrations[agent]['roster_push'] = True
if self.agent_registrations[agent]['sub_received']:
p = common.xmpp.Presence(agent, 'subscribed')
p = self.add_sha(p)
self.connection.send(p)
if resp.getType() == 'error': if resp.getType() == 'error':
self.dispatch('ERROR', (_('Registration failed'), _('Registration with' self.dispatch('ERROR', (_('Registration failed'), _('Registration with'
' agent %(agent)s failed with error %(error)s: %(error_msg)s') % { ' agent %(agent)s failed with error %(error)s: %(error_msg)s') % {
@ -141,7 +147,10 @@ class ConnectionDisco:
{'agent': agent}) {'agent': agent})
else: else:
# fixed: blocking # fixed: blocking
common.xmpp.features_nb.register(self.connection, agent, info, None) common.xmpp.features_nb.register(self.connection, agent, info,
self._agent_registered_cb, {'agent': agent})
self.agent_registrations[agent] = {'roster_push': False,
'sub_received': False}
def _discover(self, ns, jid, node=None, id_prefix=None): def _discover(self, ns, jid, node=None, id_prefix=None):
if not self.connection or self.connected < 2: if not self.connection or self.connected < 2:
@ -1840,6 +1849,11 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream,
if ptype == 'subscribe': if ptype == 'subscribe':
log.debug('subscribe request from %s' % who) log.debug('subscribe request from %s' % who)
if who.find('@') <= 0 and who in self.agent_registrations:
self.agent_registrations[who]['sub_received'] = True
if not self.agent_registrations[who]['roster_push']:
# We'll reply after roster push result
return
if gajim.config.get_per('accounts', self.name, 'autoauth') or \ if gajim.config.get_per('accounts', self.name, 'autoauth') or \
who.find('@') <= 0 or jid_stripped in self.jids_for_auto_auth or \ who.find('@') <= 0 or jid_stripped in self.jids_for_auto_auth or \
transport_auto_auth: transport_auto_auth: