Merge branch 'develop' into feature/fga/room_list_api

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -16,6 +16,8 @@
 
 package io.element.android.libraries.matrix.impl
 
+import io.element.android.libraries.androidutils.file.getSizeOfFiles
+import io.element.android.libraries.androidutils.file.safeDelete
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScopeOf
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -229,15 +231,25 @@ class RustMatrixClient constructor(
         client.destroy()
     }
 
+    override suspend fun getCacheSize(): Long {
+        // Do not use client.userId since it can throw if client has been closed (during clear cache)
+        return baseDirectory.getCacheSize(userID = sessionId.value)
+    }
+
+    override suspend fun clearCache() {
+        close()
+        baseDirectory.deleteSessionDirectory(userID = sessionId.value, deleteCryptoDb = false)
+    }
+
     override suspend fun logout() = withContext(dispatchers.io) {
         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.removeSession(client.userId())
         close()
+        baseDirectory.deleteSessionDirectory(userID = sessionId.value, deleteCryptoDb = true)
+        sessionStore.removeSession(sessionId.value)
     }
 
     override suspend fun loadUserDisplayName(): Result<String> = withContext(dispatchers.io) {
@@ -271,11 +283,48 @@ class RustMatrixClient constructor(
 
     override fun roomMembershipObserver(): RoomMembershipObserver = roomMembershipObserver
 
-    private fun File.deleteSessionDirectory(userID: String): Boolean {
+    private suspend fun File.getCacheSize(
+        userID: String,
+        includeCryptoDb: Boolean = false,
+    ): Long = withContext(dispatchers.io) {
         // Rust sanitises the user ID replacing invalid characters with an _
         val sanitisedUserID = userID.replace(":", "_")
-        val sessionDirectory = File(this, sanitisedUserID)
-        return sessionDirectory.deleteRecursively()
+        val sessionDirectory = File(this@getCacheSize, sanitisedUserID)
+        if (includeCryptoDb) {
+            sessionDirectory.getSizeOfFiles()
+        } else {
+            listOf(
+                "matrix-sdk-state.sqlite3",
+                "matrix-sdk-state.sqlite3-shm",
+                "matrix-sdk-state.sqlite3-wal",
+            ).map { fileName ->
+                File(sessionDirectory, fileName)
+            }.sumOf { file ->
+                file.length()
+            }
+        }
+    }
+
+    private suspend fun File.deleteSessionDirectory(
+        userID: String,
+        deleteCryptoDb: Boolean = false,
+    ): Boolean = withContext(dispatchers.io) {
+        // Rust sanitises the user ID replacing invalid characters with an _
+        val sanitisedUserID = userID.replace(":", "_")
+        val sessionDirectory = File(this@deleteSessionDirectory, sanitisedUserID)
+        if (deleteCryptoDb) {
+            // Delete the folder and all its content
+            sessionDirectory.deleteRecursively()
+        } else {
+            // Delete only the state.db file
+            sessionDirectory.listFiles().orEmpty()
+                .filter { it.name.contains("matrix-sdk-state") }
+                .forEach { file ->
+                    Timber.w("Deleting file ${file.name}...")
+                    file.safeDelete()
+                }
+            true
+        }
     }
 }
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt

@@ -32,10 +32,11 @@ class RustNotificationService(
     override fun getNotification(
         userId: SessionId,
         roomId: RoomId,
-        eventId: EventId
+        eventId: EventId,
+        filterByPushRules: Boolean,
     ): Result<NotificationData?> {
         return runCatching {
-            client.getNotificationItem(roomId.value, eventId.value)?.use(notificationMapper::map)
+            client.getNotificationItem(roomId.value, eventId.value, filterByPushRules)?.use(notificationMapper::map)
         }
     }
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt

@@ -374,4 +374,13 @@ class RustMatrixRoom(
             }
         }
     }
+
+    override suspend fun sendLocation(
+        body: String,
+        geoUri: String
+    ): Result<Unit> = withContext(coroutineDispatchers.io) {
+        runCatching {
+            innerRoom.sendLocation(body, geoUri, genTransactionId())
+        }
+    }
 }