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

Session database: use the new count API.

Browse source
This commit is contained in:
Benoit Marty 2025-11-04 15:30:29 +01:00
parent 9070420860
commit 0367ae610c
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
View file

@ -349,7 +349,7 @@ class RootFlowNode(
} else { } else {
// wait for the current session to be restored // wait for the current session to be restored
val loggedInFlowNode = attachSession(latestSessionId) val loggedInFlowNode = attachSession(latestSessionId)
if (sessionStore.getAllSessions().size > 1) { if (sessionStore.numberOfSessions() > 1) {
// Several accounts, let the user choose which one to use // Several accounts, let the user choose which one to use
backstack.push( backstack.push(
NavTarget.AccountSelect( NavTarget.AccountSelect(
@ -379,7 +379,7 @@ class RootFlowNode(
is PermalinkData.FallbackLink -> Unit is PermalinkData.FallbackLink -> Unit
is PermalinkData.RoomEmailInviteLink -> Unit is PermalinkData.RoomEmailInviteLink -> Unit
else -> { else -> {
if (sessionStore.getAllSessions().size > 1) { if (sessionStore.numberOfSessions() > 1) {
// Several accounts, let the user choose which one to use // Several accounts, let the user choose which one to use
backstack.push( backstack.push(
NavTarget.AccountSelect( NavTarget.AccountSelect(

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
View file

@ -90,7 +90,7 @@ class OnBoardingPresenter(
} }
val isAddingAccount by produceState(initialValue = false) { val isAddingAccount by produceState(initialValue = false) {
// We are adding an account if there is at least one session already stored // We are adding an account if there is at least one session already stored
value = sessionStore.getAllSessions().isNotEmpty() value = sessionStore.numberOfSessions() > 0
} }
val loginMode by loginHelper.collectLoginMode() val loginMode by loginHelper.collectLoginMode()

2
features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
View file

@ -165,7 +165,7 @@ class DefaultBugReporter(
} }
} }
val sessionData = sessionStore.getLatestSession() val sessionData = sessionStore.getLatestSession()
val numberOfAccounts = sessionStore.getAllSessions().size val numberOfAccounts = sessionStore.numberOfSessions()
val deviceId = sessionData?.deviceId ?: "undefined" val deviceId = sessionData?.deviceId ?: "undefined"
val userId = sessionData?.userId?.let { UserId(it) } val userId = sessionData?.userId?.let { UserId(it) }
// build the multi part request // build the multi part request

2
features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
View file

@ -58,9 +58,11 @@ class SignedOutPresenterTest {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.signedOutSession).isEqualTo(aSessionData) assertThat(initialState.signedOutSession).isEqualTo(aSessionData)
assertThat(sessionStore.getAllSessions()).isNotEmpty() assertThat(sessionStore.getAllSessions()).isNotEmpty()
assertThat(sessionStore.numberOfSessions()).isEqualTo(1)
initialState.eventSink(SignedOutEvents.SignInAgain) initialState.eventSink(SignedOutEvents.SignInAgain)
assertThat(awaitItem().signedOutSession).isNull() assertThat(awaitItem().signedOutSession).isNull()
assertThat(sessionStore.getAllSessions()).isEmpty() assertThat(sessionStore.getAllSessions()).isEmpty()
assertThat(sessionStore.numberOfSessions()).isEqualTo(0)
} }
} }
} }