From 61604dedead6cb1c73467c36f260f0091987ab88 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 30 Apr 2019 11:23:15 +0200 Subject: [PATCH] jingle: send canditate error before fallback --- src/main/java/eu/siacs/conversations/Config.java | 2 +- .../eu/siacs/conversations/xmpp/jingle/JingleConnection.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index d95e4d906..da5cf4a81 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -122,7 +122,7 @@ public final class Config { public static final int EXPIRY_INTERVAL = 30 * 60 * 1000; // 30 minutes - public static final String ENABLED_CIPHERS[] = { + public static final String[] ENABLED_CIPHERS = { "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA256", diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index 9e70f3e5f..843079aea 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -1003,16 +1003,17 @@ public class JingleConnection implements Transferable { } private void sendCandidateError() { + Log.d(Config.LOGTAG,"sending canditate error"); JinglePacket packet = bootstrapPacket("transport-info"); Content content = new Content(this.contentCreator, this.contentName); content.setTransportId(this.transportId); content.socks5transport().addChild("candidate-error"); packet.setContent(content); this.sentCandidate = true; + this.sendJinglePacket(packet); if (receivedCandidate && mJingleStatus == JINGLE_STATUS_ACCEPTED) { connect(); } - this.sendJinglePacket(packet); } public int getJingleStatus() {