Skip to content

Commit d26d28f

Browse files
committed
Merge branch 'feature/bma/noNetworkConstraint' of github.com:vector-im/element-android into feature/bma/noNetworkConstraint
2 parents 3aa5f34 + 8d95eb7 commit d26d28f

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import com.zhuinden.monarchy.Monarchy
2020
import org.matrix.android.sdk.api.MatrixPatterns.getServerName
2121
import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
2222
import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
23-
import org.matrix.android.sdk.api.extensions.orFalse
2423
import org.matrix.android.sdk.api.extensions.orTrue
2524
import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
2625
import org.matrix.android.sdk.internal.auth.version.Versions
@@ -168,7 +167,7 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
168167
}
169168
homeServerCapabilitiesEntity.authenticationIssuer = getWellknownResult.wellKnown.unstableDelegatedAuthConfig?.issuer
170169
homeServerCapabilitiesEntity.externalAccountManagementUrl = getWellknownResult.wellKnown.unstableDelegatedAuthConfig?.accountManagementUrl
171-
homeServerCapabilitiesEntity.disableNetworkConstraint = getWellknownResult.wellKnown.disableNetworkConstraint.orFalse()
170+
homeServerCapabilitiesEntity.disableNetworkConstraint = getWellknownResult.wellKnown.disableNetworkConstraint
172171
}
173172

174173
homeServerCapabilitiesEntity.canLoginWithQrCode = canLoginWithQrCode(getCapabilitiesResult, getVersionResult)

0 commit comments

Comments
 (0)