From b0c34cbca023153ae4e4baacf7abe24268cdc509 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 11 Oct 2021 19:58:09 +0200
Subject: [PATCH] Fix spotbugs RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE

---
 .../java/protect/card_locker/DBHelper.java    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java
index 71bdc310b..a784fcea9 100644
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -716,20 +716,22 @@ public class DBHelper extends SQLiteOpenHelper
     }
 
     public List<Group> getGroups() {
-        try(Cursor data = getGroupCursor()) {
-            List<Group> groups = new ArrayList<>();
+        Cursor data = getGroupCursor();
 
-            if (!data.moveToFirst()) {
-                return groups;
-            }
-
-            groups.add(Group.toGroup(data));
-            while (data.moveToNext()) {
-                groups.add(Group.toGroup(data));
-            }
+        List<Group> groups = new ArrayList<>();
 
+        if (!data.moveToFirst()) {
+            data.close();
             return groups;
         }
+
+        groups.add(Group.toGroup(data));
+        while (data.moveToNext()) {
+            groups.add(Group.toGroup(data));
+        }
+
+        data.close();
+        return groups;
     }
 
     public void reorderGroups(final List<Group> groups)