Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'qr-other-device-not-signed-in' of https://github.com/hughns/element-x-android into qr-other-device-not-signed-in

Browse source
This commit is contained in:
Hugh Nimmo-Smith 2026-05-18 11:53:02 +01:00
commit 2771ce9442
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
View file

@ -434,8 +434,9 @@ class RustMatrixAuthenticationService(
qrCodeData: QrCodeData,
): Client {
Timber.d("Creating client for QR Code login with simplified sliding sync")
// The 2025 version of MSC4108 will always give us the baseUrl and guarantees it to be a well-formed URL
// The 2024 version always has null baseUrl and uses the serverName instead, which can be null or malformed
// The 2025 version of MSC4108 provides baseUrl; the 2024 version has null baseUrl and uses
// serverName instead, which can be null or malformed. We only enforce presence/non-blankness
// here and rely on serverNameOrHomeserverUrl()/the Rust builder layer to validate structure.
val baseUrlOrServerName = qrCodeData.baseUrl() ?: qrCodeData.serverName()
if (baseUrlOrServerName == null) {