Merge branch 'releases/2026.1.3'

Author: UweTrottmann

CHANGELOG.md

@@ -10,7 +10,11 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o
 
 ## Version 2026.1
 
-* 📝 Trakt: support server changes when fetching collections.
+* 📝 Trakt: support server changes to correctly fetch all collection and watchlist items.
+
+### 2026.1.3 - 2026-03-05
+
+* 🔨 Trakt: support server changes to correctly fetch all watchlist items.
 
 ### 2026.1.2 - 2026-02-27
 

app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktTools4.kt

@@ -28,7 +28,7 @@ import timber.log.Timber
 object TraktTools4 {
 
     // 1000 is the maximum limit according to https://github.com/trakt/trakt-api/discussions/681
-    private const val COLLECTION_MAX_LIMIT = 1000
+    private const val LIST_AND_COLLECTION_MAX_LIMIT = 1000
 
     sealed interface TraktResponse<T> {
         data class Success<T>(
@@ -85,7 +85,7 @@ object TraktTools4 {
             action = "get collected shows",
             reportIsNotVip = true // Should work even if not VIP
         ) { page ->
-            traktSync.collectionShows(page, COLLECTION_MAX_LIMIT, null)
+            traktSync.collectionShows(page, LIST_AND_COLLECTION_MAX_LIMIT, null)
         }
     }
 
@@ -155,12 +155,13 @@ object TraktTools4 {
     suspend fun getShowsOnWatchlist(
         traktSync: Sync
     ): TraktNonNullResponse<List<BaseShow>> {
-        return awaitTraktCallNonNull(
-            // Use Extended.FULL to get show metadata
-            traktSync.watchlistShows(Extended.FULL),
-            "get shows on watchlist",
+        return fetchAllPages(
+            action = "get shows on watchlist",
             reportIsNotVip = true // Should work even if not VIP
-        )
+        ) { page ->
+            // Use Extended.FULL to get show metadata
+            traktSync.watchlistShows(page, LIST_AND_COLLECTION_MAX_LIMIT, Extended.FULL)
+        }
     }
 
     suspend fun getWatchedMoviesByTmdbId(
@@ -191,19 +192,20 @@ object TraktTools4 {
             action = "get collected movies",
             reportIsNotVip = true // Should work even if not VIP
         ) { page ->
-            traktSync.collectionMovies(page, COLLECTION_MAX_LIMIT, null)
+            traktSync.collectionMovies(page, LIST_AND_COLLECTION_MAX_LIMIT, null)
         }
         return mapResponseData(response) { mapMoviesToTmdbIdSet(it) }
     }
 
     suspend fun getMoviesOnWatchlistByTmdbId(
         traktSync: Sync
     ): TraktNonNullResponse<MutableSet<Int>> {
-        val response = awaitTraktCallNonNull(
-            traktSync.watchlistMovies(null),
-            "get movie watchlist",
+        val response = fetchAllPages(
+            action = "get movie watchlist",
             reportIsNotVip = true // Should work even if not VIP
-        )
+        ) { page ->
+            traktSync.watchlistMovies(page, LIST_AND_COLLECTION_MAX_LIMIT, null)
+        }
         return mapResponseData(response) { mapMoviesToTmdbIdSet(it) }
     }
 

build.gradle.kts

@@ -24,9 +24,9 @@ buildscript {
     // YYYY.<release-of-year>.<build> - like 2024.1.0
     // - allows to more easily judge how old a release is
     // - allows multiple releases per month (though currently unlikely)
-    val sgVersionName by extra("2026.1.2")
+    val sgVersionName by extra("2026.1.3")
     // version 23yyrrbb -> min SDK 23, year yy, release rr, build bb
-    val sgVersionCode by extra(23260103)
+    val sgVersionCode by extra(23260104)
 
     val isCiBuild by extra { System.getenv("CI") == "true" }