From 8b823e5aa5bfc76d3b0cba873c8f6e0a185d1808 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 16 Jun 2018 23:31:56 +0200
Subject: fix cleanPrivateStorage()

---
 .../de/pixart/messenger/ui/SettingsActivity.java   | 29 ++++------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'src/main/java/de/pixart/messenger')

diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index ec8bc78d4..5f10ceea6 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -330,34 +330,15 @@ public class SettingsActivity extends XmppActivity implements
     }
 
     private boolean cleanPrivateStorage() {
-        cleanPrivatePictures();
-        cleanPrivateFiles();
-        return true;
-    }
-
-    private void cleanPrivatePictures() {
-        try {
-            File dir = new File(getFilesDir().getAbsolutePath(), "/Pictures/");
-            File[] array = dir.listFiles();
-            if (array != null) {
-                for (int b = 0; b < array.length; b++) {
-                    String name = array[b].getName().toLowerCase();
-                    if (name.equals(".nomedia")) {
-                        continue;
-                    }
-                    if (array[b].isFile()) {
-                        array[b].delete();
-                    }
-                }
-            }
-        } catch (Throwable e) {
-            Log.e("CleanCache", e.toString());
+        for (String type : Arrays.asList("Images", "Videos", "Files", "Audios")) {
+            cleanPrivateFiles(type);
         }
+        return true;
     }
 
-    private void cleanPrivateFiles() {
+    private void cleanPrivateFiles(final String type) {
         try {
-            File dir = new File(getFilesDir().getAbsolutePath(), "/Files/");
+            File dir = new File(getFilesDir().getAbsolutePath(), "/" + type + "/");
             File[] array = dir.listFiles();
             if (array != null) {
                 for (int b = 0; b < array.length; b++) {
-- 
cgit v1.2.3