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

Sonar

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