Merge pull request #6908 from vector-im/feature/bma/fix_crash

Fix crash when signing out.
This commit is contained in:
Benoit Marty 2022-08-23 15:07:55 +02:00 committed by GitHub
commit 1c8fccad30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -70,7 +70,7 @@ class ActiveSessionHolder @Inject constructor(
suspend fun clearActiveSession() {
// Do some cleanup first
getSafeActiveSession()?.let {
getSafeActiveSession(startSync = false)?.let {
Timber.w("clearActiveSession of ${it.myUserId}")
it.callSignalingService().removeCallListener(callManager)
it.removeListener(sessionListener)
@ -91,8 +91,8 @@ class ActiveSessionHolder @Inject constructor(
return activeSessionReference.get() != null || authenticationService.hasAuthenticatedSessions()
}
fun getSafeActiveSession(): Session? {
return runBlocking { getOrInitializeSession(startSync = true) }
fun getSafeActiveSession(startSync: Boolean = true): Session? {
return runBlocking { getOrInitializeSession(startSync = startSync) }
}
fun getActiveSession(): Session {