Improve network reliability.

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

@@ -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 {

app/src/main/java/org/thoughtcrime/securesms/messages/BackgroundMessageRetriever.java

@@ -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) {

app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java

@@ -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",
+    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(), registered, hasProxy, forceWebsocket));
+                             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() {

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

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

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

@@ -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;
+  }
 }