Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DBHelper: open and close correctly

Browse Source
This commit is contained in:
Martin Fietz 2015-11-26 17:24:25 +01:00
parent ec03d548f0
commit d397f397c2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
View File

@ -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;
}

2
core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
View File

@ -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;