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

Update JingleFT to its latest experimental version

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-04-29 00:02:47 +01:00
parent 2b9f9f3bb9
commit 71f0e40c94
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/connection_handlers_events.py
View file

@ -2306,12 +2306,12 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.file_props.session_type = 'jingle' self.file_props.session_type = 'jingle'
self.file_props.stream_methods = nbxmpp.NS_BYTESTREAM self.file_props.stream_methods = nbxmpp.NS_BYTESTREAM
desc = self.jingle_content.getTag('description') desc = self.jingle_content.getTag('description')
if desc.getTag('offer'): if self.jingle_content.getAttr('creator') == 'initiator':
file_tag = desc.getTag('offer').getTag('file') file_tag = desc.getTag('file')
self.file_props.sender = self.fjid self.file_props.sender = self.fjid
self.file_props.receiver = self.conn._ft_get_our_jid() self.file_props.receiver = self.conn._ft_get_our_jid()
else: else:
file_tag = desc.getTag('request').getTag('file') file_tag = desc.getTag('file')
h = file_tag.getTag('hash') h = file_tag.getTag('hash')
h = h.getData() if h else None h = h.getData() if h else None
n = file_tag.getTag('name') n = file_tag.getTag('name')

7
src/common/jingle_content.py
View file

@ -176,11 +176,7 @@ class JingleContent:
def _fill_content(self, content): def _fill_content(self, content):
description_node = nbxmpp.simplexml.Node( description_node = nbxmpp.simplexml.Node(
tag=nbxmpp.NS_JINGLE_FILE_TRANSFER + ' description') tag=nbxmpp.NS_JINGLE_FILE_TRANSFER + ' description')
if self.session.werequest: file_tag = description_node.setTag('file')
simode = nbxmpp.simplexml.Node(tag='request')
else:
simode = nbxmpp.simplexml.Node(tag='offer')
file_tag = simode.setTag('file')
if self.file_props.name: if self.file_props.name:
node = nbxmpp.simplexml.Node(tag='name') node = nbxmpp.simplexml.Node(tag='name')
node.addData(self.file_props.name) node.addData(self.file_props.name)
@ -217,7 +213,6 @@ class JingleContent:
desc = file_tag.setTag('desc') desc = file_tag.setTag('desc')
if self.file_props.desc: if self.file_props.desc:
desc.setData(self.file_props.desc) desc.setData(self.file_props.desc)
description_node.addChild(node=simode)
if self.use_security: if self.use_security:
security = nbxmpp.simplexml.Node( security = nbxmpp.simplexml.Node(
tag=nbxmpp.NS_JINGLE_XTLS + ' security') tag=nbxmpp.NS_JINGLE_XTLS + ' security')