From d4e388cf5d91f4712d126eeaa73eb60ed9d53c88 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Thu, 16 Dec 2021 22:49:22 +0100
Subject: [PATCH] Fix some crashes after DB refactor

---
 .../java/protect/card_locker/CardShortcutConfigure.java  | 4 +++-
 .../protect/card_locker/CardsOnPowerScreenService.java   | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
index 50fb18f80..4f5fa1e33 100644
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -18,12 +18,14 @@ import androidx.recyclerview.widget.RecyclerView;
  */
 public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     static final String TAG = "Catima";
-    final SQLiteDatabase mDatabase = new DBHelper(this).getReadableDatabase();
+    private SQLiteDatabase mDatabase;
 
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
+        mDatabase = new DBHelper(this).getReadableDatabase();
+
         // Set the result to CANCELED.  This will cause nothing to happen if the
         // aback button is pressed.
         setResult(RESULT_CANCELED);
diff --git a/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java b/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
index 35bac0ae7..8eaa5a8ed 100644
--- a/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
+++ b/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
@@ -28,7 +28,14 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
 
     public static final String PREFIX = "catima-";
     static final String TAG = "Catima";
-    private final SQLiteDatabase mDatabase = new DBHelper(this).getReadableDatabase();
+    private SQLiteDatabase mDatabase;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        mDatabase = new DBHelper(this).getReadableDatabase();
+    }
 
     @NonNull
     @Override