From 656393fa1d4ad82984b87915fee8f8ef36b46747 Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Mon, 25 May 2026 13:27:24 -0400
Subject: [PATCH] Prefer thumb art for movies for Watch Next (#1456)

## Description
Prefer using thumb image types for movies when adding to Watch Next
android OS channel. The primary/poster image will be used if there is no
thumb.

### Related issues
Fixes #1425
Fixes #1403

### Testing
Emulator, verified a movie was showing its primary image, then ran this
PR

## Screenshots
N/A

## AI or LLM usage
None
---
 .../services/tvprovider/TvProviderWorker.kt   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/tvprovider/TvProviderWorker.kt b/app/src/main/java/com/github/damontecres/wholphin/services/tvprovider/TvProviderWorker.kt
index 5a21d0d2..4a0e5dde 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/tvprovider/TvProviderWorker.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/tvprovider/TvProviderWorker.kt
@@ -93,19 +93,19 @@ class TvProviderWorker
                 val currentItems = getCurrentTvChannelNextUp()
                 val currentItemIds = currentItems.map { it.internalProviderId }
 
-                // TODO Remove after v0.3.10 release
-                // This cleans up duplicates added to the watch next due a bug in https://github.com/damontecres/Wholphin/pull/372
-                currentItems.groupBy { it.internalProviderId }.forEach { (id, items) ->
-                    if (items.size > 1) {
-                        Timber.v("Duplicate ID %s", id)
-                        items
-                            .subList(1, items.size)
-                            .map { TvContractCompat.buildWatchNextProgramUri(it.id) }
-                            .forEach {
-                                context.contentResolver.delete(it, null, null)
-                            }
+                // TODO Remove after v0.6.5 release
+                // This cleans up movies that are using the poster image, see https://github.com/damontecres/Wholphin/issues/1425
+                currentItems
+                    .filter {
+                        it.type == WatchNextPrograms.TYPE_MOVIE &&
+                            it.posterArtUri
+                                .toString()
+                                .lowercase()
+                                .contains("primary")
+                    }.map { TvContractCompat.buildWatchNextProgramUri(it.id) }
+                    .forEach {
+                        context.contentResolver.delete(it, null, null)
                     }
-                }
                 // End temporary clean up
 
                 val toRemove =
@@ -220,7 +220,7 @@ class TvProviderWorker
                     val imageType =
                         when (item.type) {
                             BaseItemKind.EPISODE -> ImageType.THUMB
-                            else -> ImageType.PRIMARY
+                            else -> if (ImageType.THUMB in item.data.imageTags.orEmpty()) ImageType.THUMB else ImageType.PRIMARY
                         }
                     setPosterArtUri(imageUrlService.getItemImageUrl(item, imageType)!!.toUri())