filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 94e755552c 32bfaf8868
commit 1c8fccad30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
View File

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