react-native-audio-browser 0.2.0-next.2 → 0.2.0-next.21

package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt

@@ -2,30 +2,31 @@ package com.audiobrowser.util
 
 import android.os.Bundle
 import androidx.media.utils.MediaConstants
-import com.margelo.nitro.audiobrowser.ResolvedTrack
+import com.margelo.nitro.audiobrowser.Section
+import com.margelo.nitro.audiobrowser.StyleDisplay
 import com.margelo.nitro.audiobrowser.Track
-import com.margelo.nitro.audiobrowser.TrackStyle
 
 /** Builds MediaMetadata extras bundle for Android Auto/AAOS content styling. */
 object MediaExtrasBuilder {
 
   /**
-   * Maps TrackStyle to MediaConstants content style value. When artwork is an android.resource://
-   * URI, uses CATEGORY_* variants which add margins around icons (better for small vector icons).
+   * Maps a display mode to the MediaConstants content style value. When artwork is an
+   * android.resource:// URI, uses CATEGORY_* variants which add margins around icons (better for
+   * small vector icons).
    *
    * @see <a href="https://developer.android.com/training/cars/media#default-content-style">Default
    *   content style</a>
    */
-  private fun TrackStyle.toContentStyleValue(artwork: String?): Int {
+  private fun StyleDisplay.toContentStyleValue(artwork: String?): Int {
     val isAndroidResource = artwork?.startsWith("android.resource://") == true
     return when (this) {
-      TrackStyle.LIST ->
+      StyleDisplay.LIST ->
         if (isAndroidResource) {
           MediaConstants.DESCRIPTION_EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_LIST_ITEM
         } else {
           MediaConstants.DESCRIPTION_EXTRAS_VALUE_CONTENT_STYLE_LIST_ITEM
         }
-      TrackStyle.GRID ->
+      StyleDisplay.GRID ->
         if (isAndroidResource) {
           MediaConstants.DESCRIPTION_EXTRAS_VALUE_CONTENT_STYLE_CATEGORY_GRID_ITEM
         } else {
@@ -34,39 +35,43 @@ object MediaExtrasBuilder {
     }
   }
 
-  fun build(track: Track): Bundle =
+  /**
+   * Extras for a track rendered on a browse surface. The owning [section] supplies the Android Auto
+   * group-title header hint (grouping is a per-item advisory in the flat MediaBrowser protocol —
+   * the section dies here, ADR 0010) and, from its page-folded style block, the per-item display
+   * hint: per-item hints derive from the section resolution, never from the track's own `display`,
+   * which is positional (ADR 0011).
+   *
+   * The track's own declared `display` is the page-layout *promise* for the page a browsable track
+   * opens — emitted as the parent-level BROWSABLE/PLAYABLE hint, the only below-root hint
+   * AOSP-derived AAOS media UIs honor. Declared or it doesn't exist: the library never derives a
+   * promise from pages it hasn't resolved, and never back-fills from ones it has.
+   */
+  fun build(track: Track, section: Section? = null): Bundle =
     build(
-      groupTitle = track.groupTitle,
-      style = track.style,
-      childrenStyle = track.childrenStyle,
+      groupTitle = section?.title,
+      itemDisplay = section?.style?.display,
+      promisedDisplay = if (track.src == null) track.style?.display else null,
       artwork = track.artwork?.url,
     )
 
-  fun build(resolvedTrack: ResolvedTrack): Bundle =
-    build(
-      groupTitle = resolvedTrack.groupTitle,
-      style = resolvedTrack.style,
-      childrenStyle = resolvedTrack.childrenStyle,
-      artwork = resolvedTrack.artwork?.url,
-    )
-
   private fun build(
     groupTitle: String?,
-    style: TrackStyle?,
-    childrenStyle: TrackStyle?,
+    itemDisplay: StyleDisplay?,
+    promisedDisplay: StyleDisplay?,
     artwork: String?,
   ): Bundle =
     Bundle().apply {
       groupTitle?.let {
         putString(MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_GROUP_TITLE, it)
       }
-      style?.let {
+      itemDisplay?.let {
         putInt(
           MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_SINGLE_ITEM,
           it.toContentStyleValue(artwork),
         )
       }
-      childrenStyle?.let {
+      promisedDisplay?.let {
         val styleValue = it.toContentStyleValue(artwork)
         putInt(MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_BROWSABLE, styleValue)
         putInt(MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_PLAYABLE, styleValue)

package/android/src/main/java/com/audiobrowser/util/StyleWire.kt

@@ -0,0 +1,108 @@
+package com.audiobrowser.util
+
+import com.margelo.nitro.audiobrowser.ArtworkRendering
+import com.margelo.nitro.audiobrowser.CardImage
+import com.margelo.nitro.audiobrowser.GridTile
+import com.margelo.nitro.audiobrowser.ImageShape
+import com.margelo.nitro.audiobrowser.SectionStyle
+import com.margelo.nitro.audiobrowser.StyleDisplay
+import com.margelo.nitro.audiobrowser.TrackStyle
+
+/**
+ * The all-nil blocks a decode collapses to "no declaration". Every field is listed exactly once
+ * here — the decoders and the persistence restore compare against these instead of re-enumerating
+ * the fields in each guard (a constructor gaining a field breaks this file, not silently a guard).
+ */
+internal val EMPTY_TRACK_STYLE =
+  TrackStyle(
+    display = null,
+    artworkRendering = null,
+    imageShape = null,
+    accessorySymbol = null,
+    cardTint = null,
+    cardImage = null,
+  )
+
+internal val EMPTY_SECTION_STYLE =
+  SectionStyle(
+    display = null,
+    artworkRendering = null,
+    imageShape = null,
+    accessorySymbol = null,
+    cardTint = null,
+    cardImage = null,
+    gridWrap = null,
+    gridTile = null,
+  )
+
+/**
+ * The style block's wire strings (ADR 0011) ↔ Nitro enums, shared by the browse decoder and the
+ * playback-state store. Inbound mapping is lenient: an unknown or empty value is "no declaration",
+ * never an error.
+ */
+internal fun StyleDisplay.toWireString(): String =
+  when (this) {
+    StyleDisplay.LIST -> "list"
+    StyleDisplay.GRID -> "grid"
+  }
+
+internal fun ArtworkRendering.toWireString(): String =
+  when (this) {
+    ArtworkRendering.ORIGINAL -> "original"
+    ArtworkRendering.STENCIL -> "stencil"
+  }
+
+internal fun String?.toStyleDisplay(): StyleDisplay? =
+  when (this?.takeIf { it.isNotEmpty() }?.lowercase()) {
+    "list" -> StyleDisplay.LIST
+    "grid" -> StyleDisplay.GRID
+    else -> null
+  }
+
+internal fun String?.toArtworkRendering(): ArtworkRendering? =
+  when (this?.takeIf { it.isNotEmpty() }?.lowercase()) {
+    "original" -> ArtworkRendering.ORIGINAL
+    "stencil" -> ArtworkRendering.STENCIL
+    else -> null
+  }
+
+internal fun ImageShape.toWireString(): String =
+  when (this) {
+    ImageShape.CIRCULAR -> "circular"
+    ImageShape.ROUNDED_RECTANGLE -> "rounded-rectangle"
+  }
+
+internal fun String?.toImageShape(): ImageShape? =
+  when (this?.takeIf { it.isNotEmpty() }?.lowercase()) {
+    "circular" -> ImageShape.CIRCULAR
+    "rounded-rectangle" -> ImageShape.ROUNDED_RECTANGLE
+    else -> null
+  }
+
+internal fun GridTile.toWireString(): String =
+  when (this) {
+    GridTile.PLAIN -> "plain"
+    GridTile.CARD -> "card"
+    GridTile.CONDENSED -> "condensed"
+  }
+
+internal fun String?.toGridTile(): GridTile? =
+  when (this?.takeIf { it.isNotEmpty() }?.lowercase()) {
+    "plain" -> GridTile.PLAIN
+    "card" -> GridTile.CARD
+    "condensed" -> GridTile.CONDENSED
+    else -> null
+  }
+
+internal fun CardImage.toWireString(): String =
+  when (this) {
+    CardImage.NORMAL -> "normal"
+    CardImage.BACKGROUND -> "background"
+  }
+
+internal fun String?.toCardImage(): CardImage? =
+  when (this?.takeIf { it.isNotEmpty() }?.lowercase()) {
+    "normal" -> CardImage.NORMAL
+    "background" -> CardImage.BACKGROUND
+    else -> null
+  }

package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt

@@ -7,17 +7,16 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import com.audiobrowser.browser.BrowseArtworkRegistry
 import com.audiobrowser.browser.ResolvedArtwork
-import com.margelo.nitro.audiobrowser.ImageRowItem
+import com.margelo.nitro.audiobrowser.Section
 import com.margelo.nitro.audiobrowser.Track
 import com.margelo.nitro.audiobrowser.TrackStyle
-import com.margelo.nitro.audiobrowser.Variant_String_ArtworkVariants
 
 /**
  * The single Track → Media3 [MediaItem] conversion. Owns the two easy-to-drift fallbacks: the
  * displayed artwork is the transformed `artworkSource.uri` falling back to the raw `artwork` field,
- * and the mediaId is the stable `id` for playable tracks, falling back to `url` then `src` (a Track
- * must have one of the latter two — see the `src` vs `url` note in CONTEXT.md). The list line
- * renders from `subtitle` (the now-playing line is re-stamped from `artist` by the now-playing
+ * and the mediaId is the stable `id` for playable tracks, falling back to `path` then `src` (a
+ * Track must have one of the latter two — see the `src` vs `path` note in CONTEXT.md). The list
+ * line renders from `subtitle` (the now-playing line is re-stamped from `artist` by the now-playing
  * pipeline; see the Now Playing Metadata guide).
  */
 object TrackFactory {
@@ -26,49 +25,46 @@ object TrackFactory {
   }
 
   /**
-   * Android Auto has no image-row rendering; its closest equivalent is a grid of artwork
-   * tiles. A track carrying `imageRow` expands into its items as grid-styled rows (the
-   * per-item content-style hint — hosts that ignore it fall back to list rows) grouped under
-   * the row's title, followed by the row itself as a browsable "view all" link when it has a
-   * `url` (a url-less row is a pure preview and contributes only its items). Tracks without
-   * an `imageRow` pass through unchanged.
+   * A synthetic browsable Track for a section's "view more" row — the section has a path but no
+   * Track to hang it on (ADR 0010). It carries the section's declared item block as its own,
+   * `display` included: the section's declaration about this content's layout is the only declared
+   * promise the "view all" page can ever have (there is no consumer-authored handle to declare one
+   * on), and without it Android Auto would always render that page as a list.
+   *
+   * [title] is the consumer's `viewMoreTitle`, one string for every section — not the section's own
+   * title, which the group header above the row already shows.
    */
-  fun expandImageRows(tracks: List<Track>): List<Track> =
-    tracks.flatMap { track ->
-      val items = track.imageRow
-      if (items.isNullOrEmpty()) return@flatMap listOf(track)
-      val expanded = items.map { it.toTrack(groupTitle = track.title) }
-      if (track.url != null) {
-        expanded + track.copy(imageRow = null, groupTitle = track.title)
-      } else {
-        expanded
-      }
-    }
-
-  /** The row-item equivalent of a full Track, for surfaces that render items as plain rows. */
-  fun ImageRowItem.toTrack(groupTitle: String?): Track =
+  fun navigationTrack(section: Section, title: String): Track =
     Track(
-      id = id,
-      url = url,
-      src = src,
-      artwork = artwork?.let { Variant_String_ArtworkVariants.First(it) },
-      artworkSource = artworkSource,
-      request = request,
-      artworkCarPlayTinted = null,
+      id = null,
+      path = section.path,
+      src = null,
+      artwork = null,
+      artworkSource = null,
+      request = null,
       title = title,
       subtitle = null,
-      artist = artist,
-      albumUrl = albumUrl,
-      album = album,
+      artist = null,
+      albumPath = null,
+      album = null,
       description = null,
       genre = null,
       duration = null,
-      style = TrackStyle.GRID,
-      childrenStyle = null,
+      style =
+        section.style?.let {
+          TrackStyle(
+            display = it.display,
+            artworkRendering = it.artworkRendering,
+            imageShape = it.imageShape,
+            accessorySymbol = it.accessorySymbol,
+            cardTint = it.cardTint,
+            cardImage = it.cardImage,
+          )
+        },
+      disabled = null,
       favorited = null,
-      groupTitle = groupTitle,
-      live = live,
-      imageRow = null,
+      live = null,
+      icyCharset = null,
     )
 
   fun toMedia3(tracks: Array<Track>): List<MediaItem> {
@@ -90,12 +86,14 @@ object TrackFactory {
     track: Track,
     registry: BrowseArtworkRegistry,
     authority: String,
+    section: Section? = null,
   ): MediaItem {
     val rawUrl = artworkUri(track) // artworkSource.uri ?: artwork
     val scheme = rawUrl?.let { Uri.parse(it).scheme?.lowercase() }
-    val builder = metadataBuilder(track)
+    val builder = metadataBuilder(track, section)
     if (rawUrl != null && (scheme == "http" || scheme == "https")) {
-      val isSvg = SvgArtworkRenderer.isSvgUrl(rawUrl) || SvgArtworkRenderer.isSvgUrl(track.artwork?.url)
+      val isSvg =
+        SvgArtworkRenderer.isSvgUrl(rawUrl) || SvgArtworkRenderer.isSvgUrl(track.artwork?.url)
       val token = ArtworkUris.tokenFor(rawUrl)
       registry.register(token, ResolvedArtwork(rawUrl, track.artworkSource?.headers, isSvg))
       builder.setArtworkUri(ArtworkUris.contentUri(authority, token).toUri())
@@ -108,8 +106,11 @@ object TrackFactory {
   /** The transformed artworkSource wins over the raw artwork field. */
   private fun artworkUri(track: Track): String? = track.artworkSource?.uri ?: track.artwork?.url
 
-  /** All metadata except artwork. */
-  private fun metadataBuilder(track: Track): MediaMetadata.Builder =
+  /**
+   * All metadata except artwork. The owning [section] (browse surfaces only) supplies the
+   * group-title header hint and the per-item style default (ADR 0010).
+   */
+  private fun metadataBuilder(track: Track, section: Section? = null): MediaMetadata.Builder =
     MediaMetadata.Builder()
       .setTitle(track.title)
       .setArtist(track.subtitle)
@@ -118,26 +119,29 @@ object TrackFactory {
       .setGenre(track.genre)
       .setIsBrowsable(track.src == null)
       .setIsPlayable(track.src != null)
-      .setExtras(MediaExtrasBuilder.build(track))
+      .setExtras(MediaExtrasBuilder.build(track, section))
       .apply { track.favorited?.let { setUserRating(HeartRating(it)) } }
 
   private fun buildMediaItem(track: Track, metadata: MediaMetadata): MediaItem {
-    // A playable track's mediaId is the consumer's stable `id` when it has one.
-    // Android Auto marks the "now playing" browse row by exact mediaId equality
-    // between the row and the player's current item (media3 announces
-    // `currentMediaItem.mediaId` in the legacy playback state), and a
+    // A playable track's mediaId is the consumer's stable `id` when it has one —
+    // the identity rule (id when non-blank, else src; see Track.identity /
+    // ADR 0008), except that an id-less playable track prefers its contextual
+    // `path` over `src` here, so this is deliberately NOT expressed via
+    // Track.identity. Android Auto marks the "now playing" browse row by exact
+    // mediaId equality between the row and the player's current item (media3
+    // announces `currentMediaItem.mediaId` in the legacy playback state), and a
     // consumer-loaded track's `src` can differ textually from the browse row's
     // for the same item (absolute vs relative, extra query params) — the id is
     // the one string both sides share. It is also context-free, so the same
     // station gets the same mediaId in every tab. Browsable-only tracks keep
-    // `url` so navigation parentIds stay resolvable paths.
+    // `path` so navigation parentIds stay resolvable paths.
     val stableId = if (track.src != null) track.id?.takeUnless { it.isBlank() } else null
     val mediaId =
       stableId
-        ?: track.url
+        ?: track.path
         ?: track.src
         ?: throw IllegalArgumentException(
-          "Track must have either url or src defined. Track: title='${track.title}', artist='${track.artist}'"
+          "Track must have either path or src defined. Track: title='${track.title}', artist='${track.artist}'"
         )
     return MediaItem.Builder()
       .setMediaId(mediaId)

package/android/src/main/res/values/strings.xml

@@ -1,10 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  Default copy for the two error tiles the library invents in the Android Auto
+  browse list. These rows have no consumer-authored Track behind them, so there
+  is nothing in the browse tree to read a title from; English here because a
+  default that renders beats a blank row.
+
+  Resources rather than a browser-config option — the route the library's
+  cross-platform copy takes (`formatNavigationError`, `carPlayLoadingTitle`,
+  `viewMoreTitle`) — because these two are not cross-platform. They exist only
+  because Media3 drops the message from `LibraryResult.ofError` on the legacy
+  browse bridge, so a row is the sole signal available; CarPlay has no
+  counterpart, stating failures in the list's centered empty view instead
+  (CarPlayController.showMessage). Android-only copy in the Android-idiomatic
+  place: an app re-skins either by declaring the same name in its own
+  strings.xml, and a `values-<locale>/` file can add translations later without
+  touching the API.
+-->
 <resources>
-    <!-- Error message shown in Android Auto when network is offline -->
+    <!--
+      The SessionError message a browse or search failure sends alongside its
+      tile. The tiles themselves are worded by the app's `formatNavigationError`
+      (ADR 0001), so these two are the library's only device-locale browse copy —
+      kept because a SessionError carries a string, not a navigation error.
+      Offline is distinct from the browse error: it is sent only when the network
+      monitor says we are actually offline, so it may name the cause.
+    -->
     <string name="audio_browser_offline_error">No internet connection</string>
-    <string name="audio_browser_offline_error_subtitle">Check your connection and try again</string>
-
-    <!-- Generic error message shown in Android Auto when browsing fails -->
     <string name="audio_browser_browse_error">Something went wrong</string>
-    <string name="audio_browser_browse_error_subtitle">Please try again later</string>
 </resources>

package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt

@@ -0,0 +1,87 @@
+package com.audiobrowser
+
+import android.content.ComponentName
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.Shadows.shadowOf
+
+// Robolectric: bindService/unbindService only exist under the framework, and ShadowApplication
+// records both sides — which is precisely the leak being guarded against.
+@RunWith(RobolectricTestRunner::class)
+class ServiceBindingTest {
+
+  private val app = RuntimeEnvironment.getApplication()
+  private val intent = Intent(app, Service::class.java)
+
+  private val connection =
+    object : ServiceConnection {
+      override fun onServiceConnected(name: ComponentName?, service: IBinder?) = Unit
+
+      override fun onServiceDisconnected(name: ComponentName?) = Unit
+    }
+
+  /** Both the auto-bind at construction and setup's bind reach the same object. */
+  @Test
+  fun bindingTwiceTakesOnlyOneBinding() {
+    val binding = ServiceBinding(app)
+
+    assertTrue(binding.bind(intent, connection))
+    assertTrue(binding.bind(intent, connection))
+
+    assertEquals(1, shadowOf(app).boundServiceConnections.size)
+
+    binding.unbind(connection)
+
+    assertTrue(shadowOf(app).boundServiceConnections.isEmpty())
+    assertEquals(1, shadowOf(app).unboundServiceConnections.size)
+  }
+
+  /** dispose() must not throw, and Android throws when unbinding a connection it never had. */
+  @Test
+  fun unbindWithoutBindIsANoOp() {
+    val binding = ServiceBinding(app)
+
+    binding.unbind(connection)
+
+    assertFalse(binding.isBound)
+    assertTrue(shadowOf(app).unboundServiceConnections.isEmpty())
+  }
+
+  /**
+   * Android registers the connection before it asks the ActivityManager, so a false return still
+   * leaves a binding to release. Treating false as "nothing bound" strands it permanently — the
+   * leak this class exists to prevent.
+   */
+  @Test
+  fun failedBindStillHoldsAConnectionToRelease() {
+    val binding = ServiceBinding(app)
+    shadowOf(app).declareActionUnbindable("unbindable")
+
+    assertFalse(binding.bind(Intent("unbindable"), connection))
+
+    assertTrue(binding.isBound)
+
+    binding.unbind(connection)
+
+    assertEquals(1, shadowOf(app).unboundServiceConnections.size)
+  }
+
+  @Test
+  fun unbindIsIdempotent() {
+    val binding = ServiceBinding(app)
+    binding.bind(intent, connection)
+
+    binding.unbind(connection)
+    binding.unbind(connection)
+
+    assertEquals(1, shadowOf(app).unboundServiceConnections.size)
+  }
+}