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

Login: try to fix some stuff around login/logout..

Browse source
This commit is contained in:
ganfra 2022-11-22 12:04:01 +01:00
parent 8f03957c23
commit 0cbf4bf328
5 changed files with 66 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import kotlinx.coroutines.withContext
import org.matrix.rustcomponents.sdk.AuthenticationService
import org.matrix.rustcomponents.sdk.Client
import org.matrix.rustcomponents.sdk.ClientBuilder
import timber.log.Timber
import java.io.File
import java.util.*
import java.util.concurrent.Executors
@ -26,10 +27,10 @@ class Matrix(
main = Dispatchers.Main,
diffUpdateDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
)
private val baseFolder = File(context.filesDir, "matrix")
private val baseDirectory = File(context.filesDir, "sessions")
private val sessionStore = SessionStore(context)
private val matrixClient = MutableStateFlow<Optional<MatrixClient>>(Optional.empty())
private val authService = AuthenticationService(baseFolder.absolutePath)
private val authService = AuthenticationService(baseDirectory.absolutePath)
init {
sessionStore.isLoggedIn()
@ -59,7 +60,7 @@ class Matrix(
?.let { session ->
try {
ClientBuilder()
.basePath(baseFolder.absolutePath)
.basePath(baseDirectory.absolutePath)
.username(session.userId)
.build().apply {
restoreSession(session)
@ -85,7 +86,12 @@ class Matrix(
suspend fun login(username: String, password: String): MatrixClient =
withContext(coroutineDispatchers.io) {
val client = authService.login(username, password, "MatrixRustSDKSample", null)
val client = try {
authService.login(username, password, "ElementX", null)
}catch (failure:Throwable){
Timber.e(failure,"Fail login")
throw failure
}
sessionStore.storeData(client.session())
createMatrixClient(client)
}
@ -95,7 +101,8 @@ class Matrix(
client = client,
sessionStore = sessionStore,
coroutineScope = coroutineScope,
dispatchers = coroutineDispatchers
dispatchers = coroutineDispatchers,
baseDirectory = baseDirectory,
).also {
matrixClient.value = Optional.of(it)
}

16
libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt
View file

@ -14,6 +14,7 @@ import kotlinx.coroutines.withContext
import org.matrix.rustcomponents.sdk.*
import timber.log.Timber
import java.io.Closeable
import java.io.File
import java.util.concurrent.atomic.AtomicBoolean
class MatrixClient internal constructor(
@ -21,6 +22,7 @@ class MatrixClient internal constructor(
private val sessionStore: SessionStore,
private val coroutineScope: CoroutineScope,
private val dispatchers: CoroutineDispatchers,
private val baseDirectory: File,
) : Closeable {
private val clientDelegate = object : ClientDelegate {
@ -114,7 +116,12 @@ class MatrixClient internal constructor(
suspend fun logout() = withContext(dispatchers.io) {
close()
client.logout()
try {
client.logout()
} catch (failure: Throwable) {
Timber.e(failure, "Fail to call logout on HS. Still delete local files.")
}
baseDirectory.deleteSessionDirectory(userID = client.userId())
sessionStore.reset()
}
@ -150,5 +157,10 @@ class MatrixClient internal constructor(
}
}
private fun File.deleteSessionDirectory(userID: String): Boolean {
// Rust sanitises the user ID replacing invalid characters with an _
val sanitisedUserID = userID.replace(":", "_")
val sessionDirectory = File(this, sanitisedUserID)
return sessionDirectory.deleteRecursively()
}
}