Merge branch 'develop' into handle_calling_permissions

wireapp · Sep 1, 2023 · c2d50ac · c2d50ac
2 parents fd0d9e3 + 231b06f
commit c2d50ac
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/util/FileManager.kt b/app/src/main/kotlin/com/wire/android/util/FileManager.kt
@@ -24,9 +24,9 @@ import android.content.Context
 import android.net.Uri
 import com.wire.android.appLogger
 import com.wire.android.ui.home.conversations.model.AssetBundle
-import com.wire.kalium.logic.data.asset.AttachmentType
 import com.wire.android.util.dispatchers.DefaultDispatcherProvider
 import com.wire.android.util.dispatchers.DispatcherProvider
+import com.wire.kalium.logic.data.asset.AttachmentType
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.withContext
 import okio.Path

diff --git a/app/src/main/kotlin/com/wire/android/util/FileUtil.kt b/app/src/main/kotlin/com/wire/android/util/FileUtil.kt
@@ -160,6 +160,8 @@ fun ContentResolver.copyFile(destinationUri: Uri, sourcePath: Path) {
 }
 
 private fun Context.saveFileDataToMediaFolder(assetName: String, downloadedDataPath: Path, fileSize: Long, mimeType: String): Uri? {
+    val normalizedFileName = assetName.normalizeFileName()
+
     val resolver = contentResolver
     val directory = Environment.getExternalStoragePublicDirectory(
         when {
@@ -171,7 +173,7 @@ private fun Context.saveFileDataToMediaFolder(assetName: String, downloadedDataP
     )
     directory.mkdirs()
     val contentValues = ContentValues().apply {
-        val availableAssetName = findFirstUniqueName(directory, assetName.ifEmpty { ATTACHMENT_FILENAME })
+        val availableAssetName = findFirstUniqueName(directory, normalizedFileName.ifEmpty { ATTACHMENT_FILENAME })
         put(DISPLAY_NAME, availableAssetName)
         put(MIME_TYPE, mimeType)
         put(SIZE, fileSize)
@@ -189,7 +191,7 @@ private fun Context.saveFileDataToMediaFolder(assetName: String, downloadedDataP
     val insertedUri = resolver.insert(externalContentUri, contentValues) ?: run {
         val authority = getProviderAuthority()
         // we need to find the next available name with copy counter by ourselves before copying
-        val availableAssetName = findFirstUniqueName(directory, assetName.ifEmpty { ATTACHMENT_FILENAME })
+        val availableAssetName = findFirstUniqueName(directory, normalizedFileName.ifEmpty { ATTACHMENT_FILENAME })
         val destinationFile = File(directory, availableAssetName)
         FileProvider.getUriForFile(this, authority, destinationFile)
     }

diff --git a/app/src/main/kotlin/com/wire/android/util/StringUtil.kt b/app/src/main/kotlin/com/wire/android/util/StringUtil.kt
@@ -47,3 +47,5 @@ fun String.toTitleCase(delimiter: String = " ", separator: String = " "): String
     }
 
 fun String.capitalizeFirstLetter(): String = lowercase().replaceFirstChar(Char::titlecaseChar)
+
+fun String.normalizeFileName(): String = this.replace("/", "")
diff --git a/app/src/test/kotlin/com/wire/android/util/StringUtilTest.kt b/app/src/test/kotlin/com/wire/android/util/StringUtilTest.kt
@@ -36,4 +36,12 @@ class StringUtilTest {
         val actual = input.toTitleCase()
         assert(expected == actual)
     }
+
+    @Test
+    fun givenString_whenNormalizingAsFileName_thenAllSlashesAreRemoved() {
+        val input = "this/is/a/test"
+        val expected = "thisisatest"
+        val actual = input.normalizeFileName()
+        assert(expected == actual)
+    }
 }