empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix parsing crash and creation of ice servers from turn server json.

Browse source
This commit is contained in:
Cody Henthorne 2024-10-18 12:07:39 -04:00
parent 21a57298dc
commit 635df6ebd3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
View file

@ -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()));
}
}