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

libraries/core/src/main/java/io/element/android/x/core/compose/TextFieldLocalState.kt

@@ -0,0 +1,11 @@
+package io.element.android.x.core.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+
+
+@Composable
+public fun textFieldState(stateValue: String): MutableState<String> =
+    remember(stateValue) { mutableStateOf(stateValue) }

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

@@ -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)
         }

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

@@ -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()
+    }
 }