Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve network reliability.

Browse Source
This commit is contained in:
Cody Henthorne
2023-09-21 12:10:27 -04:00
committed by GitHub
parent 29c4d9f4d6
commit 2145ded2f2
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
View File

@@ -167,7 +167,7 @@ open class SignalServiceNetworkAccess(context: Context) {
HostConfig("https://inbox.google.com", G_HOST, GMAIL_CONNECTION_SPEC)
)
private val fUrls = arrayOf("https://cdn.sstatic.net", "https://github.githubassets.com", "https://pinterest.com", "https://open.scdn.co", "https://www.redditstatic.com")
private val fUrls = arrayOf("https://github.githubassets.com", "https://pinterest.com", "https://www.redditstatic.com")
private val fConfig: SignalServiceConfiguration = SignalServiceConfiguration(
signalServiceUrls = fUrls.map { SignalServiceUrl(it, F_SERVICE_HOST, fTrustStore, APP_CONNECTION_SPEC) }.toTypedArray(),

32
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java
View File

@@ -18,6 +18,7 @@ import org.whispersystems.signalservice.internal.util.Util;
import java.io.IOException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -60,7 +61,6 @@ public class WebSocketConnection extends WebSocketListener {
private final Set<Long> keepAlives = new HashSet<>();
private final String name;
private final String wsUri;
private final TrustStore trustStore;
private final Optional<CredentialsProvider> credentialsProvider;
private final String signalAgent;
@@ -70,7 +70,9 @@ public class WebSocketConnection extends WebSocketListener {
private final Optional<SignalProxy> signalProxy;
private final BehaviorSubject<WebSocketConnectionState> webSocketState;
private final boolean allowStories;
private final SignalServiceUrl serviceUrl;
private final SignalServiceUrl[] serviceUrls;
private final String extraPathUri;
private final SecureRandom random;
private WebSocket client;
@@ -101,25 +103,33 @@ public class WebSocketConnection extends WebSocketListener {
this.healthMonitor = healthMonitor;
this.webSocketState = BehaviorSubject.createDefault(WebSocketConnectionState.DISCONNECTED);
this.allowStories = allowStories;
this.serviceUrl = serviceConfiguration.getSignalServiceUrls()[0];
String uri = serviceUrl.getUrl().replace("https://", "wss://").replace("http://", "ws://");
if (credentialsProvider.isPresent()) {
this.wsUri = uri + "/v1/websocket/" + extraPathUri + "?login=%s&password=%s";
} else {
this.wsUri = uri + "/v1/websocket/" + extraPathUri;
}
this.serviceUrls = serviceConfiguration.getSignalServiceUrls();
this.extraPathUri = extraPathUri;
this.random = new SecureRandom();
}
public String getName() {
return name;
}
private Pair<SignalServiceUrl, String> getConnectionInfo() {
SignalServiceUrl serviceUrl = serviceUrls[random.nextInt(serviceUrls.length)];
String uri = serviceUrl.getUrl().replace("https://", "wss://").replace("http://", "ws://");
if (credentialsProvider.isPresent()) {
return new Pair<>(serviceUrl, uri + "/v1/websocket/" + extraPathUri + "?login=%s&password=%s");
} else {
return new Pair<>(serviceUrl, uri + "/v1/websocket/" + extraPathUri);
}
}
public synchronized Observable<WebSocketConnectionState> connect() {
log("connect()");
if (client == null) {
Pair<SignalServiceUrl, String> connectionInfo = getConnectionInfo();
SignalServiceUrl serviceUrl = connectionInfo.first();
String wsUri = connectionInfo.second();
String filledUri;
if (credentialsProvider.isPresent()) {