jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure Boolean `io.element.disable_network_constraint` is explicitly set in the .well-known file.

This commit is contained in:
Benoit Marty 2023-10-13 09:37:58 +02:00
parent 7884b9dd5e
commit 64a7de5326
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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. * 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 { enum class RoomCapabilitySupport {

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

@ -25,6 +25,7 @@ internal class MigrateSessionTo054(realm: DynamicRealm) : RealmMigrator(realm, 5
override fun doMigrate(realm: DynamicRealm) { override fun doMigrate(realm: DynamicRealm) {
realm.schema.get("HomeServerCapabilitiesEntity") realm.schema.get("HomeServerCapabilitiesEntity")
?.addField(HomeServerCapabilitiesEntityFields.DISABLE_NETWORK_CONSTRAINT, Boolean::class.java) ?.addField(HomeServerCapabilitiesEntityFields.DISABLE_NETWORK_CONSTRAINT, Boolean::class.java)
?.setNullable(HomeServerCapabilitiesEntityFields.DISABLE_NETWORK_CONSTRAINT, true)
?.forceRefreshOfHomeServerCapabilities() ?.forceRefreshOfHomeServerCapabilities()
} }
} }

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

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

9
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/workmanager/DefaultWorkManagerConfig.kt
View File

@ -17,19 +17,24 @@
package org.matrix.android.sdk.internal.session.workmanager package org.matrix.android.sdk.internal.session.workmanager
import org.matrix.android.sdk.api.auth.data.Credentials 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 org.matrix.android.sdk.internal.session.homeserver.HomeServerCapabilitiesDataSource
import javax.inject.Inject import javax.inject.Inject
@Suppress("RedundantIf")
internal class DefaultWorkManagerConfig @Inject constructor( internal class DefaultWorkManagerConfig @Inject constructor(
private val credentials: Credentials, private val credentials: Credentials,
private val homeServerCapabilitiesDataSource: HomeServerCapabilitiesDataSource, private val homeServerCapabilitiesDataSource: HomeServerCapabilitiesDataSource,
) : WorkManagerConfig { ) : WorkManagerConfig {
override fun withNetworkConstraint(): Boolean { override fun withNetworkConstraint(): Boolean {
return if (credentials.discoveryInformation?.disableNetworkConstraint == true) { 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 false
} else { } else {
homeServerCapabilitiesDataSource.getHomeServerCapabilities()?.disableNetworkConstraint.orFalse().not() // Default, use the Network constraint
true
} }
} }
} }