always reset singleton if running a unit test

2018-07-04 22:09:52 +02:00
parent 51551eb0c7
commit 5b4f6cebf7
2 changed files with 12 additions and 5 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
@@ -58,15 +58,12 @@ public class KeychainDatabase {
    private static KeychainDatabase sInstance;

    public static KeychainDatabase getInstance(Context context) {
+        if (sInstance == null || Constants.IS_RUNNING_UNITTEST) {
            sInstance = new KeychainDatabase(context.getApplicationContext());
+        }
        return sInstance;
    }

-    @VisibleForTesting
-    public static void resetSingleton() {
-        sInstance = null;
-    }
-
    public interface Tables {
        String KEY_RINGS_PUBLIC = "keyrings_public";
        String KEYS = "keys";