Fix rejecting file transfer

gajim/common/jingle_session.py

@@ -538,7 +538,7 @@ def __on_session_initiate(self, stanza, jingle, error, action):
         # If we are not receiving a file
         # Check if there's already a session with this user:
         if contents[0].media != 'file':
-            for session in self.connection.get_module('Jingle').iter_jingle_sessions(self.peerjid):
+            for session in self.connection.get_module('Jingle').get_jingle_sessions(self.peerjid):
                 if session is not self:
                     reason = nbxmpp.Node('reason')
                     alternative_session = reason.setTag('alternative-session')

gajim/common/modules/bytestream.py

@@ -179,10 +179,9 @@ def send_file_rejection(self, file_props, code='403', typ=None):
         if not app.account_is_connected(self._account):
             return
 
-        if file_props.sid in self._sessions:
-            jingle = self._sessions[file_props.sid]
-            jingle.cancel_session()
-        return
+        for session in self._con.get_module('Jingle').get_jingle_sessions(
+                None, file_props.sid):
+            session.cancel_session()
 
     def send_success_connect_reply(self, streamhost):
         """

gajim/common/modules/jingle.py

@@ -230,16 +230,16 @@ def __hash_support(self, contact):
                 return 'sha-256'
         return None
 
-    def iter_jingle_sessions(self, jid, sid=None, media=None):
+    def get_jingle_sessions(self, jid, sid=None, media=None):
         if sid:
-            return (session for session in self._sessions.values() if \
-                session.sid == sid)
-        sessions = (session for session in self._sessions.values() if \
-            session.peerjid == jid)
+            return [session for session in self._sessions.values() if \
+                session.sid == sid]
+        sessions = [session for session in self._sessions.values() if \
+            session.peerjid == jid]
         if media:
             if media not in ('audio', 'video', 'file'):
-                return tuple()
-            return (session for session in sessions if session.get_content(media))
+                return []
+            return [session for session in sessions if session.get_content(media)]
         return sessions
 
     def set_file_info(self, file_):