Merge pull request #586 from namehillsoftware/bugfix/now-playing-intent-routing

[Bugfix] Now Playing Intent Routing

Author: davidvedvick

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ annotation = "1.9.1"
 assertjCore = "3.27.6"
 commonsCodec = "1.19.0"
 commonsIo = "2.20.0"
-compose = "1.9.2"
+compose = "1.9.3"
 coreKtx = "1.17.0"
 desugar_jdk_libs = "2.1.5"
 gson = "2.13.2"

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/ApplicationDependenciesContainer.kt

@@ -20,6 +20,7 @@ import com.lasthopesoftware.bluewater.client.browsing.library.access.LibraryRepo
 import com.lasthopesoftware.bluewater.client.browsing.library.access.ManageLibraries
 import com.lasthopesoftware.bluewater.client.browsing.library.access.ProvideLibraries
 import com.lasthopesoftware.bluewater.client.browsing.library.access.session.CachedSelectedLibraryIdProvider
+import com.lasthopesoftware.bluewater.client.browsing.library.access.session.SelectedLibraryIdCache
 import com.lasthopesoftware.bluewater.client.browsing.library.access.session.SelectedLibraryIdProvider
 import com.lasthopesoftware.bluewater.client.browsing.library.settings.access.CachedLibrarySettingsAccess
 import com.lasthopesoftware.bluewater.client.browsing.library.settings.access.LibrarySettingsAccess
@@ -56,6 +57,7 @@ import com.lasthopesoftware.bluewater.shared.messages.application.RegisterForApp
 import com.lasthopesoftware.bluewater.shared.messages.application.SendApplicationMessages
 import com.lasthopesoftware.resources.bitmaps.DefaultAwareCachingBitmapProducer
 import com.lasthopesoftware.resources.bitmaps.QueuedBitmapProducer
+import com.lasthopesoftware.resources.closables.AutoCloseableManager
 import com.lasthopesoftware.resources.network.ActiveNetworkFinder
 import com.lasthopesoftware.resources.strings.Base64Encoder
 import com.lasthopesoftware.resources.strings.JsonEncoderDecoder
@@ -82,13 +84,16 @@ object ApplicationDependenciesContainer {
 					?.takeIf { it.context == applicationContext }
 					?: run {
 						val newDependencies = AttachedDependencies(applicationContext)
+						attachedDependencies?.close()
 						attachedDependencies = newDependencies
 						newDependencies
 					}
 			}
 
 	@UnstableApi
-	private class AttachedDependencies(val context: Context) : ApplicationDependencies {
+	private class AttachedDependencies(val context: Context) : ApplicationDependencies, AutoCloseable {
+
+		private val autoCloseableManager = AutoCloseableManager()
 
 		private val libraryRepository by lazy { LibraryRepository(context) }
 
@@ -135,7 +140,12 @@ object ApplicationDependenciesContainer {
 		}
 
 		override val selectedLibraryIdProvider by lazy {
-			CachedSelectedLibraryIdProvider(SelectedLibraryIdProvider(applicationSettings))
+			CachedSelectedLibraryIdProvider(
+				SelectedLibraryIdProvider(applicationSettings),
+				autoCloseableManager.manage(
+					SelectedLibraryIdCache(registerForApplicationMessages)
+				),
+			)
 		}
 
 		override val nowPlayingStateMaintenance by lazy {
@@ -260,5 +270,9 @@ object ApplicationDependenciesContainer {
 		override val stringResources by lazy { StringResources(context) }
 
 		override val nowPlayingDisplaySettings by lazy { InMemoryNowPlayingDisplaySettings() }
+
+		override fun close() {
+			autoCloseableManager.close()
+		}
 	}
 }

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/android/intents/IntentBuilder.kt

@@ -32,7 +32,7 @@ class IntentBuilder(private val context: Context) : BuildIntents {
 	override fun buildLibrarySettingsIntent(libraryId: LibraryId): Intent = getBrowserActivityIntent(ConnectionSettingsScreen(libraryId))
 	override fun buildLibraryServerSettingsPendingIntent(libraryId: LibraryId): PendingIntent {
 		val baseIntent = buildLibrarySettingsIntent(libraryId)
-		return PendingIntent.getActivity(context, 0, baseIntent, 0.makePendingIntentImmutable())
+		return PendingIntent.getActivity(context, 0, baseIntent, PendingIntent.FLAG_UPDATE_CURRENT.makePendingIntentImmutable())
 	}
 
 	@OptIn(UnstableApi::class)
@@ -45,15 +45,15 @@ class IntentBuilder(private val context: Context) : BuildIntents {
 
 	override fun buildPendingNowPlayingIntent(libraryId: LibraryId): PendingIntent {
 		val intent = buildNowPlayingIntent(libraryId)
-		return PendingIntent.getActivity(context, 0, intent, 0.makePendingIntentImmutable())
+		return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT.makePendingIntentImmutable())
 	}
 
 	@OptIn(UnstableApi::class)
 	override fun buildPendingPausePlaybackIntent(): PendingIntent = PlaybackService.pendingPauseIntent(context)
 
 	override fun buildPendingShowDownloadsIntent(): PendingIntent {
 		val baseIntent = buildShowDownloadsIntent()
-		return PendingIntent.getActivity(context, 0, baseIntent, 0.makePendingIntentImmutable())
+		return PendingIntent.getActivity(context, 0, baseIntent, PendingIntent.FLAG_UPDATE_CURRENT.makePendingIntentImmutable())
 	}
 
 	private fun buildShowDownloadsIntent(): Intent = getBrowserActivityIntent(ActiveLibraryDownloadsScreen)

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/HandheldApplication.kt

@@ -41,7 +41,6 @@ import com.lasthopesoftware.bluewater.client.browsing.ScopedViewModelDependencie
 import com.lasthopesoftware.bluewater.client.browsing.ScopedViewModelRegistry
 import com.lasthopesoftware.bluewater.client.browsing.files.details.FileDetailsView
 import com.lasthopesoftware.bluewater.client.browsing.files.properties.LibraryFilePropertiesDependentsRegistry
-import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
 import com.lasthopesoftware.bluewater.client.browsing.navigation.ActiveLibraryDownloadsScreen
 import com.lasthopesoftware.bluewater.client.browsing.navigation.ApplicationSettingsScreen
 import com.lasthopesoftware.bluewater.client.browsing.navigation.BrowserLibraryDestination
@@ -377,40 +376,38 @@ fun HandheldApplication(
 				is SelectedLibraryReRouter -> {
 					routedNavigationDependencies.apply {
 						LaunchedEffect(key1 = Unit) {
-							try {
-								val settings =
-									applicationSettings.promiseApplicationSettings().suspend()
-								if (settings.chosenLibraryId > -1) {
-									val libraryId = LibraryId(settings.chosenLibraryId)
-									applicationNavigation.viewLibrary(libraryId).suspend()
-									return@LaunchedEffect
-								}
+							val selectedLibraryId = try {
+								selectedLibraryIdProvider.promiseSelectedLibraryId().suspend()
 							} catch (e: Throwable) {
 								logger.error("An error occurred initializing the library", e)
+								null
 							}
 
-							applicationNavigation.backOut().suspend()
+							if (selectedLibraryId != null && selectedLibraryId.id > -1) {
+								applicationNavigation.viewLibrary(selectedLibraryId).suspend()
+							} else {
+								applicationNavigation.backOut().suspend()
+							}
 						}
 					}
 				}
 
 				is ActiveLibraryDownloadsScreen -> {
 					routedNavigationDependencies.apply {
 						LaunchedEffect(key1 = Unit) {
-							try {
-								val settings =
-									applicationSettings.promiseApplicationSettings().suspend()
-								if (settings.chosenLibraryId > -1) {
-									val libraryId = LibraryId(settings.chosenLibraryId)
-									applicationNavigation.viewLibrary(libraryId).suspend()
-									applicationNavigation.viewActiveDownloads(libraryId).suspend()
-									return@LaunchedEffect
-								}
+							val selectedLibraryId = try {
+								selectedLibraryIdProvider.promiseSelectedLibraryId().suspend()
 							} catch (e: Throwable) {
 								logger.error("An error occurred initializing the library", e)
+								null
 							}
 
-							applicationNavigation.backOut().suspend()
+							if (selectedLibraryId != null && selectedLibraryId.id > -1) {
+								applicationNavigation.viewLibrary(selectedLibraryId).suspend()
+								applicationNavigation.viewActiveDownloads(selectedLibraryId).suspend()
+							} else {
+								applicationNavigation.backOut().suspend()
+							}
 						}
 					}
 				}

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/library/access/session/CachedSelectedLibraryIdProvider.kt

@@ -1,39 +1,13 @@
 package com.lasthopesoftware.bluewater.client.browsing.library.access.session
 
 import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
-import com.lasthopesoftware.bluewater.shared.messages.application.ApplicationMessageBus
-import com.lasthopesoftware.bluewater.shared.messages.registerReceiver
-import com.lasthopesoftware.promises.extensions.toPromise
 import com.namehillsoftware.handoff.promises.Promise
-import java.util.concurrent.atomic.AtomicReference
 
 class CachedSelectedLibraryIdProvider(
 	private val inner: ProvideSelectedLibraryId,
-	private val selectedLibraryIdCache: HoldSelectedLibraryId = SelectedLibraryIdCache
+	private val selectedLibraryIdCache: HoldSelectedLibraryId,
 ) : ProvideSelectedLibraryId
 {
-	private object SelectedLibraryIdCache : HoldSelectedLibraryId, (BrowserLibrarySelection.LibraryChosenMessage) -> Unit {
-		private val cachedPromisedLibrary = AtomicReference<Promise<LibraryId?>?>(null)
-
-		init {
-		    ApplicationMessageBus.getApplicationMessageBus().registerReceiver(this)
-		}
-
-		override fun getOrCache(factory: () -> Promise<LibraryId?>): Promise<LibraryId?> =
-			with(cachedPromisedLibrary) {
-				var cachedPromise = get()
-				while (cachedPromise == null) {
-					set(factory())
-					cachedPromise = get()
-				}
-
-				cachedPromise
-			}
-
-		override fun invoke(message: BrowserLibrarySelection.LibraryChosenMessage) {
-			cachedPromisedLibrary.compareAndSet(cachedPromisedLibrary.get(), message.chosenLibraryId.toPromise())
-		}
-	}
 
 	override fun promiseSelectedLibraryId(): Promise<LibraryId?> = selectedLibraryIdCache.getOrCache(inner::promiseSelectedLibraryId)
 }

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/library/access/session/SelectedLibraryIdCache.kt

@@ -0,0 +1,36 @@
+package com.lasthopesoftware.bluewater.client.browsing.library.access.session
+
+import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
+import com.lasthopesoftware.bluewater.shared.messages.application.RegisterForApplicationMessages
+import com.lasthopesoftware.bluewater.shared.messages.registerReceiver
+import com.lasthopesoftware.bluewater.shared.updateIfDifferent
+import com.lasthopesoftware.promises.extensions.toPromise
+import com.namehillsoftware.handoff.promises.Promise
+import java.util.concurrent.atomic.AtomicReference
+
+class SelectedLibraryIdCache(
+    messageBus: RegisterForApplicationMessages,
+) : HoldSelectedLibraryId, AutoCloseable, (BrowserLibrarySelection.LibraryChosenMessage) -> Unit {
+    val cachedPromisedLibrary = AtomicReference<Promise<LibraryId?>?>(null)
+
+    val subscription = messageBus.registerReceiver(this)
+
+    override fun getOrCache(factory: () -> Promise<LibraryId?>): Promise<LibraryId?> =
+        with(cachedPromisedLibrary) {
+            var cachedPromise = get()
+            while (cachedPromise == null) {
+                set(factory())
+                cachedPromise = get()
+            }
+
+            cachedPromise
+        }
+
+    override fun invoke(message: BrowserLibrarySelection.LibraryChosenMessage) {
+        cachedPromisedLibrary.updateIfDifferent( message.chosenLibraryId.toPromise())
+    }
+
+    override fun close() {
+        subscription.close()
+    }
+}

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/navigation/BrowserDestinations.kt

@@ -35,7 +35,7 @@ sealed interface LibraryDestination : Destination {
 class ConnectionSettingsScreen(override val libraryId: LibraryId) : LibraryDestination
 
 @Parcelize
-class NowPlayingScreen(override val libraryId: LibraryId) : LibraryDestination
+data class NowPlayingScreen(override val libraryId: LibraryId) : LibraryDestination
 
 @Parcelize
 class ListedFileDetailsScreen(

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/playback/engine/PlaybackEngine.kt

@@ -420,7 +420,7 @@ class PlaybackEngine(
 							maybeNp
 								?.takeIf {
 									playerId.isCurrentPlayerId() &&
-										attachedLibraryId == activeLibraryId.get() &&
+										it.libraryId == activeLibraryId.get() &&
 										it.playlistPosition == p.playlistPosition &&
 										it.filePosition == progress.millis
 								}

projectBlueWater/src/test/java/com/lasthopesoftware/bluewater/client/playback/nowplaying/intent/GivenTheActiveLibraryIdChanges/WhenBuildingTheNowPlayingIntent.kt

@@ -0,0 +1,36 @@
+package com.lasthopesoftware.bluewater.client.playback.nowplaying.intent.GivenTheActiveLibraryIdChanges
+
+import android.content.Intent
+import androidx.test.core.app.ApplicationProvider
+import com.lasthopesoftware.AndroidContext
+import com.lasthopesoftware.bluewater.android.intents.IntentBuilder
+import com.lasthopesoftware.bluewater.android.intents.safelyGetParcelableExtra
+import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
+import com.lasthopesoftware.bluewater.client.browsing.navigation.NowPlayingScreen
+import com.lasthopesoftware.bluewater.client.destinationProperty
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.robolectric.Shadows
+
+class WhenBuildingTheNowPlayingIntent : AndroidContext() {
+	companion object {
+		private var returnedIntent: Intent? = null
+	}
+
+	override fun before() {
+		val intentBuilder = IntentBuilder(ApplicationProvider.getApplicationContext())
+		intentBuilder.buildPendingNowPlayingIntent(LibraryId(559))
+		val pendingIntent = intentBuilder.buildPendingNowPlayingIntent(LibraryId(844))
+		val shadow = Shadows.shadowOf(pendingIntent)
+		returnedIntent = shadow.savedIntent
+	}
+
+	@Test
+	fun `then the returned intent has the correct library`() {
+		assertThat(returnedIntent?.safelyGetParcelableExtra<NowPlayingScreen>(destinationProperty)).isEqualTo(
+			NowPlayingScreen(
+				LibraryId(844)
+			)
+		)
+	}
+}