[bug] Fix crash in Android Navigator: #412

ARK-Builders · Dec 14, 2023 · 8c9fef2 · 8c9fef2
1 parent c7d14c1
commit 8c9fef2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-permission
-        android:requiredFeature="@string/ark_file_picker_pick"
         android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
 

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagLabeledNStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagLabeledNStorage.kt
@@ -27,8 +27,13 @@ class TagLabeledNStorage(
     override suspend fun init() {
         val storage = locateStorage()
         if (storage?.exists() == true) {
-            val json = Json.decodeFromStream<JsonTagLabeledN>(storage.inputStream())
-            tagLabeledAmount.putAll(json.data)
+            try {
+                val json = Json.decodeFromStream<JsonTagLabeledN>(storage.inputStream())
+                tagLabeledAmount.putAll(json.data)
+            } catch (exception: Exception) {
+                Timber.e("TagLabeledNStorage.init exception: " + exception.message)
+            }
+
         } else {
             index.allIds()
                 .associateWith { tagsStorage.getTags(it) }

diff --git a/.../arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewImageViewHolder.kt b/.../arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewImageViewHolder.kt
@@ -20,7 +20,7 @@ import dev.arkbuilders.arklib.ResourceId
 import dev.arkbuilders.arklib.data.meta.Metadata
 import dev.arkbuilders.arklib.data.preview.PreviewLocator
 import dev.arkbuilders.arklib.data.preview.PreviewStatus
-import dev.arkbuilders.arklib.utils.ImageUtils.loadGlideZoomImage
+import dev.arkbuilders.arklib.utils.ImageUtils.loadImage
 import dev.arkbuilders.arklib.utils.ImageUtils.loadSubsamplingImage
 import timber.log.Timber
 
@@ -95,7 +95,7 @@ class PreviewImageViewHolder(
         }
 
         val path = locator.fullscreen()
-        loadGlideZoomImage(id, path, ivZoom)
+        loadImage(id, path, ivZoom, false)
         loadSubsamplingImage(path, ivSubsampling)
     }