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 #3425 from vector-im/feature/fga/fix_crash_signout 

Fix crash on signout
This commit is contained in:
Benoit Marty 2021-05-28 15:44:02 +02:00 committed by GitHub
parent 5657da3493 cc6263b20f
commit 270a195478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
View File

@ -20,6 +20,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.internal.SessionManager import org.matrix.android.sdk.internal.SessionManager
import org.matrix.android.sdk.internal.di.SessionId import org.matrix.android.sdk.internal.di.SessionId
import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
@SessionScope @SessionScope
@ -43,15 +44,16 @@ internal class SessionListeners @Inject constructor(
fun dispatch(block: (Session, Session.Listener) -> Unit) { fun dispatch(block: (Session, Session.Listener) -> Unit) {
synchronized(listeners) { synchronized(listeners) {
val session = getSession() val session = getSession() ?: return Unit.also {
Timber.w("You don't have any attached session")
}
listeners.forEach { listeners.forEach {
tryOrNull { block(session, it) } tryOrNull { block(session, it) }
} }
} }
} }
private fun getSession(): Session { private fun getSession(): Session? {
return sessionManager.getSessionComponent(sessionId)?.session() return sessionManager.getSessionComponent(sessionId)?.session()
?: throw IllegalStateException("No session found with this id.")
} }
} }

1
newsfragment/3424.bugfix Normal file
View File

@ -0,0 +1 @@
Fix app crashing when signing out