Fix httpupload when using multiple accounts

Fixes #8865
This commit is contained in:
Philipp Hörist 2018-01-24 17:05:41 +01:00
parent 0966a2c2d0
commit 8cdad276bf
2 changed files with 7 additions and 3 deletions

View File

@ -1261,7 +1261,7 @@ ConnectionHTTPUpload):
ConnectionPubSub.__init__(self) ConnectionPubSub.__init__(self)
ConnectionPEP.__init__(self, account=self.name, dispatcher=self, ConnectionPEP.__init__(self, account=self.name, dispatcher=self,
pubsub_connection=self) pubsub_connection=self)
ConnectionHTTPUpload.__init__(self, account=self.name) ConnectionHTTPUpload.__init__(self)
# Handle presences BEFORE caps # Handle presences BEFORE caps
app.nec.register_incoming_event(PresenceReceivedEvent) app.nec.register_incoming_event(PresenceReceivedEvent)

View File

@ -46,8 +46,7 @@ class ConnectionHTTPUpload:
Implement HTTP File Upload Implement HTTP File Upload
(XEP-0363, https://xmpp.org/extensions/xep-0363.html) (XEP-0363, https://xmpp.org/extensions/xep-0363.html)
""" """
def __init__(self, account): def __init__(self):
self.name = account
self.encrypted_upload = False self.encrypted_upload = False
self.component = None self.component = None
self.max_file_size = None # maximum file size in bytes self.max_file_size = None # maximum file size in bytes
@ -84,6 +83,9 @@ class ConnectionHTTPUpload:
return return
account = event.conn.name account = event.conn.name
if account != self.name:
return
self.component = event.jid self.component = event.jid
for form in event.data: for form in event.data:
@ -102,6 +104,8 @@ class ConnectionHTTPUpload:
account, self.max_file_size/(1024*1024)) account, self.max_file_size/(1024*1024))
def handle_outgoing_stanza(self, event): def handle_outgoing_stanza(self, event):
if event.conn.name != self.name:
return
message = event.msg_iq.getTagData('body') message = event.msg_iq.getTagData('body')
if message and message in self.messages: if message and message in self.messages:
self.messages.remove(message) self.messages.remove(message)