From 99cd036d3303e73efc9b25b522f5f1f572c790e1 Mon Sep 17 00:00:00 2001
From: k3b <1374583+k3b@users.noreply.github.com>
Date: Sun, 7 Feb 2021 20:10:44 +0100
Subject: [PATCH] #169: fixed csv import under ao10: now updating both
 databases works as expected

---
 .../java/de/k3b/android/androFotoFinder/tagDB/TagSql.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/tagDB/TagSql.java b/app/src/main/java/de/k3b/android/androFotoFinder/tagDB/TagSql.java
index 98cbc674..18cdc127 100644
--- a/app/src/main/java/de/k3b/android/androFotoFinder/tagDB/TagSql.java
+++ b/app/src/main/java/de/k3b/android/androFotoFinder/tagDB/TagSql.java
@@ -374,7 +374,7 @@ public static Long updateDB(
                 TagSql.setXmpFileModifyDate(dbValues, xmpFilelastModified);
                 TagSql.setFileModifyDate(dbValues, newFullJpgFilePath);
 
-                return TagSql.insertOrUpdateMediaDatabaseFromCsv(
+                return TagSql.execUpdate(
                         dbgContext, oldFullJpgFilePath,
                         TagSql.EXT_LAST_EXT_SCAN_UNKNOWN,
                         dbValues, VISIBILITY.PRIVATE_PUBLIC);
@@ -385,6 +385,12 @@ public static Long updateDB(
         return 0L;
     }
 
+    public static long execUpdate(String dbgContext, String path, long xmpFileDate, ContentValues values, VISIBILITY visibility) {
+        if (!Global.Media.enableXmpNone || isPseudoXmpFileDateVauel(xmpFileDate)) {
+            return getMediaDBApi().execUpdate(dbgContext, path, values, visibility);
+        }
+        return getMediaDBApi().exexUpdateImpl(dbgContext, values, FILTER_EXPR_PATH_AND_XMP_DATE_LESS_THAN, new String[]{path, Long.toString(xmpFileDate)});
+    }
 
     public static Long insertOrUpdateMediaDatabaseFromCsv(
             String dbgContext, String path, long xmpFileDate,