From d91a30293a6d57d3c2f08d50c163e74a09467686 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 20 Jan 2020 20:29:32 +0100 Subject: [PATCH] Moved vacuum to cleanup --- app/src/main/java/eu/faircode/email/DB.java | 12 ------------ .../java/eu/faircode/email/FragmentOptionsMisc.java | 3 --- .../main/java/eu/faircode/email/WorkerCleanup.java | 7 +++++++ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java index bf05358ed1..133821782f 100644 --- a/app/src/main/java/eu/faircode/email/DB.java +++ b/app/src/main/java/eu/faircode/email/DB.java @@ -130,18 +130,6 @@ public abstract class DB extends RoomDatabase { sInstance = migrate(acontext, getBuilder(acontext)); - // https://www.sqlite.org/lang_vacuum.html - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean vacuum = prefs.getBoolean("vacuum", false); - if (vacuum) - try { - Log.i("Running VACUUM"); - sInstance.getOpenHelper().getWritableDatabase().execSQL("VACUUM;"); - prefs.edit().remove("vacuum").apply(); - } catch (Throwable ex) { - Log.e(ex); - } - sInstance.getInvalidationTracker().addObserver(new InvalidationTracker.Observer( EntityAccount.TABLE_NAME, EntityIdentity.TABLE_NAME, diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index c1bb4f7118..c16f880d26 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -339,9 +339,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc @Override protected Void onExecute(Context context, Bundle args) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - prefs.edit().putBoolean("vacuum", true).apply(); - WorkerCleanup.cleanup(context, true); return null; } diff --git a/app/src/main/java/eu/faircode/email/WorkerCleanup.java b/app/src/main/java/eu/faircode/email/WorkerCleanup.java index 605f90cbad..a7a11132c3 100644 --- a/app/src/main/java/eu/faircode/email/WorkerCleanup.java +++ b/app/src/main/java/eu/faircode/email/WorkerCleanup.java @@ -221,6 +221,13 @@ public class WorkerCleanup extends Worker { Log.i("Cleanup log"); int logs = db.log().deleteLogs(now - KEEP_LOG_DURATION); Log.i("Deleted logs=" + logs); + + if (manual) { + // https://www.sqlite.org/lang_vacuum.html + Log.i("Running VACUUM"); + db.getOpenHelper().getWritableDatabase().execSQL("VACUUM;"); + } + } catch (Throwable ex) { Log.e(ex); } finally {