From 397cd8c636b9c77c4d4f04ff057a31a49ba370ce Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Wed, 31 May 2017 19:04:08 +0200 Subject: [PATCH] Remove unused methods from DB Reader and DB Adapter --- .../test/antennapod/storage/DBReaderTest.java | 49 +++++++------------ .../antennapod/core/storage/DBReader.java | 24 --------- .../antennapod/core/storage/PodDBAdapter.java | 22 --------- 3 files changed, 17 insertions(+), 78 deletions(-) diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java index 9386e3bd6..0c5cf10cb 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java @@ -218,58 +218,43 @@ public class DBReaderTest extends InstrumentationTestCase { } } - private List saveUnreadItems(int numItems) { - if (numItems <= 0) { - throw new IllegalArgumentException("numItems<=0"); - } + private List saveNewItems(int numItems) { List feeds = saveFeedlist(numItems, numItems, true); List items = new ArrayList<>(); for (Feed f : feeds) { items.addAll(f.getItems()); } - List unread = new ArrayList<>(); + List newItems = new ArrayList<>(); Random random = new Random(); - while (unread.size() < numItems) { + while (newItems.size() < numItems) { int i = random.nextInt(numItems); - if (!unread.contains(items.get(i))) { + if (!newItems.contains(items.get(i))) { FeedItem item = items.get(i); - item.setPlayed(false); - unread.add(item); + item.setNew(); + newItems.add(item); } } PodDBAdapter adapter = PodDBAdapter.getInstance(); adapter.open(); - adapter.setFeedItemlist(unread); + adapter.setFeedItemlist(newItems); adapter.close(); - return unread; - } - - public void testGetUnreadItemsList() { - final int numItems = 10; - - List unread = saveUnreadItems(numItems); - List unreadSaved = DBReader.getUnreadItemsList(); - assertNotNull(unreadSaved); - assertTrue(unread.size() == unreadSaved.size()); - for (FeedItem item : unreadSaved) { - assertFalse(item.isPlayed()); - } + return newItems; } public void testGetNewItemIds() { final int numItems = 10; - List unread = saveUnreadItems(numItems); - long[] unreadIds = new long[unread.size()]; - for (int i = 0; i < unread.size(); i++) { - unreadIds[i] = unread.get(i).getId(); + List newItems = saveNewItems(numItems); + long[] unreadIds = new long[newItems.size()]; + for (int i = 0; i < newItems.size(); i++) { + unreadIds[i] = newItems.get(i).getId(); } - List unreadSaved = DBReader.getUnreadItemsList(); - assertNotNull(unreadSaved); - assertTrue(unread.size() == unreadSaved.size()); - for(int i=0; i < unreadSaved.size(); i++) { - long savedId = unreadSaved.get(i).getId(); + List newItemsSaved = DBReader.getNewItemsList(); + assertNotNull(newItemsSaved); + assertTrue(newItems.size() == newItemsSaved.size()); + for(int i=0; i < newItemsSaved.size(); i++) { + long savedId = newItemsSaved.get(i).getId(); boolean found = false; for (long id : unreadIds) { if (id == savedId) { 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 32c642de2..4bec03d7e 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 @@ -371,30 +371,6 @@ public final class DBReader { } } - /** - * Loads a list of FeedItems whose 'read'-attribute is set to false. - * - * @return A list of FeedItems whose 'read'-attribute it set to false. - */ - public static List getUnreadItemsList() { - Log.d(TAG, "getUnreadItemsList() called"); - - PodDBAdapter adapter = PodDBAdapter.getInstance(); - adapter.open(); - Cursor cursor = null; - try { - cursor = adapter.getUnreadItemsCursor(); - List items = extractItemlistFromCursor(adapter, cursor); - loadAdditionalFeedItemListData(items); - return items; - } finally { - if (cursor != null) { - cursor.close(); - } - adapter.close(); - } - } - /** * Loads a list of FeedItems that are considered new. * Excludes items from feeds that do not have keep updated enabled. 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 7bb727d68..dc8692866 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 @@ -1249,15 +1249,6 @@ public class PodDBAdapter { return db.rawQuery(query, null); } - /** - * Returns a cursor which contains all feed items in the unread items list. - * The returned cursor uses the FEEDITEM_SEL_FI_SMALL selection. - */ - public final Cursor getUnreadItemsCursor() { - return db.query(TABLE_NAME_FEED_ITEMS, FEEDITEM_SEL_FI_SMALL, KEY_READ - + "<" + FeedItem.PLAYED, null, null, null, KEY_PUBDATE + " DESC"); - } - public void setFeedItems(int state) { setFeedItems(Integer.MIN_VALUE, state, 0); } @@ -1282,19 +1273,6 @@ public class PodDBAdapter { db.execSQL(sql); } - /** - * Returns a cursor which contains all items of a feed that are considered new. - * The returned cursor uses the FEEDITEM_SEL_FI_SMALL selection. - */ - public final Cursor getNewItemsIdsCursor(long feedId) { - final String query = "SELECT " + KEY_ID - + " FROM " + TABLE_NAME_FEED_ITEMS - + " WHERE " + KEY_FEED + "=" + feedId - + " AND " + KEY_READ + "=" + FeedItem.NEW - + " ORDER BY " + KEY_PUBDATE + " DESC"; - return db.rawQuery(query, null); - } - /** * Returns a cursor which contains all feed items that are considered new. * Excludes those feeds that do not have 'Keep Updated' enabled.