Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-22 18:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve network reliability.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-01-12 17:31:22 -05:00
parent 28531bb415
commit 54ffb4ad7b
5 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
View File

@@ -73,7 +73,8 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
emptyList(),
Optional.of(SignalServiceNetworkAccess.DNS),
Optional.empty(),
Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS)
Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS),
true
)
serviceNetworkAccessMock = mock {

3
app/src/main/java/org/thoughtcrime/securesms/messages/BackgroundMessageRetriever.java
View File

@@ -132,7 +132,8 @@ public class BackgroundMessageRetriever {
* care of it.
*/
public static boolean shouldIgnoreFetch() {
return ApplicationDependencies.getAppForegroundObserver().isForegrounded();
return ApplicationDependencies.getAppForegroundObserver().isForegrounded() &&
ApplicationDependencies.getSignalServiceNetworkAccess().supportsWebsockets();
}
private static String logSuffix(long startTime) {

9
app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java
View File

@@ -132,7 +132,7 @@ public class IncomingMessageObserver {
}
public boolean isDecryptionDrained() {
return decryptionDrained;
return decryptionDrained || !networkAccess.supportsWebsockets();
}
public void notifyDecryptionsDrained() {
@@ -174,12 +174,13 @@ public class IncomingMessageObserver {
Log.d(TAG, "Removed old keep web socket open requests.");
}
Log.d(TAG, String.format("Network: %s, Foreground: %s, FCM: %s, Stay open requests: [%s], Censored: %s, Registered: %s, Proxy: %s, Force websocket: %s",
hasNetwork, appVisible, fcmEnabled, Util.join(keepAliveTokens.entrySet(), ","), networkAccess.isCensored(), registered, hasProxy, forceWebsocket));
Log.d(TAG, String.format("Network: %s, Foreground: %s, FCM: %s, Stay open requests: [%s], Censored: %s, Supports websockets: %s, Registered: %s, Proxy: %s, Force websocket: %s",
hasNetwork, appVisible, fcmEnabled, Util.join(keepAliveTokens.entrySet(), ","), networkAccess.isCensored(), networkAccess.supportsWebsockets(), registered, hasProxy, forceWebsocket));
return registered &&
(appVisible || !fcmEnabled || forceWebsocket || Util.hasItems(keepAliveTokens)) &&
hasNetwork;
hasNetwork &&
networkAccess.supportsWebsockets();
}
private synchronized void waitForConnectionNecessary() {

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

@@ -173,7 +173,8 @@ open class SignalServiceNetworkAccess(context: Context) {
interceptors,
Optional.of(DNS),
Optional.empty(),
zkGroupServerPublicParams
zkGroupServerPublicParams,
false
)
private val censorshipConfiguration: Map<Int, SignalServiceConfiguration> = mapOf(
@@ -224,7 +225,8 @@ open class SignalServiceNetworkAccess(context: Context) {
interceptors,
Optional.of(DNS),
if (SignalStore.proxy().isProxyEnabled) Optional.ofNullable(SignalStore.proxy().proxy) else Optional.empty(),
zkGroupServerPublicParams
zkGroupServerPublicParams,
true
)
open fun getConfiguration(): SignalServiceConfiguration {
@@ -267,6 +269,10 @@ open class SignalServiceNetworkAccess(context: Context) {
return defaultCensoredCountryCodes.contains(countryCode)
}
fun supportsWebsockets(): Boolean {
return !isCensored() || getConfiguration().supportsWebSockets()
}
private fun buildGConfiguration(
hostConfigs: List<HostConfig>
): SignalServiceConfiguration {
@@ -291,7 +297,8 @@ open class SignalServiceNetworkAccess(context: Context) {
interceptors,
Optional.of(DNS),
Optional.empty(),
zkGroupServerPublicParams
zkGroupServerPublicParams,
true
)
}

9
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.java
View File

@@ -21,6 +21,7 @@ public final class SignalServiceConfiguration {
private final Optional<Dns> dns;
private final Optional<SignalProxy> proxy;
private final byte[] zkGroupServerPublicParams;
private final boolean supportsWebSocket;
public SignalServiceConfiguration(SignalServiceUrl[] signalServiceUrls,
Map<Integer, SignalCdnUrl[]> signalCdnUrlMap,
@@ -31,7 +32,8 @@ public final class SignalServiceConfiguration {
List<Interceptor> networkInterceptors,
Optional<Dns> dns,
Optional<SignalProxy> proxy,
byte[] zkGroupServerPublicParams)
byte[] zkGroupServerPublicParams,
boolean supportsWebSocket)
{
this.signalServiceUrls = signalServiceUrls;
this.signalCdnUrlMap = signalCdnUrlMap;
@@ -43,6 +45,7 @@ public final class SignalServiceConfiguration {
this.dns = dns;
this.proxy = proxy;
this.zkGroupServerPublicParams = zkGroupServerPublicParams;
this.supportsWebSocket = supportsWebSocket;
}
public SignalServiceUrl[] getSignalServiceUrls() {
@@ -84,4 +87,8 @@ public final class SignalServiceConfiguration {
public Optional<SignalProxy> getSignalProxy() {
return proxy;
}
public boolean supportsWebSockets() {
return supportsWebSocket;
}
}