From 270b520b9feeaeebea2964a3971dc99e44fc206e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 1 May 2022 08:48:20 +0200
Subject: [PATCH] Avoid cache dir quota

---
 app/src/main/java/eu/faircode/email/ActivityBase.java     | 2 +-
 app/src/main/java/eu/faircode/email/ActivityEML.java      | 2 +-
 .../main/java/eu/faircode/email/AdapterCertificate.java   | 2 +-
 app/src/main/java/eu/faircode/email/AdapterMessage.java   | 4 ++--
 app/src/main/java/eu/faircode/email/ContactInfo.java      | 6 +++---
 app/src/main/java/eu/faircode/email/FragmentCompose.java  | 4 ++--
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 2 +-
 app/src/main/java/eu/faircode/email/ImageHelper.java      | 2 +-
 app/src/main/java/eu/faircode/email/WorkerCleanup.java    | 8 ++++----
 app/src/main/res/xml/fileprovider_paths.xml               | 8 ++++----
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index b8fde8c298..55b1c98752 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -466,7 +466,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
             if (TextUtils.isEmpty(fname))
                 return uri;
 
-            File dir = new File(getCacheDir(), "shared");
+            File dir = new File(getFilesDir(), "shared");
             if (!dir.exists())
                 dir.mkdir();
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index 2705b35010..e35ef834cf 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -187,7 +187,7 @@ public class ActivityEML extends ActivityBase {
                         if (uri == null)
                             throw new FileNotFoundException();
 
-                        File dir = new File(context.getCacheDir(), "shared");
+                        File dir = new File(context.getFilesDir(), "shared");
                         if (!dir.exists())
                             dir.mkdir();
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterCertificate.java b/app/src/main/java/eu/faircode/email/AdapterCertificate.java
index 6537af42af..c5bbb66eb9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterCertificate.java
+++ b/app/src/main/java/eu/faircode/email/AdapterCertificate.java
@@ -132,7 +132,7 @@ public class AdapterCertificate extends RecyclerView.Adapter<AdapterCertificate.
                             if (certificate == null)
                                 return null;
 
-                            File dir = new File(context.getCacheDir(), "shared");
+                            File dir = new File(context.getFilesDir(), "shared");
                             if (!dir.exists())
                                 dir.mkdir();
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6119ac1d50..da42587ecf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3495,7 +3495,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             response.setMethod(Method.REPLY);
                             response.addEvent(ev);
 
-                            File dir = new File(context.getCacheDir(), "calendar");
+                            File dir = new File(context.getFilesDir(), "calendar");
                             if (!dir.exists())
                                 dir.mkdir();
                             File ics = new File(dir, message.id + ".ics");
@@ -6362,7 +6362,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             element.attr("x-computed", computed);
                     }
 
-                    File dir = new File(context.getCacheDir(), "shared");
+                    File dir = new File(context.getFilesDir(), "shared");
                     if (!dir.exists())
                         dir.mkdir();
 
diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index 015b2b6cb5..05913ba40b 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -172,7 +172,7 @@ public class ContactInfo {
 
         // Favicons
         Log.i("Cleanup favicons");
-        File[] favicons = new File(context.getCacheDir(), "favicons").listFiles();
+        File[] favicons = new File(context.getFilesDir(), "favicons").listFiles();
         if (favicons != null)
             for (File file : favicons)
                 if (file.lastModified() + CACHE_FAVICON_DURATION < now) {
@@ -194,7 +194,7 @@ public class ContactInfo {
         if (!files)
             return;
 
-        final File dir = new File(context.getCacheDir(), "favicons");
+        final File dir = new File(context.getFilesDir(), "favicons");
         executorFavicon.submit(new Runnable() {
             @Override
             public void run() {
@@ -322,7 +322,7 @@ public class ContactInfo {
                 final String domain = d.toLowerCase(Locale.ROOT);
                 final String email = info.email.toLowerCase(Locale.ROOT);
 
-                File dir = new File(context.getCacheDir(), "favicons");
+                File dir = new File(context.getFilesDir(), "favicons");
                 if (!dir.exists())
                     dir.mkdir();
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 662e39f9e6..223e707970 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2987,7 +2987,7 @@ public class FragmentCompose extends FragmentBase {
                 });
                 snackbar.show();
             } else {
-                File dir = new File(getContext().getCacheDir(), "photo");
+                File dir = new File(getContext().getFilesDir(), "photo");
                 if (!dir.exists())
                     dir.mkdir();
                 File file = new File(dir, working + ".jpg");
@@ -4327,7 +4327,7 @@ public class FragmentCompose extends FragmentBase {
 
             if (BuildConfig.APPLICATION_ID.equals(uri.getAuthority())) {
                 // content://eu.faircode.email/photo/nnn.jpg
-                File tmp = new File(context.getCacheDir(), uri.getPath());
+                File tmp = new File(context.getFilesDir(), uri.getPath());
                 Log.i("Deleting " + tmp);
                 if (!tmp.delete())
                     Log.w("Error deleting " + tmp);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 7c098eed29..4f1b8e027e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -9111,7 +9111,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 HtmlHelper.embedInlineImages(context, id, document, true);
 
                 // onPageFinished will not be called if not all images can be loaded
-                File dir = new File(context.getCacheDir(), "images");
+                File dir = new File(context.getFilesDir(), "images");
                 List<Future<Void>> futures = new ArrayList<>();
                 Elements imgs = document.select("img");
                 for (int i = 0; i < imgs.size(); i++) {
diff --git a/app/src/main/java/eu/faircode/email/ImageHelper.java b/app/src/main/java/eu/faircode/email/ImageHelper.java
index 84124a100f..b320ff430c 100644
--- a/app/src/main/java/eu/faircode/email/ImageHelper.java
+++ b/app/src/main/java/eu/faircode/email/ImageHelper.java
@@ -798,7 +798,7 @@ class ImageHelper {
 
     @NonNull
     static File getCacheFile(Context context, long id, String source, String extension) {
-        File dir = new File(context.getCacheDir(), "images");
+        File dir = new File(context.getFilesDir(), "images");
         if (!dir.exists())
             dir.mkdir();
         return new File(dir, id + "_" + Math.abs(source.hashCode()) + extension);
diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
index 31cc8c29db..7247736b14 100644
--- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java
+++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java
@@ -206,8 +206,8 @@ public class WorkerCleanup extends Worker {
             File[] revision = new File(context.getFilesDir(), "revision").listFiles();
             File[] references = new File(context.getFilesDir(), "references").listFiles();
             File[] encryption = new File(context.getFilesDir(), "encryption").listFiles();
-            File[] photos = new File(context.getCacheDir(), "photo").listFiles();
-            File[] calendars = new File(context.getCacheDir(), "calendar").listFiles();
+            File[] photos = new File(context.getFilesDir(), "photo").listFiles();
+            File[] calendars = new File(context.getFilesDir(), "calendar").listFiles();
 
             if (messages != null)
                 files.addAll(Arrays.asList(messages));
@@ -292,7 +292,7 @@ public class WorkerCleanup extends Worker {
 
             // Cleanup cached images
             Log.i("Cleanup cached image files");
-            File[] images = new File(context.getCacheDir(), "images").listFiles();
+            File[] images = new File(context.getFilesDir(), "images").listFiles();
             if (images != null)
                 for (File file : images)
                     if (manual || file.lastModified() + KEEP_FILES_DURATION < now)
@@ -311,7 +311,7 @@ public class WorkerCleanup extends Worker {
                         }
 
             // Cleanup shared files
-            File[] shared = new File(context.getCacheDir(), "shared").listFiles();
+            File[] shared = new File(context.getFilesDir(), "shared").listFiles();
             if (shared != null)
                 for (File file : shared)
                     if (manual || file.lastModified() + KEEP_FILES_DURATION < now) {
diff --git a/app/src/main/res/xml/fileprovider_paths.xml b/app/src/main/res/xml/fileprovider_paths.xml
index 9254c420aa..0f7a5df25d 100644
--- a/app/src/main/res/xml/fileprovider_paths.xml
+++ b/app/src/main/res/xml/fileprovider_paths.xml
@@ -9,16 +9,16 @@
     <files-path
         name="raw"
         path="raw" />
-    <cache-path
+    <files-path
         name="photo"
         path="photo" />
-    <cache-path
+    <files-path
         name="calendar"
         path="calendar" />
-    <cache-path
+    <files-path
         name="images"
         path="images" />
-    <cache-path
+    <files-path
         name="shared"
         path="shared" />
 </paths>