From 635df6ebd3fe236a55544611e2f0e1177a8cb906 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 18 Oct 2024 12:07:39 -0400
Subject: [PATCH] Fix parsing crash and creation of ice servers from turn
 server json.

---
 .../securesms/service/webrtc/SignalCallManager.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
index bf349acc8e..6ba3c7ba49 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
@@ -1050,7 +1050,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
     List<PeerConnection.IceServer> iceServers = new ArrayList<>();
 
     for (TurnServerInfo turnServerInfo: turnServerInfos) {
-      if (turnServerInfo.getUrls() != null) {
+      if (turnServerInfo.getUrlsWithIps() != null) {
         iceServers.addAll(
             turnServerInfo.getUrlsWithIps()
                           .stream()
@@ -1062,7 +1062,8 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
                                                            .createIceServer()
                           ).collect(Collectors.toList()));
       }
-      if (turnServerInfo.getUrlsWithIps() != null) {
+
+      if (turnServerInfo.getUrls() != null) {
         iceServers.addAll(
             turnServerInfo.getUrls()
                           .stream()
@@ -1071,8 +1072,7 @@ public final class SignalCallManager implements CallManager.Observer, GroupCall.
                                                            .setUsername(turnServerInfo.getUsername())
                                                            .setPassword(turnServerInfo.getPassword())
                                                            .createIceServer()
-                          ).toList()
-        );
+                          ).collect(Collectors.toList()));
       }
     }