Map the new fields of SessionData.

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -136,7 +136,12 @@ class RustMatrixClient constructor(
         override fun didRefreshTokens() {
             Timber.w("didRefreshTokens()")
             appCoroutineScope.launch {
-                sessionStore.updateData(client.session().toSessionData())
+                val existingData = sessionStore.getSession(client.userId()) ?: return@launch
+                val newData = client.session().toSessionData(
+                    isTokenValid = existingData.isTokenValid,
+                    loginType = existingData.loginType,
+                )
+                sessionStore.updateData(newData)
             }
         }
     }

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

@@ -30,6 +30,7 @@ import io.element.android.libraries.matrix.impl.RustMatrixClientFactory
 import io.element.android.libraries.matrix.impl.exception.mapClientException
 import io.element.android.libraries.matrix.impl.mapper.toSessionData
 import io.element.android.libraries.network.useragent.UserAgentProvider
+import io.element.android.libraries.sessionstorage.api.LoginType
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -102,7 +103,12 @@ class RustMatrixAuthenticationService @Inject constructor(
         withContext(coroutineDispatchers.io) {
             runCatching {
                 val client = authService.login(username, password, "Element X Android", null)
-                val sessionData = client.use { it.session().toSessionData() }
+                val sessionData = client.use {
+                    it.session().toSessionData(
+                        isTokenValid = true,
+                        loginType = LoginType.PASSWORD,
+                    )
+                }
                 sessionStore.storeData(sessionData)
                 SessionId(sessionData.userId)
             }.mapFailure { failure ->
@@ -144,7 +150,12 @@ class RustMatrixAuthenticationService @Inject constructor(
             runCatching {
                 val urlForOidcLogin = pendingOidcAuthenticationData ?: error("You need to call `getOidcUrl()` first")
                 val client = authService.loginWithOidcCallback(urlForOidcLogin, callbackUrl)
-                val sessionData = client.use { it.session().toSessionData() }
+                val sessionData = client.use {
+                    it.session().toSessionData(
+                        isTokenValid = true,
+                        loginType = LoginType.OIDC,
+                    )
+                }
                 pendingOidcAuthenticationData?.close()
                 pendingOidcAuthenticationData = null
                 sessionStore.storeData(sessionData)

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/Session.kt

@@ -16,11 +16,15 @@
 
 package io.element.android.libraries.matrix.impl.mapper
 
+import io.element.android.libraries.sessionstorage.api.LoginType
 import io.element.android.libraries.sessionstorage.api.SessionData
 import org.matrix.rustcomponents.sdk.Session
 import java.util.Date
 
-internal fun Session.toSessionData() = SessionData(
+internal fun Session.toSessionData(
+    isTokenValid: Boolean,
+    loginType: LoginType,
+) = SessionData(
     userId = userId,
     deviceId = deviceId,
     accessToken = accessToken,
@@ -29,4 +33,6 @@ internal fun Session.toSessionData() = SessionData(
     oidcData = oidcData,
     slidingSyncProxy = slidingSyncProxy,
     loginTimestamp = Date(),
+    isTokenValid = isTokenValid,
+    loginType = loginType,
 )