anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix runtime criticals related to jingle file transfer

Browse source
This commit is contained in:
fiaxh 2020-09-18 11:51:46 +02:00
parent 2cda20d589
commit fe9e8f0c2b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libdino/src/service/jingle_file_transfers.vala
View file

@ -206,7 +206,11 @@ public class JingleFileSender : FileSender, Object {
throw new FileSendError.ENCRYPTION_FAILED("Should have created a precondition, but did not"); throw new FileSendError.ENCRYPTION_FAILED("Should have created a precondition, but did not");
} }
} }
yield stream.get_module(Xep.JingleFileTransfer.Module.IDENTITY).offer_file_stream(stream, full_jid, file_transfer.input_stream, file_transfer.server_file_name, file_meta.size, precondition_name, precondition_options); try {
yield stream.get_module(Xep.JingleFileTransfer.Module.IDENTITY).offer_file_stream(stream, full_jid, file_transfer.input_stream, file_transfer.server_file_name, file_meta.size, precondition_name, precondition_options);
} catch (Error e) {
throw new FileSendError.UPLOAD_FAILED(@"offer_file_stream failed: $(e.message)");
}
return; return;
} }
} }

2
xmpp-vala/src/module/xep/0260_jingle_socks5_bytestreams.vala
View file

@ -291,7 +291,7 @@ class Parameters : Jingle.TransportParameters, Object {
} }
remote_sent_selected_candidate = true; remote_sent_selected_candidate = true;
remote_selected_candidate = candidate; remote_selected_candidate = candidate;
debug("Remote selected candidate %s", candidate.cid); debug("Remote selected candidate %s", candidate != null ? candidate.cid : "(null)");
try_completing_negotiation(); try_completing_negotiation();
} }
private void handle_activated(string cid) throws Jingle.IqError { private void handle_activated(string cid) throws Jingle.IqError {