Added error message with occurred exception info while saving by #1605

Open
T8RIN · Jan 20, 2025 · 04a37e8 · 04a37e8
1 parent 9c98d8b
commit 04a37e8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/...omain/src/main/kotlin/ru/tech/imageresizershrinker/core/domain/saving/model/SaveResult.kt b/...omain/src/main/kotlin/ru/tech/imageresizershrinker/core/domain/saving/model/SaveResult.kt
@@ -27,9 +27,11 @@ sealed class SaveResult(
         val isOverwritten: Boolean = false,
     ) : SaveResult(savingPath)
 
-    sealed class Error : SaveResult("") {
-        data object MissingPermissions : Error()
-        data class Exception(val throwable: Throwable) : Error()
+    sealed class Error(open val throwable: Throwable) : SaveResult("") {
+        data object MissingPermissions : Error(IllegalAccessException("MissingPermissions"))
+        data class Exception(
+            override val throwable: Throwable
+        ) : Error(throwable)
     }
 
     fun onSuccess(

diff --git a/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ParseSaveResult.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ParseSaveResult.kt
@@ -127,6 +127,7 @@ internal fun Activity.parseSaveResults(
     } else if (failed < done) {
         essentials.showConfetti()
         val saveResult = results.firstOrNull { it is SaveResult.Success } as? SaveResult.Success
+        val errorSaveResult = results.firstOrNull { it is SaveResult.Error } as? SaveResult.Error
         essentials.showToast(
             message = saveResult?.message
                 ?: getString(
@@ -141,11 +142,25 @@ internal fun Activity.parseSaveResults(
             icon = Icons.Rounded.ErrorOutline,
             duration = ToastDuration.Long
         )
+        essentials.showToast(
+            message = getString(
+                R.string.smth_went_wrong,
+                errorSaveResult?.throwable?.localizedMessage ?: ""
+            )
+        )
     } else {
+        val errorSaveResult = results.firstOrNull { it is SaveResult.Error } as? SaveResult.Error
+
         essentials.showToast(
             message = getString(R.string.failed_to_save, failed),
             icon = Icons.Rounded.ErrorOutline,
             duration = ToastDuration.Long
         )
+        essentials.showToast(
+            message = getString(
+                R.string.smth_went_wrong,
+                errorSaveResult?.throwable?.localizedMessage ?: ""
+            )
+        )
     }
 }