From 2cf2fe5341da8a9d8d82ef5563f7a859e674889b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 8 Aug 2018 00:00:01 +0200 Subject: [PATCH 1/2] when downgrading, reset the database --- app/src/main/java/org/fdroid/fdroid/data/DBHelper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index 7e60661b9..c8ef38b9c 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -275,6 +275,12 @@ public class DBHelper extends SQLiteOpenHelper { } } + @Override + public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) { + super.onDowngrade(db, oldVersion, newVersion); + resetTransient(context); + } + @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { From d64a55e013882a7d6b3de646955ed68647a82e97 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 8 Aug 2018 00:00:20 +0200 Subject: [PATCH 2/2] close the database after completing the test run --- app/src/main/java/org/fdroid/fdroid/data/DBHelper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index c8ef38b9c..d61684dbe 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -228,6 +228,9 @@ public class DBHelper extends SQLiteOpenHelper { * Only used for testing. Not quite sure how to mock a singleton variable like this. */ public static void clearDbHelperSingleton() { + if (instance != null) { + instance.close(); + } instance = null; }