Update current pending intents

Author: davidvedvick

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/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/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)
+			)
+		)
+	}
+}