From 184f65eab6f31acc436cf941daf49912ebe63b34 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Tue, 5 Oct 2021 19:38:52 +0900
Subject: [PATCH] minor fixes

---
 .../deckers/thibault/aves/model/NameConflictStrategy.kt     | 2 +-
 .../thibault/aves/model/provider/MediaStoreImageProvider.kt | 6 +++---
 lib/widgets/map/map_page.dart                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/NameConflictStrategy.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/NameConflictStrategy.kt
index f9341bcb7..a6c3bb5a7 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/NameConflictStrategy.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/NameConflictStrategy.kt
@@ -1,7 +1,7 @@
 package deckers.thibault.aves.model
 
 enum class NameConflictStrategy {
-    SKIP, REPLACE, RENAME;
+    RENAME, REPLACE, SKIP;
 
     companion object {
         fun get(name: String?): NameConflictStrategy? {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
index 9fd3dc9c6..d00fe54bd 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
@@ -339,9 +339,9 @@ class MediaStoreImageProvider : ImageProvider() {
     ): FieldMap {
         val sourceFile = File(sourcePath)
         val sourceDir = sourceFile.parent?.let { ensureTrailingSeparator(it) }
-        if (sourceDir == destinationDir) {
-            if (copy) throw Exception("file at path=$sourcePath is already in destination directory")
-            return HashMap<String, Any?>()
+        if (sourceDir == destinationDir && !(copy && nameConflictStrategy == NameConflictStrategy.RENAME)) {
+            // nothing to do unless it's a renamed copy
+            return skippedFieldMap
         }
 
         val sourceFileName = sourceFile.name
diff --git a/lib/widgets/map/map_page.dart b/lib/widgets/map/map_page.dart
index 80cca7dd7..c48bfecce 100644
--- a/lib/widgets/map/map_page.dart
+++ b/lib/widgets/map/map_page.dart
@@ -248,7 +248,7 @@ class _MapPageContentState extends State<MapPageContent> with SingleTickerProvid
                   return ThumbnailScroller(
                     availableWidth: mqWidth,
                     entryCount: regionEntries.length,
-                    entryBuilder: (index) => regionEntries[index],
+                    entryBuilder: (index) => index < regionEntries.length ? regionEntries[index] : null,
                     indexNotifier: _selectedIndexNotifier,
                     onTap: _onThumbnailTap,
                     heroTagger: (entry) => Object.hashAll([regionCollection?.id, entry.uri]),