From 832a683607f778db91ef3eaf2068f25dd65649ac Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Tue, 17 Sep 2024 19:41:41 +0200
Subject: [PATCH] minor fixes

---
 android/app/build.gradle                                      | 4 ++--
 .../deckers/thibault/aves/channel/calls/MediaStoreHandler.kt  | 2 +-
 .../deckers/thibault/aves/model/provider/FileImageProvider.kt | 1 +
 .../deckers/thibault/aves/model/provider/ImageProvider.kt     | 2 ++
 lib/services/media/media_store_service.dart                   | 4 +++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index fe76fbbec..897c3c32d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -208,8 +208,8 @@ dependencies {
     // - https://jitpack.io/p/deckerst/mp4parser
     // - https://jitpack.io/p/deckerst/pixymeta-android
     implementation 'com.github.deckerst:Android-TiffBitmapFactory:90c06eebf4'
-    implementation 'com.github.deckerst.mp4parser:isoparser:86d4b6baa1'
-    implementation 'com.github.deckerst.mp4parser:muxer:86d4b6baa1'
+    implementation 'com.github.deckerst.mp4parser:isoparser:d5caf7a3dd'
+    implementation 'com.github.deckerst.mp4parser:muxer:d5caf7a3dd'
     implementation 'com.github.deckerst:pixymeta-android:9ec7097f17'
     implementation project(':exifinterface')
 
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaStoreHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaStoreHandler.kt
index da82657a4..64b440b62 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaStoreHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaStoreHandler.kt
@@ -64,7 +64,7 @@ class MediaStoreHandler(private val context: Context) : MethodCallHandler {
             } catch (e: Exception) {
                 // may yield `IllegalArgumentException: Volume external_primary not found`
                 val volumes = MediaStore.getExternalVolumeNames(context).joinToString(", ")
-                result.error("getGeneration-primary", e.message + " (available volumes are $volumes)", e)
+                result.error("getGeneration-primary", e.message + " (available volumes are [$volumes])", e)
                 return
             }
         } else {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
index 4405fe5e0..c145737e4 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
@@ -50,6 +50,7 @@ internal class FileImageProvider : ImageProvider() {
                 }
             } catch (e: SecurityException) {
                 callback.onFailure(e)
+                return
             }
         }
         entry.fillPreCatalogMetadata(context, safe = false)
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
index a5f56c454..1d6d6a60a 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
@@ -209,6 +209,7 @@ abstract class ImageProvider {
     ) {
         if (!supportedExportMimeTypes.contains(imageExportMimeType)) {
             callback.onFailure(Exception("unsupported export MIME type=$imageExportMimeType"))
+            return
         }
 
         val targetDirDocFile = StorageUtils.createDirectoryDocIfAbsent(activity, targetDir)
@@ -858,6 +859,7 @@ abstract class ImageProvider {
             }
         } catch (e: NoClassDefFoundError) {
             callback.onFailure(e)
+            return false
         } catch (e: Exception) {
             callback.onFailure(e)
             return false
diff --git a/lib/services/media/media_store_service.dart b/lib/services/media/media_store_service.dart
index f60414ee7..3e1e8511a 100644
--- a/lib/services/media/media_store_service.dart
+++ b/lib/services/media/media_store_service.dart
@@ -69,7 +69,9 @@ class PlatformMediaStoreService implements MediaStoreService {
     try {
       return await _platform.invokeMethod('getGeneration');
     } on PlatformException catch (e, stack) {
-      await reportService.recordError(e, stack);
+      if (e.code != 'getGeneration-primary') {
+        await reportService.recordError(e, stack);
+      }
     }
     return null;
   }