Merge pull request #66 from vector-im/feature/bma/sonar

Sonar / Kover / Codecov

libraries/androidutils/build.gradle.kts

@@ -26,4 +26,5 @@ android {
 dependencies {
     implementation(libs.timber)
     implementation(libs.androidx.corektx)
+    implementation(projects.libraries.core)
 }

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.androidutils.file
+
+import io.element.android.libraries.core.data.tryOrNull
+import timber.log.Timber
+import java.io.File
+
+fun File.safeDelete() {
+    tryOrNull(
+        onError = {
+            Timber.e(it, "Error, unable to delete file $path")
+        },
+        operation = {
+            if (delete().not()) {
+                Timber.w("Warning, unable to delete file $path")
+            }
+        }
+    )
+}

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/compressFile.kt

@@ -32,7 +32,7 @@ fun compressFile(file: File): File? {
     val dstFile = file.resolveSibling(file.name + ".gz")
 
     if (dstFile.exists()) {
-        dstFile.delete()
+        dstFile.safeDelete()
     }
 
     return try {

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

@@ -87,7 +87,7 @@ internal class RustMatrixClient internal constructor(
         .addView(slidingSyncView)
         .build()
 
-    private val slidingSyncObserverProxy = SlidingSyncObserverProxy(coroutineScope, dispatchers)
+    private val slidingSyncObserverProxy = SlidingSyncObserverProxy(coroutineScope)
     private val roomSummaryDataSource: RustRoomSummaryDataSource =
         RustRoomSummaryDataSource(
             slidingSyncObserverProxy.updateSummaryFlow,

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/sync/SlidingSyncObserverProxy.kt

@@ -16,7 +16,6 @@
 
 package io.element.android.libraries.matrix.sync
 
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -30,7 +29,6 @@ private const val BUFFER_SIZE = 64
 
 class SlidingSyncObserverProxy(
     private val coroutineScope: CoroutineScope,
-    private val coroutineDispatchers: CoroutineDispatchers
 ) : SlidingSyncObserver {
 
     private val updateSummaryMutableFlow =
@@ -39,7 +37,7 @@ class SlidingSyncObserverProxy(
 
     override fun didReceiveSyncUpdate(summary: UpdateSummary) {
         if (summary.rooms.isEmpty()) return
-        coroutineScope.launch(coroutineDispatchers.io) {
+        coroutineScope.launch {
             updateSummaryMutableFlow.emit(summary)
         }
     }