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

Sonar

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

@@ -35,6 +35,19 @@ fun File.safeDelete() {
     )
 }
 
+fun File.safeRenameTo(dest: File) {
+    tryOrNull(
+        onError = {
+            Timber.e(it, "Error, unable to rename file $path to ${dest.path}")
+        },
+        operation = {
+            if (renameTo(dest).not()) {
+                Timber.w("Warning, unable to rename file $path to ${dest.path}")
+            }
+        }
+    )
+}
+
 fun Context.createTmpFile(baseDir: File = cacheDir, extension: String? = null): File {
     val suffix = extension?.let { ".$extension" }
     return File.createTempFile(UUID.randomUUID().toString(), suffix, baseDir).apply { mkdirs() }

libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt

@@ -24,6 +24,7 @@ import androidx.exifinterface.media.ExifInterface
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.androidutils.file.createTmpFile
 import io.element.android.libraries.androidutils.file.getFileName
+import io.element.android.libraries.androidutils.file.safeRenameTo
 import io.element.android.libraries.androidutils.media.runAndRelease
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.data.tryOrNull
@@ -105,7 +106,7 @@ class AndroidMediaPreProcessor @Inject constructor(
     private fun MediaUploadInfo.postProcess(uri: Uri): MediaUploadInfo {
         val name = context.getFileName(uri) ?: return this
         val renamedFile = File(context.cacheDir, name).also {
-            file.renameTo(it)
+            file.safeRenameTo(it)
         }
         return when (this) {
             is MediaUploadInfo.AnyFile -> copy(file = renamedFile)

libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/VideoCompressor.kt

@@ -21,6 +21,7 @@ import android.net.Uri
 import com.otaliastudios.transcoder.Transcoder
 import com.otaliastudios.transcoder.TranscoderListener
 import io.element.android.libraries.androidutils.file.createTmpFile
+import io.element.android.libraries.androidutils.file.safeDelete
 import io.element.android.libraries.di.ApplicationContext
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
@@ -46,12 +47,12 @@ class VideoCompressor @Inject constructor(
                 }
 
                 override fun onTranscodeCanceled() {
-                    tmpFile.delete()
+                    tmpFile.safeDelete()
                     close()
                 }
 
                 override fun onTranscodeFailed(exception: Throwable) {
-                    tmpFile.delete()
+                    tmpFile.safeDelete()
                     close(exception)
                 }
             })

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventPersistence.kt

@@ -18,6 +18,7 @@ package io.element.android.libraries.push.impl.notifications
 
 import android.content.Context
 import io.element.android.libraries.androidutils.file.EncryptedFileFactory
+import io.element.android.libraries.androidutils.file.safeDelete
 import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.ApplicationContext
@@ -70,7 +71,7 @@ class NotificationEventPersistence @Inject constructor(
     fun persistEvents(queuedEvents: NotificationEventQueue) {
         Timber.tag(loggerTag.value).d("Serializing ${queuedEvents.rawEvents().size} NotifiableEvent(s)")
         // Always delete file before writing, or encryptedFile.openFileOutput() will throw
-        file.delete()
+        file.safeDelete()
         if (queuedEvents.isEmpty()) return
         try {
             encryptedFile.openFileOutput().use { fos ->