Remove dot-nomedia creation, (by @gsantner, closes #229)

gsantner · Mar 20, 2023 · 6a9f63a · 6a9f63a
1 parent 77433f4
commit 6a9f63a
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 48 deletions.
diff --git a/app/src/main/java/net/gsantner/memetastic/activity/SettingsActivity.java b/app/src/main/java/net/gsantner/memetastic/activity/SettingsActivity.java
@@ -36,13 +36,10 @@
 import net.gsantner.memetastic.service.AssetUpdater;
 import net.gsantner.memetastic.service.ThumbnailCleanupTask;
 import net.gsantner.memetastic.util.AppSettings;
-import net.gsantner.memetastic.util.MediaStoreUtils;
 import net.gsantner.memetastic.util.PermissionChecker;
 import net.gsantner.opoc.preference.GsPreferenceFragmentCompat;
 import net.gsantner.opoc.preference.SharedPreferencesPropertyBackend;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.Date;
 
 import butterknife.BindView;
@@ -173,27 +170,6 @@ public Boolean onPreferenceClicked(Preference preference, String key, int keyRes
                         getActivity().finish();
                     }
                 }
-                if (eq(key, R.string.pref_key__is_show_in_gallery)) {
-                    boolean showInGallery = settings.getDefaultPreferences().getBoolean(key, true);
-                    File memeDirectory = AssetUpdater.getMemesDir(AppSettings.get());
-                    File noMediaFile = new File(memeDirectory, ".nomedia");
-                    if (showInGallery) {
-                        noMediaFile.delete();
-                        MediaStoreUtils.deleteFileFromMediaStore(context, noMediaFile);
-                        File[] files = memeDirectory.listFiles();
-                        for (int i = 0; i < files.length; i++) {
-                            MediaStoreUtils.deleteFileFromMediaStore(context, files[i]);
-                            MediaStoreUtils.addFileToMediaStore(context, files[i]);
-                        }
-                    } else {
-                        try {
-                            noMediaFile.createNewFile();
-                            MediaStoreUtils.addFileToMediaStore(context, noMediaFile);
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
             }
             return null;
         }

diff --git a/app/src/main/java/net/gsantner/memetastic/data/MemeEditorElements.java b/app/src/main/java/net/gsantner/memetastic/data/MemeEditorElements.java
@@ -19,14 +19,14 @@
 #########################################################*/
 package net.gsantner.memetastic.data;
 
+import static net.gsantner.memetastic.data.MemeConfig.Point;
+
 import android.graphics.Bitmap;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.gsantner.memetastic.data.MemeConfig.Point;
-
 /**
  * A memes settings
  */

diff --git a/app/src/main/java/net/gsantner/memetastic/service/AssetUpdater.java b/app/src/main/java/net/gsantner/memetastic/service/AssetUpdater.java
@@ -243,7 +243,6 @@ private void loadConfigFromFolder(File folder, List<MemeData.Font> dataFonts, Li
 
             MemeConfig.Config conf = null;
             File configFile = new File(folder, MEMETASTIC_CONFIG_FILE);
-            FileUtils.touch(new File(folder, ".nomedia"));
             if (configFile.exists()) {
                 try {
                     String contents = FileUtils.readTextFile(configFile);

diff --git a/app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java b/app/src/main/java/net/gsantner/opoc/util/ActivityUtils.java
@@ -106,7 +106,7 @@ public Snackbar showSnackBar(@StringRes int stringResId, boolean showLong) {
 
     public void showSnackBar(@StringRes int stringResId, boolean showLong, @StringRes int actionResId, View.OnClickListener listener) {
         Snackbar.make(_activity.findViewById(android.R.id.content), stringResId,
-                showLong ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT)
+                        showLong ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT)
                 .setAction(actionResId, listener)
                 .show();
     }

diff --git a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java b/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
@@ -9,12 +9,15 @@
 #########################################################*/
 package net.gsantner.opoc.util;
 
+import static android.content.Context.VIBRATOR_SERVICE;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.graphics.Bitmap.CompressFormat;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
-import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -88,10 +91,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import static android.content.Context.VIBRATOR_SERVICE;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static android.graphics.Bitmap.CompressFormat;
-
 @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "ObsoleteSdkInt", "deprecation", "SpellCheckingInspection", "TryFinallyCanBeTryWithResources", "UnusedAssignment", "UnusedReturnValue"})
 public class ContextUtils {
     //

diff --git a/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java b/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java
@@ -9,6 +9,8 @@
 #########################################################*/
 package net.gsantner.opoc.util;
 
+import static android.app.Activity.RESULT_OK;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -70,8 +72,6 @@
 import java.util.Locale;
 import java.util.Random;
 
-import static android.app.Activity.RESULT_OK;
-
 /**
  * A utility class to ease information sharing on Android.
  * Also allows to parse/fetch information out of shared information.

diff --git a/app/src/main/res/values/strings-not_translatable.xml b/app/src/main/res/values/strings-not_translatable.xml
@@ -80,7 +80,6 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pref_key__is_migrated" translatable="false">pref_key__is_migrated</string>
     <string name="pref_key__download_assets_try" translatable="false">pref_key__download_assets_try</string>
     <string name="pref_key__memelist_view_type" translatable="false">pref_key__memelist_view_type</string>
-    <string name="pref_key__is_show_in_gallery" translatable="false">pref_key__is_show_in_gallery</string>
     <string name="pref_key__hidden_meme_templates" translatable="false">pref_key__hidden_meme_templates</string>
 
     <string name="pref_key__more_info__settings" translatable="false">pref_key__more_info__settings</string>

diff --git a/app/src/main/res/xml/preferences_master.xml b/app/src/main/res/xml/preferences_master.xml
@@ -22,9 +22,12 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings">
-
-
-    <PreferenceScreen android:icon="@drawable/ic_grid_on_black_24dp" android:title="@string/overview" android:summary="@string/main_view">
+
+
+    <PreferenceScreen
+        android:icon="@drawable/ic_grid_on_black_24dp"
+        android:summary="@string/main_view"
+        android:title="@string/overview">
 
         <ListPreference
             android:defaultValue="0"
@@ -76,7 +79,10 @@
 
     </PreferenceScreen>
 
-    <PreferenceScreen android:title="@string/editor" android:summary="@string/edit_picture" android:icon="@drawable/ic_edit_black_24dp">
+    <PreferenceScreen
+        android:icon="@drawable/ic_edit_black_24dp"
+        android:summary="@string/edit_picture"
+        android:title="@string/editor">
 
         <CheckBoxPreference
             android:defaultValue="false"
@@ -103,13 +109,11 @@
     </PreferenceScreen>
 
 
-    <PreferenceScreen android:title="@string/picture_viewer" android:icon="@drawable/ic_image_black_24dp" android:summary="@string/pictures_shown_in_gallery_and_this_app">
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:icon="@drawable/ic_photo_library_black_24dp"
-            android:key="@string/pref_key__is_show_in_gallery"
-            android:title="@string/show_in_device_gallery" />
-
+    <PreferenceScreen
+        android:icon="@drawable/ic_image_black_24dp"
+        android:summary="@string/pictures_shown_in_gallery_and_this_app"
+        android:title="@string/picture_viewer">
+
         <Preference
             android:icon="@drawable/ic_delete_sweep_black_24dp"
             android:key="@string/pref_key__cleanup_thumbnails"
@@ -133,4 +137,4 @@
             android:title="@string/language" />
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>