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

Don't reset the SSS toggle when logged out.

Browse source 
Instead, force a logout when toggling the option so user needs to log in again and create a new session using SSS.
This commit is contained in:
Jorge Martín 2024-07-19 16:32:25 +02:00
parent 114b12cbc7
commit ff6ea43237
7 changed files with 81 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,6 @@ import io.element.android.libraries.matrix.impl.util.anonymizedTokens
import io.element.android.libraries.matrix.impl.util.cancelAndDestroy
import io.element.android.libraries.matrix.impl.util.mxCallbackFlow
import io.element.android.libraries.matrix.impl.verification.RustSessionVerificationService
import io.element.android.libraries.preferences.api.store.AppPreferencesStore
import io.element.android.libraries.sessionstorage.api.SessionStore
import io.element.android.services.toolbox.api.systemclock.SystemClock
import kotlinx.collections.immutable.ImmutableList
@ -127,7 +126,6 @@ class RustMatrixClient(
private val baseDirectory: File,
baseCacheDirectory: File,
private val clock: SystemClock,
private val appPreferencesStore: AppPreferencesStore,
) : MatrixClient {
override val sessionId: UserId = UserId(client.userId())
override val deviceId: String = client.deviceId()
@ -556,7 +554,6 @@ class RustMatrixClient(
}
close()
deleteSessionDirectory(deleteCryptoDb = true)
appPreferencesStore.setSimplifiedSlidingSyncEnabled(false)
if (removeSession) {
sessionStore.removeSession(sessionId.value)
}

1
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
View file

@ -77,7 +77,6 @@ class RustMatrixClientFactory @Inject constructor(
baseDirectory = baseDirectory,
baseCacheDirectory = cacheDirectory,
clock = clock,
appPreferencesStore = appPreferencesStore,
).also {
Timber.tag(it.toString()).d("Creating Client with access token '$anonymizedAccessToken' and refresh token '$anonymizedRefreshToken'")
}