chore: review upstream changes to action.yml, pr.yml and 2 more

.github/actions/setup/action.yml

@@ -10,7 +10,7 @@ runs:
       with:
         python-version: '3.14'
     - name: Set up JDK
-      uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
+      uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6
       with:
         distribution: zulu
         java-version: '21'
@@ -21,7 +21,7 @@ runs:
         echo "BUILD_TOOLS_VERSION=36.0.0" >> $GITHUB_ENV
         echo "NDK_VERSION=29.0.14206865" >> $GITHUB_ENV
     - name: Set up Android SDK
-      uses: android-actions/setup-android@40fd30fb8d7440372e1316f5d1809ec01dcd3699 # v4
+      uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4
       with:
         packages: "platform-tools platforms;android-37.0 build-tools;${{ env.BUILD_TOOLS_VERSION }} ndk;${{ env.NDK_VERSION }}"
     - name: Add NDK tools to PATH

Intents.md

@@ -63,7 +63,7 @@ Action: `android.intent.action.VIEW`
 Shorthand action: `view`
 
 Parameters:
-- `itemId` - Required, the UUID of the media item
+- `itemId` - Optional, the UUID of the media item, if not set, goes to home screen
 
 
 ### Examples
@@ -135,12 +135,20 @@ adb shell am start -d 'mosaic://play?itemId=5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d
 
 Full format
 ```bash
+# Switch user, go to item
 adb shell am start \
   -a android.intent.action.VIEW \
   -n 'com.github.damontecres.wholphin/.MainActivity' \
   --es itemId "5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d" \
   --es serverId "341880f9-ca88-4038-8718-f6b2407950b1" \
   --es userId "5c8575e0-468d-44fb-8c70-00aa79160587"
+
+# Switch user, go to home screen
+adb shell am start \
+  -a android.intent.action.VIEW \
+  -n 'com.github.damontecres.wholphin/.MainActivity' \
+  --es serverId "341880f9-ca88-4038-8718-f6b2407950b1" \
+  --es userId "5c8575e0-468d-44fb-8c70-00aa79160587"
 ```
 
 URI based

app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt

@@ -237,21 +237,30 @@ data class BaseItem(
             // Redirect episodes & seasons to their series if possible
             when (type) {
                 BaseItemKind.EPISODE -> {
-                    data.seasonId?.let { seasonId ->
+                    val seasonId = data.seasonId
+                    val seriesId = data.seriesId
+                    if (seasonId != null && seriesId != null) {
                         Destination.SeriesOverview(
-                            data.seriesId!!,
+                            seriesId,
                             BaseItemKind.SERIES,
                             SeasonEpisodeIds(seasonId, data.parentIndexNumber, id, indexNumber),
                         )
-                    } ?: Destination.MediaItem(this)
+                    } else {
+                        Destination.MediaItem(this)
+                    }
                 }
 
                 BaseItemKind.SEASON -> {
-                    Destination.SeriesOverview(
-                        data.seriesId!!,
-                        BaseItemKind.SERIES,
-                        SeasonEpisodeIds(id, indexNumber, null, null),
-                    )
+                    val seriesId = data.seriesId
+                    if (seriesId != null) {
+                        Destination.SeriesOverview(
+                            seriesId,
+                            BaseItemKind.SERIES,
+                            SeasonEpisodeIds(id, indexNumber, null, null),
+                        )
+                    } else {
+                        Destination.MediaItem(this)
+                    }
                 }
 
                 BaseItemKind.TV_CHANNEL -> {

app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt

@@ -245,7 +245,7 @@ class HomeSettingsService
                         settings.rows.mapIndexed { index, config ->
                             resolve(index, config)
                         }
-                    HomePageResolvedSettings(resolvedRows)
+                    HomePageResolvedSettings(userId, resolvedRows)
                 } else {
                     createDefault(userId)
                 }
@@ -256,12 +256,15 @@ class HomeSettingsService
         /**
          * Resolve the settings and set them to be the current settings
          */
-        suspend fun updateCurrent(settings: HomePageSettings) {
+        suspend fun updateCurrent(
+            userId: UUID,
+            settings: HomePageSettings,
+        ) {
             val resolvedRows =
                 settings.rows.mapIndexed { index, config ->
                     resolve(index, config)
                 }
-            val resolvedSettings = HomePageResolvedSettings(resolvedRows)
+            val resolvedSettings = HomePageResolvedSettings(userId, resolvedRows)
             currentSettings.update { resolvedSettings }
         }
 
@@ -312,7 +315,7 @@ class HomeSettingsService
                     ),
                 )
             val rowConfig = continueWatchingRow + includedIds
-            return HomePageResolvedSettings(rowConfig)
+            return HomePageResolvedSettings(userId, rowConfig)
         }
 
         /**
@@ -428,7 +431,7 @@ class HomeSettingsService
                                 null
                             }
                         }.flatten()
-                HomePageResolvedSettings(rowConfigs)
+                HomePageResolvedSettings(userId, rowConfigs)
             } else {
                 null
             }
@@ -1224,10 +1227,11 @@ data class HomeRowConfigDisplay(
  * @see HomePageSettings
  */
 data class HomePageResolvedSettings(
+    val userId: UUID,
     val rows: List<HomeRowConfigDisplay>,
 ) {
     companion object {
-        val EMPTY = HomePageResolvedSettings(listOf())
+        val EMPTY = HomePageResolvedSettings(UUID.randomUUID(), emptyList())
     }
 }
 

app/src/main/java/com/github/damontecres/wholphin/services/IntentService.kt

@@ -56,30 +56,37 @@ class IntentService
                 val query = intent.getStringParam(SearchManager.QUERY)
                 return IntentResult.Target(listOf(Destination.Search(query ?: "")))
             }
-            val itemId =
-                intent.getStringParam("itemId")?.toUUIDOrNull()
-                    ?: return IntentResult.Error("No item id provided")
 
+            val itemId = intent.getStringParam("itemId")?.toUUIDOrNull()
             val item =
-                try {
-                    api.userLibraryApi
-                        .getItem(itemId)
-                        .content
-                        .let { BaseItem(it) }
-                } catch (ex: Exception) {
-                    Timber.w(ex, "Error fetching item %s", itemId)
-                    return IntentResult.Error("Could not fetch item $itemId")
+                itemId?.let {
+                    try {
+                        api.userLibraryApi
+                            .getItem(itemId)
+                            .content
+                            .let { BaseItem(it) }
+                    } catch (ex: Exception) {
+                        Timber.w(ex, "Error fetching item %s", itemId)
+                        return IntentResult.Error("Could not fetch item $itemId")
+                    }
                 }
-
-            val itemDestination = item.destination()
+            val itemDestination = item?.destination()
 
             val destinations =
                 when (action) {
                     Intent.ACTION_VIEW, "view" -> {
-                        listOf(itemDestination)
+                        if (itemDestination != null) {
+                            listOf(itemDestination)
+                        } else {
+                            // Will go to the home page
+                            emptyList()
+                        }
                     }
 
                     "${BuildConfig.APPLICATION_ID}.PLAYBACK", "com.github.damontecres.wholphin.PLAYBACK", "play" -> {
+                        if (itemId == null || itemDestination == null) {
+                            return IntentResult.Error("Cannot start playback with no itemId")
+                        }
                         val position = intent.getLongParam("position")?.coerceAtLeast(0)
                         val shuffle = intent.getBooleanExtra("shuffle", false)
 
@@ -105,7 +112,7 @@ class IntentService
                     }
                 }
 
-            return IntentResult.Target(destinations)
+            return IntentResult.Target(destinations, true)
         }
 
         internal suspend fun prepare(intent: Intent): IntentResult? {
@@ -196,6 +203,8 @@ class IntentService
             const val INTENT_SEASON_ID = "seaId"
             const val INTENT_SERVER_ID = "serverId"
             const val INTENT_USER_ID = "userId"
+
+            const val ACTION_PLAYBACK = "com.github.damontecres.wholphin.PLAYBACK"
         }
     }
 

app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt

@@ -173,9 +173,10 @@ class ScreensaverService
          */
         fun keepScreenOn(keep: Boolean) {
             scope.launchDefault {
-                val screensaverEnabled = _state.value.run { enabled || dimEnabled }
+                val screensaverEnabled = state.value.enabled
+                val dimEnabled = state.value.dimEnabled
                 Timber.d("Keep screen on: %s, screensaverEnabled=%s", keep, screensaverEnabled)
-                if (screensaverEnabled) {
+                if (screensaverEnabled || dimEnabled) {
                     // Page is requesting to keep screen on, so we don't wait to show the screensaver
                     _state.update {
                         it.copy(
@@ -187,7 +188,9 @@ class ScreensaverService
                     if (!keep) {
                         pulse()
                     }
-                } else {
+                }
+                if (!screensaverEnabled) {
+                    // If in-app screensaver is not enabled, send keep screen on to the OS
                     keepScreenOnInternal(keep)
                 }
             }

app/src/main/java/com/github/damontecres/wholphin/services/SetupNavigationManager.kt

@@ -27,9 +27,6 @@ class SetupNavigationManager
         fun navigateTo(destination: SetupDestination) {
             backStack[0] = destination
             log()
-            if (destination !is SetupDestination.AppContent) {
-                navigationManager.reloadHome()
-            }
         }
 
         private fun log() {

app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesViewModel.kt

@@ -787,7 +787,9 @@ fun List<Library>.possibleFavoriteTypes(sort: Boolean) =
     flatMap { it.collectionType.baseItemKinds }
         .distinct()
         .filter { it in favoriteOptions }
-        .let { list ->
+        .let {
+            // No library for persons, so always include it
+            val list = it + listOf(BaseItemKind.PERSON)
             if (sort) {
                 list.sortedWith(compareBy { favoriteOptions.indexOf(it) })
             } else {