diff options
| author | Christian Schneppe <christian@pix-art.de> | 2019-05-04 16:06:30 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2019-05-04 16:06:30 +0200 |
| commit | 2cdd612ff3fa32c4081d501122463d0fa57d75d6 (patch) | |
| tree | 5567a985d04b60e33a3cdb333227e06233bd0bf9 /src/main/java/de | |
| parent | ad6330cca8c860db7ab4bd084e9d3d040100e444 (diff) | |
jingle: send canditate error before fallback
Diffstat (limited to 'src/main/java/de')
| -rw-r--r-- | src/main/java/de/pixart/messenger/Config.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java index e61b1d28e..21d7ecaa7 100644 --- a/src/main/java/de/pixart/messenger/Config.java +++ b/src/main/java/de/pixart/messenger/Config.java @@ -144,7 +144,7 @@ public final class Config { public static final String ISSUE_URL = "xmpp://support@room.pix-art.de?join"; - 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/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java index d4c6c7eba..19c9ca8cd 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java @@ -800,7 +800,7 @@ public class JingleConnection implements Transferable { } private void sendFallbackToIbb() { - Log.d(Config.LOGTAG, account.getJid().asBareJid()+ ": sending fallback to ibb"); + Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": sending fallback to ibb"); JinglePacket packet = this.bootstrapPacket("transport-replace"); Content content = new Content(this.contentCreator, this.contentName); this.transportId = this.mJingleConnectionManager.nextRandomId(); @@ -1028,16 +1028,17 @@ public class JingleConnection implements Transferable { } private void sendCandidateError() { + Log.d(Config.LOGTAG, "sending candidate 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() { |