#169: Fixed media scanner

k3b · Feb 6, 2021 · e52e8f3 · e52e8f3
1 parent 46f3300
commit e52e8f3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 41 deletions.
diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/PhotoPropertiesEditActivity.java b/app/src/main/java/de/k3b/android/androFotoFinder/PhotoPropertiesEditActivity.java
@@ -73,6 +73,7 @@
 import de.k3b.io.VISIBILITY;
 import de.k3b.io.collections.SelectedFiles;
 import de.k3b.io.filefacade.FileFacade;
+import de.k3b.io.filefacade.IFile;
 import de.k3b.media.IPhotoProperties;
 import de.k3b.media.PhotoPropertiesAsString;
 import de.k3b.media.PhotoPropertiesDiffCopy;
@@ -229,7 +230,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             if (null == currentData) {
                 // there is no ExifParam : infer exif from jpg file
                 SelectedFiles items = getSelectedFiles("onCreate ", this, intent, false);
-                File first = (items != null) ? items.getFile(0) : null;
+                IFile first = (items != null) ? items.getIFile (0) : null;
 
                 if ((first != null) && (first.exists())) {
                     currentData = PhotoPropertiesMediaFilesScanner.getInstance(this).getExifFromFile(first);

diff --git a/app/src/main/java/de/k3b/android/util/PhotoPropertiesMediaFilesScanner.java b/app/src/main/java/de/k3b/android/util/PhotoPropertiesMediaFilesScanner.java
@@ -144,11 +144,6 @@ public static boolean isNoMedia(IFile path, int maxLevel, Map<String, Boolean> n
     /**
      * return true, if file is in a ".nomedia" dir
      */
-    @Deprecated
-    public static boolean isNoMedia(String path, int maxLevel) {
-        return FileUtils.isNoMedia(path, maxLevel);
-    }
-
     @Deprecated
     public static boolean isNoMedia(String path) {
         return FileUtils.isNoMedia(path, PhotoPropertiesMediaFilesScanner.DEFAULT_SCAN_DEPTH);
@@ -252,34 +247,18 @@ private int insertIntoMediaDatabase(Context context, IFile[] newPathNames) {
                     if (id != null) {
                         // already exists
                         modifyCount += update_Android42("PhotoPropertiesMediaFilesScanner.insertIntoMediaDatabase already existing "
-                                , context, id, fileName.getFile());
+                                , context, id, fileName);
                     } else {
                         modifyCount += insert_Android42(
                                 "PhotoPropertiesMediaFilesScanner.insertIntoMediaDatabase new item ",
-                                context, fileName.getFile());
+                                context, fileName);
                     }
                 }
             }
         }
         return modifyCount;
     }
 
-    /**  */
-    public Long insertOrUpdateMediaDatabase(String dbgContext, Context context,
-                                            String dbUpdateFilterJpgFullPathName, File currentJpgFile,
-                                            Long updateSuccessValue) {
-        if ((currentJpgFile != null) && currentJpgFile.exists() && currentJpgFile.canRead()) {
-            ContentValues values = createDefaultContentValues();
-            getExifFromFile(values, currentJpgFile);
-            Long result = FotoSql.getMediaDBApi().insertOrUpdateMediaDatabase(
-                    dbgContext, dbUpdateFilterJpgFullPathName,
-                    values, VISIBILITY.PRIVATE_PUBLIC, updateSuccessValue);
-
-            return result;
-        }
-        return null;
-    }
-
     /**
      * delete oldPathNames from media database
      */
@@ -367,20 +346,10 @@ private int renameInMediaDatabase(Context context, Map<String, String> old2NewFi
     }
 
     /** updates values with current values of file */
-    @Deprecated
-    public PhotoPropertiesMediaDBContentValues getExifFromFile(File jpgFile) {
-        return getExifFromFile(createDefaultContentValues(), jpgFile);
-    }
-
     public PhotoPropertiesMediaDBContentValues getExifFromFile(IFile jpgFile) {
         return getExifFromFile(createDefaultContentValues(), jpgFile);
     }
 
-    @Deprecated
-    protected PhotoPropertiesMediaDBContentValues getExifFromFile(ContentValues values, File jpgFile) {
-        return getExifFromFile(values, FileFacade.convert("PhotoPropertiesMediaFilesScanner getExifFromFile from file", jpgFile));
-    }
-
     /** updates values with current values of file. */
     protected PhotoPropertiesMediaDBContentValues getExifFromFile(ContentValues values, IFile jpgFile) {
         try {
@@ -519,7 +488,7 @@ private static void setFieldIfNeccessary(ContentValues values, String fieldName,
         }
     }
 
-    private int update_Android42(String dbgContext, Context context, long id, File file) {
+    private int update_Android42(String dbgContext, Context context, long id, IFile file) {
         if ((file != null) && file.exists() && file.canRead()) {
             ContentValues values = createDefaultContentValues();
             getExifFromFile(values, file);
@@ -541,7 +510,7 @@ protected ContentValues createDefaultContentValues() {
         return contentValues;
     }
 
-    private int insert_Android42(String dbgContext, Context context, File file) {
+    private int insert_Android42(String dbgContext, Context context, IFile file) {
         if ((file != null) && file.exists() && file.canRead()) {
             ContentValues values = createDefaultContentValues();
             FotoSql.addDateAdded(values);

diff --git a/app/src/main/java/de/k3b/android/widget/BaseQueryActivity.java b/app/src/main/java/de/k3b/android/widget/BaseQueryActivity.java
@@ -355,7 +355,7 @@ private QueryParameter calculateEffectiveGalleryContentQuery(QueryParameter root
                                     BaseQueryActivity.this, null, uri, null);
                             if (albumQuery != null) {
                                 result.getWhereFrom(albumQuery, true);
-                            } else if (PhotoPropertiesMediaFilesScanner.isNoMedia(path, PhotoPropertiesMediaFilesScanner.DEFAULT_SCAN_DEPTH)) {
+                            } else if (PhotoPropertiesMediaFilesScanner.isNoMedia(path)) {
                                 // do not show (parent-)directories that contain ".nomedia"
                                 return null;
                             } else {

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -19,8 +19,6 @@
     <string-array name="pref_locale_names" translatable="false">
         <item>@string/settings_locale_os_language</item>
         <item>العربية (Arabic)</item> 
-		<item>简体中文 (simplified Chinese)</item>
-		<item>繁体中文 (traditional Chinese)</item>
         <item>Deutsch (German)</item>
         <item>English</item>
         <item>Espanol (Spanish)</item>
@@ -37,13 +35,13 @@
         <item>Русский (Russian)</item>
 		<item>Türk (Turkish)</item>
         <item>Українська (Ukrainian)</item>
+        <item>简体中文 (simplified Chinese)</item>
+        <item>繁体中文 (traditional Chinese)</item>
         <item>(For Translators)</item>
     </string-array>
     <string-array name="pref_locale_value_keys" translatable="false">
         <item></item>
         <item>ar</item>
-		<item>zh-CN</item>
-		<item>zh-TW</item>
         <item>de</item>
         <item>en</item>
         <item>es</item>
@@ -60,6 +58,8 @@
         <item>ru</item>
         <item>tr</item>
         <item>uk</item>
+        <item>zh-CN</item>
+        <item>zh-TW</item>
         <item>zz</item>
     </string-array>