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

Fix login state

Browse source
This commit is contained in:
ganfra 2022-11-10 18:06:44 +01:00
parent 21228c23b2
commit fec43424df
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libraries/matrix/src/main/java/io/element/android/x/matrix/Matrix.kt
View file

@ -7,6 +7,7 @@ import io.element.android.x.matrix.util.logError
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import org.matrix.rustcomponents.sdk.AuthenticationService
import org.matrix.rustcomponents.sdk.Client
@ -26,13 +27,11 @@ class Matrix(
private val baseFolder = File(context.filesDir, "matrix")
private val sessionStore = SessionStore(context)
private val matrixClient = MutableStateFlow<Optional<MatrixClient>>(Optional.empty())
private val isLoggedIn = MutableStateFlow(false)
init {
sessionStore.isLoggedIn()
.distinctUntilChanged()
.onEach { isLoggedIn ->
this.isLoggedIn.value = isLoggedIn
if (!isLoggedIn) {
matrixClient.value = Optional.empty()
}
@ -41,7 +40,7 @@ class Matrix(
}
fun isLoggedIn(): Flow<Boolean> {
return isLoggedIn
return sessionStore.isLoggedIn()
}
fun client(): Flow<Optional<MatrixClient>> {

2
libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixInstance.kt
View file

@ -3,7 +3,6 @@ package io.element.android.x.matrix
import android.annotation.SuppressLint
import android.content.Context
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.GlobalScope
object MatrixInstance {
@ -11,6 +10,7 @@ object MatrixInstance {
private lateinit var instance: Matrix
fun init(context: Context, coroutineScope: CoroutineScope) {
//setupTracing("warn,matrix_sdk::sliding_sync=info")
instance = Matrix(coroutineScope, context)
}