[i216] fix audio recording uploading

CHANGELOG.md

@@ -12,6 +12,7 @@
 
 ## stream-chat-android-client
 ### 🐞 Fixed
+- Fixed audio recording not being uploaded [#5066](https://github.com/GetStream/stream-chat-android/pull/5066)
 
 ### ⬆️ Improved
 

stream-chat-android-client/src/androidTest/java/io/getstream/chat/android/client/poc/ClientInstrumentationTests.kt

@@ -112,7 +112,8 @@ internal class ClientInstrumentationTests {
         runOnUi {
             val client = ChatClient.Builder(apiKey, context).build()
             client.getGuestToken("test-user-id", "Test name").enqueue {
-                client.connectUser(it.data().user, it.data().token).enqueue(initCallback)
+                val data = it.getOrThrow()
+                client.connectUser(data.user, data.token).enqueue(initCallback)
             }
             client.subscribe(connectedEventConsumer::onEvent)
         }.andThen {

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/uploader/StreamFileUploader.kt

@@ -26,12 +26,13 @@ import io.getstream.result.Result
 import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.asRequestBody
 import java.io.File
-import java.net.URI
 
 internal class StreamFileUploader(
     private val retrofitCdnApi: RetrofitCdnApi,
 ) : FileUploader {
 
+    private val filenameSanitizer = FilenameSanitizer()
+
     override fun sendFile(
         channelType: String,
         channelId: String,
@@ -40,7 +41,7 @@ internal class StreamFileUploader(
         callback: ProgressCallback,
     ): Result<UploadedFile> {
         val body = file.asRequestBody(file.getMediaType())
-        val filename = URI(null, null, file.name, null).toASCIIString()
+        val filename = filenameSanitizer.sanitize(file.name)
         val part = MultipartBody.Part.createFormData("file", filename, body)
 
         return retrofitCdnApi.sendFile(
@@ -60,7 +61,7 @@ internal class StreamFileUploader(
         file: File,
     ): Result<UploadedFile> {
         val body = file.asRequestBody(file.getMediaType())
-        val filename = URI(null, null, file.name, null).toASCIIString()
+        val filename = filenameSanitizer.sanitize(file.name)
         val part = MultipartBody.Part.createFormData("file", filename, body)
 
         return retrofitCdnApi.sendFile(
@@ -81,7 +82,7 @@ internal class StreamFileUploader(
         callback: ProgressCallback,
     ): Result<UploadedImage> {
         val body = file.asRequestBody(file.getMediaType())
-        val filename = URI(null, null, file.name, null).toASCIIString()
+        val filename = filenameSanitizer.sanitize(file.name)
         val part = MultipartBody.Part.createFormData("file", filename, body)
 
         return retrofitCdnApi.sendImage(
@@ -101,7 +102,7 @@ internal class StreamFileUploader(
         file: File,
     ): Result<UploadedImage> {
         val body = file.asRequestBody(file.getMediaType())
-        val filename = URI(null, null, file.name, null).toASCIIString()
+        val filename = filenameSanitizer.sanitize(file.name)
         val part = MultipartBody.Part.createFormData("file", filename, body)
 
         return retrofitCdnApi.sendImage(
@@ -140,3 +141,36 @@ internal class StreamFileUploader(
         ).execute().toUnitResult()
     }
 }
+
+private class FilenameSanitizer {
+    companion object {
+        private const val MAX_NAME_LEN = 255
+        private const val EMPTY = ""
+    }
+
+    private val allowedChars = ('a'..'z') + ('A'..'Z') + ('0'..'9') + '-' + '_'
+
+    fun sanitize(filename: String): String = try {
+        sanitizeInternal(filename)
+    } catch (_: Throwable) {
+        filename
+    }
+
+    private fun sanitizeInternal(filename: String): String {
+        // Separate the extension and the base name
+        val extension = filename.substringAfterLast(delimiter = '.', missingDelimiterValue = EMPTY)
+        val baseName = if (extension.isNotEmpty()) filename.removeSuffix(suffix = ".$extension") else filename
+
+        // Replace invalid characters in the base name
+        var sanitizedBaseName = baseName.map { if (it in allowedChars) it else '_' }.joinToString(EMPTY)
+
+        // Truncate the base name if it is too long
+        val maxBaseNameLength = MAX_NAME_LEN - extension.length - 1 // Adjust for the extension and dot
+        if (sanitizedBaseName.length > maxBaseNameLength) {
+            sanitizedBaseName = sanitizedBaseName.substring(0, maxBaseNameLength)
+        }
+
+        // Reconstruct the filename with the extension
+        return if (extension.isNotEmpty()) "$sanitizedBaseName.$extension" else sanitizedBaseName
+    }
+}