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

Convert try finally into try with resources

Browse Source
This commit is contained in:
TacoTheDank 2020-05-29 14:38:53 -04:00
parent e0e27d442c
commit fa30bc5447
1 changed files with 18 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,19 +72,13 @@ public final class DBReader {
@NonNull @NonNull
private static List<Feed> getFeedList(PodDBAdapter adapter) { private static List<Feed> getFeedList(PodDBAdapter adapter) {
Cursor cursor = null; try (Cursor cursor = adapter.getAllFeedsCursor()) {
try {
cursor = adapter.getAllFeedsCursor();
List<Feed> feeds = new ArrayList<>(cursor.getCount()); List<Feed> feeds = new ArrayList<>(cursor.getCount());
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
Feed feed = extractFeedFromCursorRow(cursor); Feed feed = extractFeedFromCursorRow(cursor);
feeds.add(feed); feeds.add(feed);
} }
return feeds; return feeds;
} finally {
if (cursor != null) {
cursor.close();
}
} }
} }
@ -96,18 +90,13 @@ public final class DBReader {
public static List<String> getFeedListDownloadUrls() { public static List<String> getFeedListDownloadUrls() {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getFeedCursorDownloadUrls()) {
try {
cursor = adapter.getFeedCursorDownloadUrls();
List<String> result = new ArrayList<>(cursor.getCount()); List<String> result = new ArrayList<>(cursor.getCount());
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
result.add(cursor.getString(1)); result.add(cursor.getString(1));
} }
return result; return result;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -172,9 +161,7 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getAllItemsOfFeedCursor(feed)) {
try {
cursor = adapter.getAllItemsOfFeedCursor(feed);
List<FeedItem> items = extractItemlistFromCursor(adapter, cursor); List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
Collections.sort(items, new FeedItemPubdateComparator()); Collections.sort(items, new FeedItemPubdateComparator());
for (FeedItem item : items) { for (FeedItem item : items) {
@ -182,9 +169,6 @@ public final class DBReader {
} }
return items; return items;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -226,16 +210,10 @@ public final class DBReader {
@NonNull @NonNull
static List<FeedItem> getQueue(PodDBAdapter adapter) { static List<FeedItem> getQueue(PodDBAdapter adapter) {
Log.d(TAG, "getQueue()"); Log.d(TAG, "getQueue()");
Cursor cursor = null; try (Cursor cursor = adapter.getQueueCursor()) {
try {
cursor = adapter.getQueueCursor();
List<FeedItem> items = extractItemlistFromCursor(adapter, cursor); List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
loadAdditionalFeedItemListData(items); loadAdditionalFeedItemListData(items);
return items; return items;
} finally {
if (cursor != null) {
cursor.close();
}
} }
} }
@ -257,18 +235,12 @@ public final class DBReader {
} }
private static LongList getQueueIDList(PodDBAdapter adapter) { private static LongList getQueueIDList(PodDBAdapter adapter) {
Cursor cursor = null; try (Cursor cursor = adapter.getQueueIDCursor()) {
try {
cursor = adapter.getQueueIDCursor();
LongList queueIds = new LongList(cursor.getCount()); LongList queueIds = new LongList(cursor.getCount());
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
queueIds.add(cursor.getLong(0)); queueIds.add(cursor.getLong(0));
} }
return queueIds; return queueIds;
} finally {
if (cursor != null) {
cursor.close();
}
} }
} }
@ -302,17 +274,12 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getDownloadedItemsCursor()) {
try {
cursor = adapter.getDownloadedItemsCursor();
List<FeedItem> items = extractItemlistFromCursor(adapter, cursor); List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
loadAdditionalFeedItemListData(items); loadAdditionalFeedItemListData(items);
Collections.sort(items, new FeedItemPubdateComparator()); Collections.sort(items, new FeedItemPubdateComparator());
return items; return items;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -328,16 +295,11 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getPlayedItemsCursor()) {
try {
cursor = adapter.getPlayedItemsCursor();
List<FeedItem> items = extractItemlistFromCursor(adapter, cursor); List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
loadAdditionalFeedItemListData(items); loadAdditionalFeedItemListData(items);
return items; return items;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -355,16 +317,11 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getNewItemsCursor(offset, limit)) {
try {
cursor = adapter.getNewItemsCursor(offset, limit);
List<FeedItem> items = extractItemlistFromCursor(adapter, cursor); List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
loadAdditionalFeedItemListData(items); loadAdditionalFeedItemListData(items);
return items; return items;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -381,16 +338,11 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getFavoritesCursor(offset, limit)) {
try {
cursor = adapter.getFavoritesCursor(offset, limit);
List<FeedItem> items = extractItemlistFromCursor(adapter, cursor); List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
loadAdditionalFeedItemListData(items); loadAdditionalFeedItemListData(items);
return items; return items;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -400,18 +352,13 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getFavoritesCursor(0, Integer.MAX_VALUE)) {
try {
cursor = adapter.getFavoritesCursor(0, Integer.MAX_VALUE);
LongList favoriteIDs = new LongList(cursor.getCount()); LongList favoriteIDs = new LongList(cursor.getCount());
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
favoriteIDs.add(cursor.getLong(0)); favoriteIDs.add(cursor.getLong(0));
} }
return favoriteIDs; return favoriteIDs;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -428,16 +375,11 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getRecentlyPublishedItemsCursor(offset, limit)) {
try {
cursor = adapter.getRecentlyPublishedItemsCursor(offset, limit);
List<FeedItem> items = extractItemlistFromCursor(adapter, cursor); List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
loadAdditionalFeedItemListData(items); loadAdditionalFeedItemListData(items);
return items; return items;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -492,9 +434,7 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getDownloadLogCursor(DOWNLOAD_LOG_SIZE)) {
try {
cursor = adapter.getDownloadLogCursor(DOWNLOAD_LOG_SIZE);
List<DownloadStatus> downloadLog = new ArrayList<>(cursor.getCount()); List<DownloadStatus> downloadLog = new ArrayList<>(cursor.getCount());
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
downloadLog.add(DownloadStatus.fromCursor(cursor)); downloadLog.add(DownloadStatus.fromCursor(cursor));
@ -502,9 +442,6 @@ public final class DBReader {
Collections.sort(downloadLog, new DownloadStatusComparator()); Collections.sort(downloadLog, new DownloadStatusComparator());
return downloadLog; return downloadLog;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -521,9 +458,7 @@ public final class DBReader {
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getDownloadLog(Feed.FEEDFILETYPE_FEED, feedId)) {
try {
cursor = adapter.getDownloadLog(Feed.FEEDFILETYPE_FEED, feedId);
List<DownloadStatus> downloadLog = new ArrayList<>(cursor.getCount()); List<DownloadStatus> downloadLog = new ArrayList<>(cursor.getCount());
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
downloadLog.add(DownloadStatus.fromCursor(cursor)); downloadLog.add(DownloadStatus.fromCursor(cursor));
@ -531,9 +466,6 @@ public final class DBReader {
Collections.sort(downloadLog, new DownloadStatusComparator()); Collections.sort(downloadLog, new DownloadStatusComparator());
return downloadLog; return downloadLog;
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }
@ -560,9 +492,7 @@ public final class DBReader {
@Nullable @Nullable
static Feed getFeed(final long feedId, PodDBAdapter adapter) { static Feed getFeed(final long feedId, PodDBAdapter adapter) {
Feed feed = null; Feed feed = null;
Cursor cursor = null; try (Cursor cursor = adapter.getFeedCursor(feedId)) {
try {
cursor = adapter.getFeedCursor(feedId);
if (cursor.moveToNext()) { if (cursor.moveToNext()) {
feed = extractFeedFromCursorRow(cursor); feed = extractFeedFromCursorRow(cursor);
feed.setItems(getFeedItemList(feed)); feed.setItems(getFeedItemList(feed));
@ -570,10 +500,6 @@ public final class DBReader {
Log.e(TAG, "getFeed could not find feed with id " + feedId); Log.e(TAG, "getFeed could not find feed with id " + feedId);
} }
return feed; return feed;
} finally {
if (cursor != null) {
cursor.close();
}
} }
} }
@ -582,9 +508,7 @@ public final class DBReader {
Log.d(TAG, "Loading feeditem with id " + itemId); Log.d(TAG, "Loading feeditem with id " + itemId);
FeedItem item = null; FeedItem item = null;
Cursor cursor = null; try (Cursor cursor = adapter.getFeedItemCursor(Long.toString(itemId))) {
try {
cursor = adapter.getFeedItemCursor(Long.toString(itemId));
if (cursor.moveToNext()) { if (cursor.moveToNext()) {
List<FeedItem> list = extractItemlistFromCursor(adapter, cursor); List<FeedItem> list = extractItemlistFromCursor(adapter, cursor);
if (!list.isEmpty()) { if (!list.isEmpty()) {
@ -593,10 +517,6 @@ public final class DBReader {
} }
} }
return item; return item;
} finally {
if (cursor != null) {
cursor.close();
}
} }
} }
@ -631,9 +551,7 @@ public final class DBReader {
@Nullable @Nullable
private static FeedItem getFeedItemByUrl(final String podcastUrl, final String episodeUrl, PodDBAdapter adapter) { private static FeedItem getFeedItemByUrl(final String podcastUrl, final String episodeUrl, PodDBAdapter adapter) {
Log.d(TAG, "Loading feeditem with podcast url " + podcastUrl + " and episode url " + episodeUrl); Log.d(TAG, "Loading feeditem with podcast url " + podcastUrl + " and episode url " + episodeUrl);
Cursor cursor = null; try (Cursor cursor = adapter.getFeedItemCursor(podcastUrl, episodeUrl)) {
try {
cursor = adapter.getFeedItemCursor(podcastUrl, episodeUrl);
if (!cursor.moveToNext()) { if (!cursor.moveToNext()) {
return null; return null;
} }
@ -642,10 +560,6 @@ public final class DBReader {
return list.get(0); return list.get(0);
} }
return null; return null;
} finally {
if (cursor != null) {
cursor.close();
}
} }
} }
@ -669,9 +583,7 @@ public final class DBReader {
private static String getImageAuthentication(final String imageUrl, PodDBAdapter adapter) { private static String getImageAuthentication(final String imageUrl, PodDBAdapter adapter) {
String credentials = null; String credentials = null;
Cursor cursor = null; try (Cursor cursor = adapter.getImageAuthenticationCursor(imageUrl)) {
try {
cursor = adapter.getImageAuthenticationCursor(imageUrl);
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
String username = cursor.getString(0); String username = cursor.getString(0);
String password = cursor.getString(1); String password = cursor.getString(1);
@ -683,10 +595,6 @@ public final class DBReader {
} else { } else {
credentials = ""; credentials = "";
} }
} finally {
if (cursor != null) {
cursor.close();
}
} }
return credentials; return credentials;
} }
@ -720,9 +628,7 @@ public final class DBReader {
Log.d(TAG, "loadDescriptionOfFeedItem() called with: " + "item = [" + item + "]"); Log.d(TAG, "loadDescriptionOfFeedItem() called with: " + "item = [" + item + "]");
PodDBAdapter adapter = PodDBAdapter.getInstance(); PodDBAdapter adapter = PodDBAdapter.getInstance();
adapter.open(); adapter.open();
Cursor cursor = null; try (Cursor cursor = adapter.getDescriptionOfItem(item)) {
try {
cursor = adapter.getDescriptionOfItem(item);
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
int indexDescription = cursor.getColumnIndex(PodDBAdapter.KEY_DESCRIPTION); int indexDescription = cursor.getColumnIndex(PodDBAdapter.KEY_DESCRIPTION);
String description = cursor.getString(indexDescription); String description = cursor.getString(indexDescription);
@ -732,9 +638,6 @@ public final class DBReader {
item.setContentEncoded(contentEncoded); item.setContentEncoded(contentEncoded);
} }
} finally { } finally {
if (cursor != null) {
cursor.close();
}
adapter.close(); adapter.close();
} }
} }