Ensure Boolean io.element.disable_network_constraint is explicitly …

…set in the .well-known file.
element-hq · Oct 13, 2023 · 64a7de5 · 64a7de5
1 parent 7884b9d
commit 64a7de5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/...oid/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt b/...oid/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@@ -94,7 +94,7 @@ data class HomeServerCapabilities(
         /**
          * If set to true, the SDK will not use the network constraint when configuring Worker for the WorkManager, provided in Wellknown.
          */
-        val disableNetworkConstraint: Boolean = false,
+        val disableNetworkConstraint: Boolean? = null,
 ) {
 
     enum class RoomCapabilitySupport {

diff --git a/...d/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo054.kt b/...d/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo054.kt
@@ -25,6 +25,7 @@ internal class MigrateSessionTo054(realm: DynamicRealm) : RealmMigrator(realm, 5
     override fun doMigrate(realm: DynamicRealm) {
         realm.schema.get("HomeServerCapabilitiesEntity")
                 ?.addField(HomeServerCapabilitiesEntityFields.DISABLE_NETWORK_CONSTRAINT, Boolean::class.java)
+                ?.setNullable(HomeServerCapabilitiesEntityFields.DISABLE_NETWORK_CONSTRAINT, true)
                 ?.forceRefreshOfHomeServerCapabilities()
     }
 }
diff --git a/.../main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt b/.../main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
@@ -37,7 +37,7 @@ internal open class HomeServerCapabilitiesEntity(
         var canRedactEventWithRelations: Boolean = false,
         var externalAccountManagementUrl: String? = null,
         var authenticationIssuer: String? = null,
-        var disableNetworkConstraint: Boolean = false,
+        var disableNetworkConstraint: Boolean? = null,
 ) : RealmObject() {
 
     companion object

diff --git a/...main/java/org/matrix/android/sdk/internal/session/workmanager/DefaultWorkManagerConfig.kt b/...main/java/org/matrix/android/sdk/internal/session/workmanager/DefaultWorkManagerConfig.kt
@@ -17,19 +17,24 @@
 package org.matrix.android.sdk.internal.session.workmanager
 
 import org.matrix.android.sdk.api.auth.data.Credentials
-import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.internal.session.homeserver.HomeServerCapabilitiesDataSource
 import javax.inject.Inject
 
+@Suppress("RedundantIf")
 internal class DefaultWorkManagerConfig @Inject constructor(
         private val credentials: Credentials,
         private val homeServerCapabilitiesDataSource: HomeServerCapabilitiesDataSource,
 ) : WorkManagerConfig {
     override fun withNetworkConstraint(): Boolean {
         return if (credentials.discoveryInformation?.disableNetworkConstraint == true) {
+            // Boolean `io.element.disable_network_constraint` explicitly set to `true` in the login response
+            false
+        } else if (homeServerCapabilitiesDataSource.getHomeServerCapabilities()?.disableNetworkConstraint == true) {
+            // Boolean `io.element.disable_network_constraint` explicitly set to `true` in the .well-known file
             false
         } else {
-            homeServerCapabilitiesDataSource.getHomeServerCapabilities()?.disableNetworkConstraint.orFalse().not()
+            // Default, use the Network constraint
+            true
         }
     }
 }