Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-08 09:18:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove calling stun fallback.

Browse Source
This commit is contained in:
Iñaqui
2023-06-29 13:41:28 -05:00
committed by Greyson Parrelli
parent a17800283a
commit 16d48984c5
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
+4 -7
View File
@@ -937,12 +937,11 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
} }
public void retrieveTurnServers(@NonNull RemotePeer remotePeer) { public void retrieveTurnServers(@NonNull RemotePeer remotePeer) {
List<PeerConnection.IceServer> iceServers = new LinkedList<>();
networkExecutor.execute(() -> { networkExecutor.execute(() -> {
try { try {
TurnServerInfo turnServerInfo = ApplicationDependencies.getSignalServiceAccountManager().getTurnServerInfo(); TurnServerInfo turnServerInfo = ApplicationDependencies.getSignalServiceAccountManager().getTurnServerInfo();
List<PeerConnection.IceServer> iceServers = new LinkedList<>();
for (String url : turnServerInfo.getUrls()) { for (String url : turnServerInfo.getUrls()) {
if (url.startsWith("turn")) { if (url.startsWith("turn")) {
iceServers.add(PeerConnection.IceServer.builder(url) iceServers.add(PeerConnection.IceServer.builder(url)
@@ -953,11 +952,6 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
iceServers.add(PeerConnection.IceServer.builder(url).createIceServer()); iceServers.add(PeerConnection.IceServer.builder(url).createIceServer());
} }
} }
} catch (IOException e) {
Log.w(TAG, "Using fallback. Unable to retrieve turn servers: " + e);
} finally {
// Append fallback stun server
iceServers.add(PeerConnection.IceServer.builder("stun:stun1.l.google.com:19302").createIceServer());
process((s, p) -> { process((s, p) -> {
RemotePeer activePeer = s.getCallInfoState().getActivePeer(); RemotePeer activePeer = s.getCallInfoState().getActivePeer();
@@ -968,6 +962,9 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
Log.w(TAG, "Ignoring received turn servers for incorrect call id. requesting_call_id: " + remotePeer.getCallId() + " current_call_id: " + (activePeer != null ? activePeer.getCallId() : "null")); Log.w(TAG, "Ignoring received turn servers for incorrect call id. requesting_call_id: " + remotePeer.getCallId() + " current_call_id: " + (activePeer != null ? activePeer.getCallId() : "null"));
return s; return s;
}); });
} catch (IOException e) {
Log.w(TAG, "Unable to retrieve turn servers: ", e);
process((s, p) -> p.handleSetupFailure(s, remotePeer.getCallId()));
} }
}); });
} }