Merge branch 'develop' into feature/bca/clean_up_legacy_crypto

Author: bmarty

changelog.d/8658.misc

@@ -0,0 +1 @@
+Remove unused WebRTC dependency

changelog.d/8662.misc

@@ -0,0 +1 @@
+Take into account boolean "io.element.disable_network_constraint" from the .well-known file.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/DiscoveryInformation.kt

@@ -36,5 +36,11 @@ data class DiscoveryInformation(
          * Note: matrix.org does not send this field
          */
         @Json(name = "m.identity_server")
-        val identityServer: WellKnownBaseConfig? = null
+        val identityServer: WellKnownBaseConfig? = null,
+
+        /**
+         * If set to true, the SDK will not use the network constraint when configuring Worker for the WorkManager.
+         */
+        @Json(name = "io.element.disable_network_constraint")
+        val disableNetworkConstraint: Boolean? = null,
 )

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnown.kt

@@ -61,4 +61,10 @@ data class WellKnown(
          */
         @Json(name = "org.matrix.msc2965.authentication")
         val unstableDelegatedAuthConfig: DelegatedAuthConfig? = null,
+
+        /**
+         * If set to true, the SDK will not use the network constraint when configuring Worker for the WorkManager.
+         */
+        @Json(name = "io.element.disable_network_constraint")
+        val disableNetworkConstraint: Boolean? = null,
 )

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt

@@ -90,6 +90,11 @@ data class HomeServerCapabilities(
          * Authentication issuer for use with MSC3824 delegated OIDC, provided in Wellknown.
          */
         val authenticationIssuer: String? = null,
+
+        /**
+         * If set to true, the SDK will not use the network constraint when configuring Worker for the WorkManager, provided in Wellknown.
+         */
+        val disableNetworkConstraint: Boolean? = null,
 ) {
 
     enum class RoomCapabilitySupport {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt

@@ -70,6 +70,7 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo050
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo051
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo052
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo053
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo054
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import javax.inject.Inject
@@ -78,7 +79,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         private val normalizer: Normalizer
 ) : MatrixRealmMigration(
         dbName = "Session",
-        schemaVersion = 53L,
+        schemaVersion = 54L,
 ) {
     /**
      * Forces all RealmSessionStoreMigration instances to be equal.
@@ -141,5 +142,6 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 51) MigrateSessionTo051(realm).perform()
         if (oldVersion < 52) MigrateSessionTo052(realm).perform()
         if (oldVersion < 53) MigrateSessionTo053(realm).perform()
+        if (oldVersion < 54) MigrateSessionTo054(realm).perform()
     }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt

@@ -50,6 +50,7 @@ internal object HomeServerCapabilitiesMapper {
                 canRedactRelatedEvents = entity.canRedactEventWithRelations,
                 externalAccountManagementUrl = entity.externalAccountManagementUrl,
                 authenticationIssuer = entity.authenticationIssuer,
+                disableNetworkConstraint = entity.disableNetworkConstraint,
         )
     }
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo054.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo054(realm: DynamicRealm) : RealmMigrator(realm, 54) {
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.DISABLE_NETWORK_CONSTRAINT, Boolean::class.java)
+                ?.setNullable(HomeServerCapabilitiesEntityFields.DISABLE_NETWORK_CONSTRAINT, true)
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt

@@ -37,6 +37,7 @@ internal open class HomeServerCapabilitiesEntity(
         var canRedactEventWithRelations: Boolean = false,
         var externalAccountManagementUrl: String? = null,
         var authenticationIssuer: String? = null,
+        var disableNetworkConstraint: Boolean? = null,
 ) : RealmObject() {
 
     companion object

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt

@@ -30,7 +30,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.workmanager.WorkManagerConfig
 import org.matrix.android.sdk.internal.worker.MatrixWorkerFactory
+import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -102,12 +104,20 @@ internal class WorkManagerProvider @Inject constructor(
     companion object {
         private const val MATRIX_SDK_TAG_PREFIX = "MatrixSDK-"
 
-        /**
-         * Default constraints: connected network.
-         */
-        val workConstraints = Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED)
-                .build()
+        fun getWorkConstraints(
+                workManagerConfig: WorkManagerConfig,
+        ): Constraints {
+            val withNetworkConstraint = workManagerConfig.withNetworkConstraint()
+            return Constraints.Builder()
+                    .apply {
+                        if (withNetworkConstraint) {
+                            setRequiredNetworkType(NetworkType.CONNECTED)
+                        } else {
+                            Timber.w("Network constraint is disabled")
+                        }
+                    }
+                    .build()
+        }
 
         // Use min value, smaller value will be ignored
         const val BACKOFF_DELAY_MILLIS = WorkRequest.MIN_BACKOFF_MILLIS