Added ".nomedia" file to backups to avoid media scan (closes #974)

federicoiosue · Apr 22, 2024 · b3c106c · b3c106c
1 parent 4590acb
commit b3c106c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 74 deletions.
diff --git a/omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/BackupHelperTest.java b/omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/BackupHelperTest.java
@@ -89,7 +89,8 @@ public void exportNotes_nothingToExport() throws IOException {
     BackupHelper.exportNotes(backupDir);
 
     assertTrue(backupDir.exists());
-    assertEquals(0, backupDir.listFiles().size());
+    assertTrue(backupDir.findFile(".nomedia").exists());
+    assertEquals(1, backupDir.listFiles().size());
   }
 
   @Test
@@ -101,14 +102,16 @@ public void exportNotes() throws IOException {
     BackupHelper.exportNotes(backupDir);
 
     assertTrue(backupDir.exists());
-    assertEquals(4, backupDir.listFiles().size());
+    assertTrue(backupDir.findFile(".nomedia").exists());
+    assertEquals(5, backupDir.listFiles().size());
   }
 
   @Test
   public void exportNote() {
     Note note = createTestNote("test title", "test content", 0);
 
     BackupHelper.exportNote(backupDir, note);
+
     var noteFiles = from(backupDir.listFiles())
         .filter(f -> f.getName().matches("\\d{13}.json")).toList().toBlocking().single();
     assertEquals(1, noteFiles.size());

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/BackupHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/BackupHelper.java
@@ -66,6 +66,7 @@
 public final class BackupHelper {
 
   public static void exportNotes(DocumentFileCompat backupDir) {
+    backupDir.createFile("", ".nomedia");
     for (Note note : DbHelper.getInstance(true).getAllNotes(false)) {
       exportNote(backupDir, note);
     }

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/StorageHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/StorageHelper.java
@@ -299,26 +299,6 @@ public static File getExternalStoragePublicDir() {
         + File.separator + Constants.EXTERNAL_STORAGE_FOLDER + File.separator);
   }
 
-  public static File getOrCreateBackupDir(String backupName) {
-    File backupDir = new File(getOrCreateExternalStoragePublicDir(), backupName);
-    if (!backupDir.exists() && backupDir.mkdirs()) {
-      createNoMediaFile(backupDir);
-    }
-    return backupDir;
-  }
-
-
-  private static void createNoMediaFile(File folder) {
-    try {
-      boolean created = new File(folder, ".nomedia").createNewFile();
-      if (!created) {
-        LogDelegate.w("File .nomedia already existing into " + folder.getAbsolutePath());
-      }
-    } catch (IOException e) {
-      LogDelegate.e("Error creating .nomedia file into backup folder");
-    }
-  }
-
 
   public static File getSharedPreferencesFile(Context mContext) {
     File appData = mContext.getFilesDir().getParentFile();

diff --git a/omniNotes/src/test/java/it/feio/android/omninotes/utils/StorageHelperTest.java b/omniNotes/src/test/java/it/feio/android/omninotes/utils/StorageHelperTest.java