diff options
author | fiaxh <git@lightrise.org> | 2021-04-29 15:56:22 +0200 |
---|---|---|
committer | fiaxh <git@lightrise.org> | 2021-05-01 21:51:24 +0200 |
commit | 7d2e64769067c1b47e0500f6456dd7e6f4eb435a (patch) | |
tree | 0405bd7728c57928bb3c202f684ae85bb7494ffc /xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala | |
parent | 0409f554268c0e8f24e23e471a94de4d3a035ff1 (diff) | |
download | dino-7d2e64769067c1b47e0500f6456dd7e6f4eb435a.tar.gz dino-7d2e64769067c1b47e0500f6456dd7e6f4eb435a.zip |
Improve call wording, cleanup
Diffstat (limited to 'xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala')
-rw-r--r-- | xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala b/xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala index 07b158bc..4581019f 100644 --- a/xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala +++ b/xmpp-vala/src/module/xep/0234_jingle_file_transfer.vala @@ -268,13 +268,19 @@ public class FileTransfer : Object { content.accept(); Jingle.StreamingConnection connection = content.component_connections.values.to_array()[0] as Jingle.StreamingConnection; - IOStream? io_stream = yield connection.stream.wait_async(); - FileTransferInputStream ft_stream = new FileTransferInputStream(io_stream.input_stream, size); - io_stream.output_stream.close(); - ft_stream.closed.connect(() => { - session.terminate(Jingle.ReasonElement.SUCCESS, null, null); - }); - this.stream = ft_stream; + try { + IOStream io_stream = yield connection.stream.wait_async(); + FileTransferInputStream ft_stream = new FileTransferInputStream(io_stream.input_stream, size); + io_stream.output_stream.close(); + ft_stream.closed.connect(() => { + session.terminate(Jingle.ReasonElement.SUCCESS, null, null); + }); + this.stream = ft_stream; + } catch (FutureError.EXCEPTION e) { + warning("Error accepting Jingle file-transfer: %s", connection.stream.exception.message); + } catch (FutureError e) { + warning("FutureError accepting Jingle file-transfer: %s", e.message); + } } public void reject(XmppStream stream) { |