DBHelper: open and close correctly

2 files changed, 9 insertions, 6 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index 42ca26079..29c36a57c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -171,11 +171,10 @@ public final class DBReader {
         List<FeedItem> items = extractItemlistFromCursor(adapter,
                 itemlistCursor);
         itemlistCursor.close();
+        adapter.close();
 
         Collections.sort(items, new FeedItemPubdateComparator());
 
-        adapter.close();
-
         for (FeedItem item : items) {
             item.setFeed(feed);
         }
@@ -296,7 +295,6 @@ public final class DBReader {
     }
 
     static LongList getQueueIDList(PodDBAdapter adapter) {
-        adapter.open();
         Cursor queueCursor = adapter.getQueueIDCursor();
 
         LongList queueIds = new LongList(queueCursor.getCount());
@@ -342,9 +340,10 @@ public final class DBReader {
                 itemlistCursor);
         itemlistCursor.close();
         loadAdditionalFeedItemListData(items);
+        adapter.close();
+
         Collections.sort(items, new FeedItemPubdateComparator());
 
-        adapter.close();
         return items;
 
     }
@@ -410,7 +409,8 @@ public final class DBReader {
     }
 
     static LongList getFavoriteIDList() {
-        PodDBAdapter adapter = PodDBAdapter.getInstance().open();
+        PodDBAdapter adapter = PodDBAdapter.getInstance();
+        adapter.open();
         Cursor favoritesCursor = adapter.getFavoritesCursor();
 
         LongList favoriteIDs = new LongList(favoritesCursor.getCount());
@@ -420,6 +420,7 @@ public final class DBReader {
             } while (favoritesCursor.moveToNext());
         }
         favoritesCursor.close();
+        adapter.close();
         return favoriteIDs;
     }
 
@@ -496,6 +497,7 @@ public final class DBReader {
             } while (logCursor.moveToNext());
         }
         logCursor.close();
+        adapter.close();
         Collections.sort(downloadLog, new DownloadStatusComparator());
         return downloadLog;
     }
@@ -522,6 +524,7 @@ public final class DBReader {
             } while (cursor.moveToNext());
         }
         cursor.close();
+        adapter.close();
         Collections.sort(downloadLog, new DownloadStatusComparator());
         return downloadLog;
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
index cea3e8147..c67fb956a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -280,7 +280,7 @@ public class PodDBAdapter {
             KEY_CONTENT_ENCODED, KEY_FEED};
 
 
-    private SQLiteDatabase db;
+    private static SQLiteDatabase db;
     private static Context context;
     private static PodDBHelper dbHelper;
     private static int counter = 0;