#169: fixed csv import under ao10: now updating both databases works …

…as expected
k3b · Feb 7, 2021 · 99cd036 · 99cd036
1 parent 7f90ca6
commit 99cd036
Showing 1 changed file with 7 additions and 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
@@ -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,