diff --git a/api/src/main/java/com/readrops/api/services/fever/FeverDataSource.kt b/api/src/main/java/com/readrops/api/services/fever/FeverDataSource.kt index 40ac87d5..7aa0046b 100644 --- a/api/src/main/java/com/readrops/api/services/fever/FeverDataSource.kt +++ b/api/src/main/java/com/readrops/api/services/fever/FeverDataSource.kt @@ -48,7 +48,7 @@ class FeverDataSource(private val service: FeverService) { if (newItems.isEmpty()) break // always take the lowest id - maxId = newItems.last().remoteId!! + maxId = newItems.minOfOrNull { it.remoteId!!.toLong() }.toString() addAll(newItems) } } @@ -77,7 +77,7 @@ class FeverDataSource(private val service: FeverService) { if (newItems.isEmpty()) break // always take the highest id - localSinceId = newItems.first().remoteId!! + localSinceId = newItems.maxOfOrNull { it.remoteId!!.toLong() }.toString() addAll(newItems) } diff --git a/api/src/test/java/com/readrops/api/services/fever/FeverDataSourceTest.kt b/api/src/test/java/com/readrops/api/services/fever/FeverDataSourceTest.kt index 720c9905..0b977929 100644 --- a/api/src/test/java/com/readrops/api/services/fever/FeverDataSourceTest.kt +++ b/api/src/test/java/com/readrops/api/services/fever/FeverDataSourceTest.kt @@ -229,8 +229,6 @@ class FeverDataSourceTest : KoinTest { assertEquals(6, result.unreadIds.size) assertEquals(6, result.starredIds.size) assertEquals(10, result.items.size) - assertEquals("5", result.items.first().remoteId) - assertEquals("6", result.items.last().remoteId) assertEquals("1", firstLastSinceId) assertEquals("5", secondLastSinceId) diff --git a/api/src/test/java/com/readrops/api/services/fever/adapters/FeverItemsAdapterTest.kt b/api/src/test/java/com/readrops/api/services/fever/adapters/FeverItemsAdapterTest.kt index 24dc7259..2fd770b9 100644 --- a/api/src/test/java/com/readrops/api/services/fever/adapters/FeverItemsAdapterTest.kt +++ b/api/src/test/java/com/readrops/api/services/fever/adapters/FeverItemsAdapterTest.kt @@ -31,7 +31,7 @@ class FeverItemsAdapterTest { assertTrue(isStarred) assertTrue(isRead) assertNotNull(pubDate) - assertEquals(remoteId, "10") + assertEquals(remoteId, "6") assertEquals(feedRemoteId, "2") } } diff --git a/api/src/test/resources/services/fever/items_page1.json b/api/src/test/resources/services/fever/items_page1.json index 5c53acea..72b1a115 100644 --- a/api/src/test/resources/services/fever/items_page1.json +++ b/api/src/test/resources/services/fever/items_page1.json @@ -5,7 +5,7 @@ "total_items": 10814, "items": [ { - "id": "5", + "id": "3", "feed_id": 2, "title": "FreshRSS 1.9.0", "author": "Alkarex", @@ -27,7 +27,7 @@ "created_on_time": 1515697500 }, { - "id": "3", + "id": "5", "feed_id": 2, "title": "FreshRSS 1.9.0", "author": "Alkarex", diff --git a/api/src/test/resources/services/fever/items_page2.json b/api/src/test/resources/services/fever/items_page2.json index 3eb1657b..81bbf742 100644 --- a/api/src/test/resources/services/fever/items_page2.json +++ b/api/src/test/resources/services/fever/items_page2.json @@ -5,7 +5,7 @@ "total_items": 10814, "items": [ { - "id": "10", + "id": "6", "feed_id": 2, "title": "FreshRSS 1.9.0", "author": "Alkarex", @@ -49,7 +49,7 @@ "created_on_time": 1515697500 }, { - "id": "6", + "id": "10", "feed_id": 2, "title": "FreshRSS 1.9.0", "author": "Alkarex",