1 files changed, 2 insertions, 1 deletions
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 30ca27391..7050874fb 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
@@ -309,7 +309,7 @@ public class JingleConnection implements Transferable {
         if (this.initialTransport == Transport.IBB) {
             this.sendInitRequest();
         } else if (this.candidates.size() > 0) {
-            this.sendInitRequest();
+            this.sendInitRequest(); //TODO we will never get here? Can probably be removed
         } else {
             this.mJingleConnectionManager.getPrimaryCandidate(account, (success, candidate) -> {
                 if (success) {
@@ -1097,6 +1097,7 @@ public class JingleConnection implements Transferable {
     }
 
     private void mergeCandidates(List<JingleCandidate> candidates) {
+        Collections.sort(candidates, (a, b) -> Integer.compare(b.getPriority(), a.getPriority()));
         for (JingleCandidate c : candidates) {
             mergeCandidate(c);
         }