#609: run directory maintenance manually

2 files changed, 42 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index 99304c3..3abeff3 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -811,12 +811,19 @@ public class DataStore {
 
     /**
      * Remove obsolete cache directories in c:geo private storage.
-     *
+     */
+    public static void removeObsoleteCacheDirectories() {
+        removeObsoleteCacheDirectories(database);
+    }
+
+    /**
+     * Remove obsolete cache directories in c:geo private storage.
+     * 
      * @param db
      *            the read-write database to use
      */
     private static void removeObsoleteCacheDirectories(final SQLiteDatabase db) {
-        final Pattern oldFilePattern = Pattern.compile("^[GC|TB|O][A-Z0-9]{4,7}$");
+        final Pattern oldFilePattern = Pattern.compile("^[GC|TB|EC|GK|O][A-Z0-9]{4,7}$");
         final SQLiteStatement select = db.compileStatement("select count(*) from " + dbTableCaches + " where geocode = ?");
         final File[] files = LocalStorage.getStorage().listFiles();
         final ArrayList<File> toRemove = new ArrayList<File>(files.length);
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index 58acfc1..dcc6281 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -1,6 +1,7 @@
 package cgeo.geocaching.settings;
 
 import cgeo.geocaching.CgeoApplication;
+import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Intents;
 import cgeo.geocaching.R;
 import cgeo.geocaching.SelectMapfileActivity;
@@ -19,8 +20,10 @@ import cgeo.geocaching.utils.Log;
 import org.apache.commons.lang3.StringUtils;
 import org.openintents.intents.FileManagerIntents;
 
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -121,6 +124,7 @@ public class SettingsActivity extends PreferenceActivity {
         initSend2CgeoPreferences();
         initServicePreferences();
         initNavigationMenuPreferences();
+        initMaintenanceButtons();
 
         for (int k : new int[] { R.string.pref_username, R.string.pref_password,
                 R.string.pref_pass_vote, R.string.pref_signature,
@@ -310,6 +314,35 @@ public class SettingsActivity extends PreferenceActivity {
         });
     }
 
+    public void initMaintenanceButtons() {
+        Preference dirMaintenance = getPreference(R.string.pref_fakekey_preference_maintenance_directories);
+        dirMaintenance.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(final Preference preference) {
+                // disable the button, as the cleanup runs in background and should not be invoked a second time
+                preference.setEnabled(false);
+
+                Resources res = getResources();
+                final SettingsActivity activity = SettingsActivity.this;
+                final ProgressDialog dialog = ProgressDialog.show(activity, res.getString(R.string.init_maintenance), res.getString(R.string.init_maintenance_directories), true, false);
+                new Thread() {
+                    @Override
+                    public void run() {
+                        DataStore.removeObsoleteCacheDirectories();
+                        activity.runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                dialog.dismiss();
+                            }
+                        });
+                    }
+                }.start();
+
+                return true;
+            }
+        });
+    }
+
     private void initDbLocationPreference() {
         Preference p = getPreference(R.string.pref_dbonsdcard);
         p.setPersistent(false);