mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-27 22:43:52 +00:00
Remove calling stun fallback.
This commit is contained in:
@@ -937,12 +937,11 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
|
||||
}
|
||||
|
||||
public void retrieveTurnServers(@NonNull RemotePeer remotePeer) {
|
||||
List<PeerConnection.IceServer> iceServers = new LinkedList<>();
|
||||
|
||||
networkExecutor.execute(() -> {
|
||||
try {
|
||||
TurnServerInfo turnServerInfo = ApplicationDependencies.getSignalServiceAccountManager().getTurnServerInfo();
|
||||
|
||||
List<PeerConnection.IceServer> iceServers = new LinkedList<>();
|
||||
for (String url : turnServerInfo.getUrls()) {
|
||||
if (url.startsWith("turn")) {
|
||||
iceServers.add(PeerConnection.IceServer.builder(url)
|
||||
@@ -953,11 +952,6 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
|
||||
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) -> {
|
||||
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"));
|
||||
return s;
|
||||
});
|
||||
} catch (IOException e) {
|
||||
Log.w(TAG, "Unable to retrieve turn servers: ", e);
|
||||
process((s, p) -> p.handleSetupFailure(s, remotePeer.getCallId()));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user