fix crash when file names contain invalid characters

SuhasDissa · Oct 13, 2023 · 4e3adcf · 4e3adcf
1 parent ce5203a
commit 4e3adcf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/java/app/suhasdissa/memerize/backend/viewmodels/PhotoViewModel.kt b/app/src/main/java/app/suhasdissa/memerize/backend/viewmodels/PhotoViewModel.kt
@@ -69,13 +69,17 @@ class PhotoViewModel : ViewModel() {
             val outputFile =
                 saveDir.createFile(
                     "image/jpg",
-                    "${meme.title.take(64)}-${UUID.randomUUID().toString().take(8)}"
+                    "${meme.title.take(64)}-${
+                        UUID.randomUUID().toString().take(8)
+                    }.jpg".replace("[\\\\/:*?\"<>|]".toRegex(), "")
                 )
             if (outputFile == null) {
                 withContext(Dispatchers.Main) {
                     downloadState = DownloadState.Error
                 }
-                Toast.makeText(context, "Failed to create file", Toast.LENGTH_LONG).show()
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, "Failed to create file", Toast.LENGTH_LONG).show()
+                }
                 return@launch
             }
             if (bitmap != null) {

diff --git a/app/src/main/java/app/suhasdissa/memerize/backend/viewmodels/PlayerViewModel.kt b/app/src/main/java/app/suhasdissa/memerize/backend/viewmodels/PlayerViewModel.kt
@@ -22,7 +22,9 @@ class PlayerViewModel() : ViewModel() {
 
     @RequiresApi(Build.VERSION_CODES.O)
     fun downloadVideo(context: Context, meme: Meme) {
-        val fileName = "${meme.title.take(64)}-${UUID.randomUUID().toString().take(8)}"
+        val fileName = "${meme.title.take(64)}-${
+            UUID.randomUUID().toString().take(8)
+        }".replace("[\\\\/:*?\"<>|]".toRegex(), "")
         viewModelScope.launch {
             downloadState = DownloadState.Loading
             val downloader = RedditVideoDownloader()