From 01f0037229631740704694bb1eb925a30afc6728 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Mon, 25 Oct 2021 14:05:23 +0200
Subject: [PATCH] database adapter fix

Signed-off-by: nuclearfog <hatespirit666@gmail.com>
---
 .../nuclearfog/twidda/activity/AppSettings.java    |  2 +-
 .../twidda/database/DatabaseAdapter.java           | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java b/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
index c8ea1ae2..b3725542 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
@@ -288,7 +288,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
         }
         // confirm delete database
         else if (type == DialogType.DEL_DATABASE) {
-            DatabaseAdapter.deleteDatabase(getApplicationContext());
+            DatabaseAdapter.deleteDatabase(this);
             setResult(RETURN_DB_CLEARED);
         }
         // confirm leaving without saving proxy changes
diff --git a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
index 87885fa4..54897dec 100644
--- a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
@@ -198,10 +198,7 @@ public class DatabaseAdapter {
      */
     private SQLiteDatabase db;
 
-    private boolean isInitialized = false;
-
     /**
-     *
      */
     private DatabaseAdapter() {
     }
@@ -224,7 +221,7 @@ public class DatabaseAdapter {
      * @return database instance
      */
     public static DatabaseAdapter getInstance(@NonNull Context context) {
-        if (!INSTANCE.isInitialized)
+        if (INSTANCE.db == null)
             INSTANCE.init(context.getApplicationContext());
         return INSTANCE;
     }
@@ -249,7 +246,6 @@ public class DatabaseAdapter {
         db = c.openOrCreateDatabase(databasePath.toString(), MODE_PRIVATE, null);
         initTables();
         updateTable();
-        isInitialized = true;
     }
 
     /**
@@ -639,21 +635,21 @@ public class DatabaseAdapter {
     }
 
     /**
-     *
+     * table for user filter list
      */
     public interface UserExcludeTable {
         /**
-         *
+         * table name
          */
         String NAME = "userExclude";
 
         /**
-         *
+         * owner ID of the list
          */
         String OWNER = "listOwner";
 
         /**
-         *
+         * user ID to filter
          */
         String ID = "userID";
     }