From bac28a9b058e0190df56246445e91588b852032d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 12 Dec 2023 14:53:18 +0100
Subject: [PATCH] Cleanup

---
 .../java/eu/faircode/email/FragmentOptionsMisc.java  |  1 -
 app/src/main/java/eu/faircode/email/Helper.java      | 12 ------------
 app/src/main/java/eu/faircode/email/Log.java         |  6 +-----
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index e54a8b0ca1..efa42885e5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -1730,7 +1730,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                         files.addAll(Helper.listFiles(context.getCacheDir(), MIN_FILE_SIZE));
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                             files.addAll(Helper.listFiles(context.getDataDir(), MIN_FILE_SIZE));
-                        files.addAll(Helper.listFiles(Helper.getExternalFilesDir(context), MIN_FILE_SIZE));
 
                         Collections.sort(files, new Comparator<File>() {
                             @Override
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 9ea4a98f3d..ac749fb178 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -2655,18 +2655,6 @@ public class Helper {
         return dir;
     }
 
-    static File getExternalFilesDir(Context context) {
-        return getExternalFilesDir(context, null);
-    }
-
-    static File getExternalFilesDir(Context context, String type) {
-        File[] dirs = ContextCompat.getExternalFilesDirs(context, type);
-        if (dirs == null || dirs.length == 0)
-            return context.getExternalFilesDir(type);
-        else
-            return dirs[0];
-    }
-
     static String sanitizeFilename(String name) {
         if (name == null)
             return null;
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index e5bbeaf250..a77bcb70c6 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -3464,11 +3464,7 @@ public class Log {
                 if (ai != null)
                     size += write(os, String.format("Source: %s\r\n public: %s\r\n",
                             ai.sourceDir, ai.publicSourceDir));
-                File external = Helper.getExternalFilesDir(context);
-                boolean emulated = (external != null && Environment.isExternalStorageEmulated(external));
-                size += write(os, String.format("Files: %s\r\n  external: %s\r\n  emulated: %b\r\n  storage: %s\r\n",
-                        context.getFilesDir(), external, emulated,
-                        Environment.getExternalStorageDirectory()));
+                size += write(os, String.format("Files: %s\r\n", context.getFilesDir()));
 
                 size += write(os, String.format("Cache: %s\r\n  external: %s\n",
                         context.getCacheDir(), context.getExternalCacheDir()));