Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Playbackhistory had wrong sort order 

fixes #540
This commit is contained in:
daniel oeh 2014-11-10 12:32:10 +01:00
parent c49db40ebe
commit d2ee409530
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
View File

@ -325,8 +325,9 @@ public class DBReaderTest extends InstrumentationTestCase {
public void testGetPlaybackHistory() {
final Context context = getInstrumentation().getTargetContext();
final int numItems = 10;
final int playedItems = 5;
final int numItems = (DBReader.PLAYBACK_HISTORY_SIZE+1) * 2;
final int playedItems = DBReader.PLAYBACK_HISTORY_SIZE + 1;
final int numReturnedItems = Math.min(playedItems, DBReader.PLAYBACK_HISTORY_SIZE);
final int numFeeds = 1;
Feed feed = DBTestUtils.saveFeedlist(context, numFeeds, numItems, true).get(0);
@ -344,8 +345,8 @@ public class DBReaderTest extends InstrumentationTestCase {
List<FeedItem> saved = DBReader.getPlaybackHistory(context);
assertNotNull(saved);
assertEquals("Wrong size: ", playedItems, saved.size());
for (int i = 0; i < playedItems; i++) {
assertEquals("Wrong size: ", numReturnedItems, saved.size());
for (int i = 0; i < numReturnedItems; i++) {
FeedItem item = saved.get(i);
assertNotNull(item.getMedia().getPlaybackCompletionDate());
assertEquals("Wrong sort order: ", item.getId(), ids[i]);

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

@ -549,7 +549,6 @@ public final class DBReader {
public static List<FeedItem> getPlaybackHistory(final Context context) {
if (BuildConfig.DEBUG)
Log.d(TAG, "Loading playback history");
final int PLAYBACK_HISTORY_SIZE = 50;
PodDBAdapter adapter = new PodDBAdapter(context);
adapter.open();

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

@ -1037,8 +1037,8 @@ public class PodDBAdapter {
Validate.isTrue(limit >= 0, "Limit must be >= 0");
Cursor c = db.query(TABLE_NAME_FEED_MEDIA, null,
KEY_PLAYBACK_COMPLETION_DATE + " > 0 LIMIT " + limit, null, null,
null, null);
KEY_PLAYBACK_COMPLETION_DATE + " > 0", null, null,
null, String.format("%s DESC LIMIT %d", KEY_PLAYBACK_COMPLETION_DATE, limit));
return c;
}