react-native-audio-browser 0.2.0-next.53 → 0.2.0-next.54
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +28 -48
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +2 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +5 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +9 -10
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
- package/ios/AVPlayerEngine.swift +13 -21
- package/ios/AVPlayerEngineCallbacks.swift +2 -4
- package/ios/Browser/BrowseGate.swift +7 -8
- package/ios/Browser/BrowserConfig.swift +19 -34
- package/ios/Browser/BrowserError.swift +0 -1
- package/ios/Browser/BrowserManager.swift +29 -75
- package/ios/Browser/BrowserPathHelper.swift +13 -93
- package/ios/Browser/FavoriteSet.swift +7 -10
- package/ios/Browser/InertStyleDiagnostic.swift +17 -82
- package/ios/Browser/JsonModels.swift +11 -51
- package/ios/Browser/NavigationErrorState.swift +3 -2
- package/ios/Browser/PageResolver.swift +13 -23
- package/ios/Browser/RequestLayer.swift +16 -20
- package/ios/Browser/RequestPipeline.swift +33 -43
- package/ios/Browser/SearchDrillIn.swift +7 -13
- package/ios/Browser/SectionScope.swift +14 -26
- package/ios/Browser/SimpleRouter.swift +8 -15
- package/ios/Browser/StyleResolver.swift +12 -29
- package/ios/Browser/TabBarEntries.swift +6 -11
- package/ios/Browser/TrackIdTemplate.swift +6 -14
- package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
- package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
- package/ios/CarPlay/CarPlayController.swift +4 -4
- package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
- package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
- package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
- package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
- package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
- package/ios/CarPlay/CarPlaySession.swift +13 -17
- package/ios/CarPlay/CarPlayTemplates.swift +6 -7
- package/ios/CarPlay/IntentHandlers.swift +3 -5
- package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
- package/ios/CarPlay/MediaIntentHandler.swift +4 -7
- package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
- package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
- package/ios/CarPlay/SectionPresentation.swift +18 -28
- package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
- package/ios/Extension/Capability+RemoteCommand.swift +3 -3
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +4 -7
- package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
- package/ios/Extension/SearchParams+Query.swift +4 -4
- package/ios/Extension/Section+Copying.swift +3 -6
- package/ios/Extension/String+IcyCharset.swift +5 -5
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
- package/ios/Extension/Track+AVPlayer.swift +1 -2
- package/ios/Extension/Track+Copying.swift +2 -8
- package/ios/Extension/Track+Identity.swift +4 -9
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +3 -3
- package/ios/HybridAudioBrowser+Browser.swift +10 -16
- package/ios/HybridAudioBrowser+Options.swift +6 -9
- package/ios/HybridAudioBrowser+Player.swift +8 -16
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
- package/ios/HybridAudioBrowser+Stubs.swift +5 -7
- package/ios/HybridAudioBrowser.swift +54 -79
- package/ios/Model/NitroTypeStubs.swift +15 -22
- package/ios/Model/PlayerUpdateOptions.swift +6 -21
- package/ios/Model/RemoteCommand.swift +2 -2
- package/ios/Model/TrackPlayerError.swift +9 -22
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +7 -5
- package/ios/Observer/PlayerObserver.swift +5 -5
- package/ios/PlaybackEvent.swift +2 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +14 -15
- package/ios/Player/DeferredSeek.swift +2 -2
- package/ios/Player/EndOfTrackJudgement.swift +6 -13
- package/ios/Player/ErrorStatus.swift +8 -7
- package/ios/Player/MediaLoader.swift +20 -24
- package/ios/Player/NowPlayingLines.swift +1 -4
- package/ios/Player/NowPlayingUpdater.swift +35 -61
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +20 -24
- package/ios/Player/PlaybackPersistence.swift +5 -6
- package/ios/Player/PlaybackStateMachine.swift +8 -11
- package/ios/Player/PlaybackTimer.swift +8 -11
- package/ios/Player/Player.swift +6 -13
- package/ios/Player/PlayerEngine.swift +20 -20
- package/ios/Player/PlayerStatusTypes.swift +1 -2
- package/ios/Player/QueueManager.swift +23 -67
- package/ios/Player/RetryLoop.swift +39 -50
- package/ios/Player/ShuffleOrder.swift +17 -57
- package/ios/Player/SleepTimerManager.swift +13 -28
- package/ios/Player/VolumeFader.swift +16 -16
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
- package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/BrowserPathHelperTests.swift +3 -6
- package/ios/Tests/DeferredSeekTests.swift +1 -3
- package/ios/Tests/EmitterTests.swift +0 -1
- package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
- package/ios/Tests/FavoriteSetTests.swift +1 -0
- package/ios/Tests/GenerationMemoTests.swift +2 -2
- package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
- package/ios/Tests/JsonModelsTests.swift +5 -12
- package/ios/Tests/LRUCacheTests.swift +1 -5
- package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
- package/ios/Tests/MediaLoaderTests.swift +3 -12
- package/ios/Tests/ObserverTests.swift +3 -3
- package/ios/Tests/PlaybackErrorTests.swift +7 -9
- package/ios/Tests/PlaybackFailureTests.swift +9 -17
- package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerPolicyTests.swift +10 -26
- package/ios/Tests/PlayerTests.swift +53 -88
- package/ios/Tests/PlayingStateTests.swift +0 -1
- package/ios/Tests/QueueManagerTests.swift +30 -80
- package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
- package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
- package/ios/Tests/RetryLoopTests.swift +12 -35
- package/ios/Tests/SearchDrillInTests.swift +4 -5
- package/ios/Tests/SectionPresentationTests.swift +3 -16
- package/ios/Tests/SectionScopeTests.swift +3 -6
- package/ios/Tests/SimpleRouterTests.swift +1 -5
- package/ios/Tests/SleepTimerManagerTests.swift +8 -11
- package/ios/Tests/StyleResolverTests.swift +4 -13
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +5 -15
- package/ios/Tests/TabBarEntriesTests.swift +0 -2
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
- package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
- package/ios/Tests/TrackIdTemplateTests.swift +2 -6
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +3 -15
- package/ios/TrackSelector.swift +13 -25
- package/ios/Util/ArtworkFreshness.swift +6 -6
- package/ios/Util/ArtworkImageFetcher.swift +19 -20
- package/ios/Util/ConcurrentMap.swift +2 -2
- package/ios/Util/Emitter.swift +8 -13
- package/ios/Util/NetworkMonitor.swift +4 -6
- package/ios/Util/OutputPicker.swift +1 -1
- package/ios/Util/ReadyValue.swift +3 -2
- package/ios/Util/SFSymbolRenderer.swift +17 -30
- package/ios/Util/SVGProcessor.swift +5 -9
- package/package.json +1 -1
|
@@ -54,31 +54,25 @@ import kotlinx.coroutines.withContext
|
|
|
54
54
|
import timber.log.Timber
|
|
55
55
|
|
|
56
56
|
/**
|
|
57
|
-
* Everything the MediaLibrarySession serves except transport
|
|
58
|
-
*
|
|
59
|
-
*
|
|
60
|
-
*
|
|
61
|
-
* so anything touching the ExoPlayer instance hops back to [Dispatchers.Main]; the rest answer
|
|
62
|
-
* synchronously on the Media3 application thread.
|
|
57
|
+
* Everything the MediaLibrarySession serves except transport, which reaches the player through
|
|
58
|
+
* [InterceptingPlayer]; Assistant's play-from-search arrives as an intent in the service. Callbacks
|
|
59
|
+
* answering through [scope] run on IO, so anything touching ExoPlayer hops to [Dispatchers.Main];
|
|
60
|
+
* the rest answer on the Media3 application thread.
|
|
63
61
|
*/
|
|
64
62
|
class MediaSessionCallback(private val player: Player) :
|
|
65
63
|
MediaLibraryService.MediaLibrarySession.Callback {
|
|
66
64
|
internal val commandManager = MediaSessionCommandManager(player.context.isAutomotive)
|
|
67
65
|
private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
|
|
68
66
|
|
|
69
|
-
//
|
|
70
|
-
//
|
|
71
|
-
// threads (network observer, JS-triggered notifies) — guard all access with synchronized(this).
|
|
67
|
+
// Written on the Media3 application thread, read from the network observer and JS-triggered
|
|
68
|
+
// notifies: every access goes through synchronized(this).
|
|
72
69
|
private val parentIdSubscriptions =
|
|
73
70
|
mutableMapOf<String, MutableSet<MediaSession.ControllerInfo>>()
|
|
74
71
|
private val failedSearch = FailedSearchSlot()
|
|
75
72
|
private val offlineSearches = OfflineSearchRegistry()
|
|
76
73
|
private var mediaLibrarySession: MediaLibraryService.MediaLibrarySession? = null
|
|
77
74
|
|
|
78
|
-
/**
|
|
79
|
-
* Recommended artwork size in pixels from the connected media browser (e.g., Android Auto).
|
|
80
|
-
* Updated when onGetLibraryRoot is called with EXTRAS_KEY_MEDIA_ART_SIZE_PIXELS hint.
|
|
81
|
-
*/
|
|
75
|
+
/** The art size the last browser hinted in onGetLibraryRoot, or null before any hint. */
|
|
82
76
|
@Volatile
|
|
83
77
|
var artworkSizeHintPixels: Int? = null
|
|
84
78
|
private set
|
|
@@ -87,7 +81,7 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
87
81
|
player.networkMonitor.observeOnline(scope) { online ->
|
|
88
82
|
notifySubscribedChildrenChanged()
|
|
89
83
|
// A browse level is re-queried through its subscription; a search has none, so its offline
|
|
90
|
-
// tile
|
|
84
|
+
// tile leaves the screen only when the query runs again.
|
|
91
85
|
if (online) scope.launch { reannounceOfflineSearches() }
|
|
92
86
|
}
|
|
93
87
|
}
|
|
@@ -101,11 +95,7 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
101
95
|
}
|
|
102
96
|
}
|
|
103
97
|
|
|
104
|
-
|
|
105
|
-
* Wraps a raw external-search query string into the structured [SearchParams] the gate request
|
|
106
|
-
* carries. The car search surfaces only give a free-text query, so the other fields stay null —
|
|
107
|
-
* mirrors BrowserManager's query→SearchParams construction.
|
|
108
|
-
*/
|
|
98
|
+
// Car search surfaces give free text only. Mirrors BrowserManager's query→SearchParams.
|
|
109
99
|
private fun searchParams(query: String): SearchParams =
|
|
110
100
|
SearchParams(
|
|
111
101
|
mode = null,
|
|
@@ -118,12 +108,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
118
108
|
reference = MediaReference.UNKNOWN,
|
|
119
109
|
)
|
|
120
110
|
|
|
121
|
-
/**
|
|
122
|
-
* Builds the gate tile from a per-request chrome: while a gate is active, tabs stay visible but a
|
|
123
|
-
* gated browse/search level serves this single tile (see the gate checks in [onGetChildren] /
|
|
124
|
-
* [onGetSearchResult]). Same shape as the error tiles, and deliberately NOT accompanied by a
|
|
125
|
-
* SessionError: a gate is deliberate app state, not a failure.
|
|
126
|
-
*/
|
|
127
111
|
private fun createGateMediaItem(gate: Gate): MediaItem =
|
|
128
112
|
createErrorMediaItem(
|
|
129
113
|
BrowserPathHelper.GATE_PATH,
|
|
@@ -159,8 +143,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
159
143
|
|
|
160
144
|
override fun onDisconnected(session: MediaSession, controller: MediaSession.ControllerInfo) {
|
|
161
145
|
Timber.Forest.d("MediaSession disconnect: ${controller.packageName}")
|
|
162
|
-
//
|
|
163
|
-
//
|
|
146
|
+
// Android Auto normally leaves without unsubscribing; the controller would be notified, and
|
|
147
|
+
// held, forever.
|
|
164
148
|
offlineSearches.forget(controller)
|
|
165
149
|
synchronized(this) {
|
|
166
150
|
parentIdSubscriptions.values.forEach { it.remove(controller) }
|
|
@@ -175,8 +159,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
175
159
|
command: SessionCommand,
|
|
176
160
|
args: Bundle,
|
|
177
161
|
): ListenableFuture<SessionResult> {
|
|
178
|
-
// A success
|
|
179
|
-
//
|
|
162
|
+
// A success makes the controller flip its heart optimistically, so a no-op (no current track)
|
|
163
|
+
// reports INVALID_STATE rather than success-then-revert.
|
|
180
164
|
if (command.customAction == MediaSessionCommandManager.CUSTOM_ACTION_FAVORITE) {
|
|
181
165
|
val applied = player.toggleActiveTrackFavorited()
|
|
182
166
|
Timber.d("Favorite button tapped - toggle applied=$applied")
|
|
@@ -198,10 +182,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
198
182
|
controller: MediaSession.ControllerInfo,
|
|
199
183
|
rating: Rating,
|
|
200
184
|
): ListenableFuture<SessionResult> {
|
|
201
|
-
// A heart rating
|
|
202
|
-
//
|
|
203
|
-
// an honest result (see onCustomCommand): INVALID_STATE when there is no current track to
|
|
204
|
-
// favorite.
|
|
185
|
+
// A heart rating sets the now-playing favorite, as the favorite button does; INVALID_STATE when
|
|
186
|
+
// there is no current track.
|
|
205
187
|
RatingFavorites.favoritedFor(rating)?.let { favorited ->
|
|
206
188
|
val applied = player.setActiveTrackFavorited(favorited)
|
|
207
189
|
return Futures.immediateFuture(
|
|
@@ -214,8 +196,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
214
196
|
}
|
|
215
197
|
|
|
216
198
|
/**
|
|
217
|
-
*
|
|
218
|
-
*
|
|
199
|
+
* A legacy controller's setRating names the current item; a Media3 controller's can name any
|
|
200
|
+
* item. Only the current one can be rated.
|
|
219
201
|
*/
|
|
220
202
|
override fun onSetRating(
|
|
221
203
|
session: MediaSession,
|
|
@@ -243,11 +225,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
243
225
|
}
|
|
244
226
|
|
|
245
227
|
if (params?.isRecent == true) {
|
|
246
|
-
//
|
|
247
|
-
//
|
|
248
|
-
// reaches this callback. Any other browser asking for a recent root gets
|
|
249
|
-
// ERROR_NOT_SUPPORTED — there is no browsable recents tree; recents are ordinary consumer
|
|
250
|
-
// content (a tab or route).
|
|
228
|
+
// Media3 answers System UI's EXTRA_RECENT root itself, through onPlaybackResumption, so this
|
|
229
|
+
// is another browser asking; there is no browsable recents tree.
|
|
251
230
|
return Futures.immediateFuture(LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED))
|
|
252
231
|
}
|
|
253
232
|
|
|
@@ -303,12 +282,10 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
303
282
|
player.awaitBrowser().also { Timber.d("Browser ready, proceeding with onGetChildren") }
|
|
304
283
|
val browserManager = audioBrowser.browserManager
|
|
305
284
|
|
|
306
|
-
// While a gate is active
|
|
307
|
-
//
|
|
308
|
-
//
|
|
309
|
-
//
|
|
310
|
-
// children. Checked before the offline guard: gated content isn't coming back with
|
|
311
|
-
// connectivity, so the gate copy is the truer message.
|
|
285
|
+
// While a gate is active the root keeps its tabs; a gated level, the gate tile's own sentinel
|
|
286
|
+
// included, serves the gate tile, so drilling into it re-shows the message, and an allowed one
|
|
287
|
+
// falls through. No SessionError: a gate is app state, not a failure. Before the offline
|
|
288
|
+
// guard: connectivity does not ungate content.
|
|
312
289
|
if (parentId != BrowserPathHelper.ROOT_PATH) {
|
|
313
290
|
val outcome =
|
|
314
291
|
audioBrowser.gateDecision(
|
|
@@ -316,8 +293,7 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
316
293
|
)
|
|
317
294
|
if (outcome.gated) {
|
|
318
295
|
audioBrowser.onGate(GateEvent(GateReason.BROWSE))
|
|
319
|
-
// gateDecision
|
|
320
|
-
// built-in).
|
|
296
|
+
// gateDecision always sets chrome on a gated outcome.
|
|
321
297
|
return LibraryResult.ofItemList(
|
|
322
298
|
ImmutableList.of(createGateMediaItem(outcome.chrome!!)),
|
|
323
299
|
params,
|
|
@@ -325,9 +301,9 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
325
301
|
}
|
|
326
302
|
}
|
|
327
303
|
|
|
328
|
-
//
|
|
329
|
-
//
|
|
330
|
-
//
|
|
304
|
+
// A tap on the offline tile re-sends the alert, but only while still offline:
|
|
305
|
+
// notifyChildrenChanged re-queries these paths with no user action, e.g. when connectivity
|
|
306
|
+
// returns.
|
|
331
307
|
if (BrowserPathHelper.isDeadEndPath(parentId)) {
|
|
332
308
|
val offline = !player.networkMonitor.isOnline.value
|
|
333
309
|
if (parentId == BrowserPathHelper.OFFLINE_PATH && offline) {
|
|
@@ -355,8 +331,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
355
331
|
return try {
|
|
356
332
|
val children =
|
|
357
333
|
if (parentId == BrowserPathHelper.ROOT_PATH) {
|
|
358
|
-
//
|
|
359
|
-
//
|
|
334
|
+
// Filtered before the four-tab cap so a disabled tab never costs an available one its
|
|
335
|
+
// slot.
|
|
360
336
|
val tabs = browserManager.queryTabs().filterNot { it.disabled == true }
|
|
361
337
|
if (tabs.size > 4) {
|
|
362
338
|
Timber.w(
|
|
@@ -365,16 +341,14 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
365
341
|
}
|
|
366
342
|
toFlatMediaItems(tabs.take(4))
|
|
367
343
|
} else {
|
|
368
|
-
// Section styles arrive page-folded (`section ?? page`, ADR 0011).
|
|
369
344
|
val resolvedTrack = browserManager.resolve(parentId)
|
|
345
|
+
// Section styles arrive page-folded (ADR 0011).
|
|
370
346
|
val sections =
|
|
371
347
|
resolvedTrack.styleResolvedSections()
|
|
372
348
|
?: throw IllegalStateException("Expected browsed ResolvedTrack to have sections")
|
|
373
349
|
browserManager.warnIfGridPageLacksPromise(parentId, sections)
|
|
374
|
-
//
|
|
375
|
-
// notifyChildrenChanged
|
|
376
|
-
// app's path-aware `empty-content` copy as one inert tile (ADR 0001) instead of
|
|
377
|
-
// Android Auto's bare "No items".
|
|
350
|
+
// An empty page resolved fine, so no SessionError: these paths are re-queried by
|
|
351
|
+
// notifyChildrenChanged without user action.
|
|
378
352
|
browseLevelItems(toMediaItems(sections)) {
|
|
379
353
|
audioBrowser.resolveFormattedError(emptyContentError(), parentId)
|
|
380
354
|
}
|
|
@@ -382,11 +356,10 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
382
356
|
|
|
383
357
|
LibraryResult.ofItemList(ImmutableList.copyOf(children.paginate(page, pageSize)), params)
|
|
384
358
|
} catch (e: Exception) {
|
|
385
|
-
// A cancelled browse (controller
|
|
386
|
-
// error tile. awaitBrowser's TimeoutCancellationException IS a real failure, keep that.
|
|
359
|
+
// A cancelled browse (the controller left) is not a failure; awaitBrowser's timeout is.
|
|
387
360
|
if (e is CancellationException && e !is TimeoutCancellationException) throw e
|
|
388
361
|
Timber.e(e, "Error getting children for parentId: $parentId")
|
|
389
|
-
// A tile
|
|
362
|
+
// A tile, not ofError(): see createErrorMediaItem and
|
|
390
363
|
// https://github.com/androidx/media/issues/2901
|
|
391
364
|
sendBrowseError(session, browser, offline = false)
|
|
392
365
|
LibraryResult.ofItemList(
|
|
@@ -401,17 +374,10 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
401
374
|
}
|
|
402
375
|
|
|
403
376
|
/**
|
|
404
|
-
* Sends a non-fatal [SessionError]
|
|
405
|
-
*
|
|
406
|
-
* Media3
|
|
407
|
-
*
|
|
408
|
-
*
|
|
409
|
-
* NOTE: current Android Auto renders nothing for this — its transient state is cleared
|
|
410
|
-
* microseconds after being set (see [createErrorMediaItem], androidx/media#2901). It is kept
|
|
411
|
-
* because it is the correct Media3-API error signal, costs nothing, and becomes user-visible if
|
|
412
|
-
* Android Auto moves to consuming SessionError via the Media3 controller API.
|
|
413
|
-
*
|
|
414
|
-
* Dispatched to the main thread: the session and its legacy stub are application-thread bound.
|
|
377
|
+
* Sends [browser] a non-fatal [SessionError] alongside the error tile. Current Android Auto
|
|
378
|
+
* renders nothing for it (https://github.com/androidx/media/issues/2901); it is the correct
|
|
379
|
+
* Media3 signal and shows if Android Auto starts reading it. Dispatched to Main: the session and
|
|
380
|
+
* its legacy stub are application-thread bound.
|
|
415
381
|
*/
|
|
416
382
|
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
|
|
417
383
|
private fun sendBrowseError(
|
|
@@ -429,27 +395,22 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
429
395
|
}
|
|
430
396
|
|
|
431
397
|
/**
|
|
432
|
-
* Flattens
|
|
433
|
-
*
|
|
434
|
-
*
|
|
435
|
-
*
|
|
436
|
-
* tappable at any of them, so the row is the section's only "view all" affordance here. Http(s)
|
|
437
|
-
* artwork routes through the content:// provider so Android Auto can load it via the
|
|
438
|
-
* ArtworkContentProvider.
|
|
398
|
+
* Flattens sections to browse items (ADR 0010): the MediaBrowser protocol has no section node, so
|
|
399
|
+
* each item carries its section's title and style hints. A section with a `path` gains a "view
|
|
400
|
+
* more" row at every `display`: no Android Auto header is tappable, so it is the only way to the
|
|
401
|
+
* whole section.
|
|
439
402
|
*/
|
|
440
403
|
private suspend fun toMediaItems(sections: List<Section>): List<MediaItem> {
|
|
441
404
|
val registry = player.browseArtworkRegistry
|
|
442
405
|
val authority = com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
|
|
443
406
|
return sections.flatMap { section ->
|
|
444
|
-
// Android Auto has no disabled affordance, so
|
|
445
|
-
// — never a normal-looking dead row (Track.disabled's rendering ladder).
|
|
407
|
+
// Android Auto has no disabled affordance, so a disabled track hides.
|
|
446
408
|
val children = section.children.filter { it.disabled != true }
|
|
447
409
|
val items = children.map { TrackFactory.toBrowseMediaItem(it, registry, authority, section) }
|
|
448
|
-
//
|
|
449
|
-
// outright, and a lone navigation tile under a header is a dead end.
|
|
410
|
+
// A lone "view more" row under a header is a dead end.
|
|
450
411
|
if (section.path == null || children.isEmpty()) return@flatMap items
|
|
451
|
-
//
|
|
452
|
-
//
|
|
412
|
+
// Free after the first row: the browser is already up, and viewMoreTitle is memoized per
|
|
413
|
+
// content generation.
|
|
453
414
|
val title = player.awaitBrowser().browserManager.viewMoreTitle()
|
|
454
415
|
items +
|
|
455
416
|
TrackFactory.toBrowseMediaItem(
|
|
@@ -461,10 +422,7 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
461
422
|
}
|
|
462
423
|
}
|
|
463
424
|
|
|
464
|
-
|
|
465
|
-
* Flat lists (tabs, search results) convert as one untitled list section — which contributes no
|
|
466
|
-
* group or style hints — so exactly one Track→MediaItem path exists at the Media3 boundary.
|
|
467
|
-
*/
|
|
425
|
+
// One untitled section, so a single Track→MediaItem conversion exists.
|
|
468
426
|
private suspend fun toFlatMediaItems(tracks: List<Track>): List<MediaItem> =
|
|
469
427
|
toMediaItems(listOf(untitledSection(tracks.toTypedArray())))
|
|
470
428
|
|
|
@@ -475,8 +433,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
475
433
|
): ListenableFuture<LibraryResult<MediaItem>> {
|
|
476
434
|
Timber.Forest.d("onGetItem: ${browser.packageName}, mediaId = $mediaId")
|
|
477
435
|
return scope.future {
|
|
478
|
-
// Only the root answers ahead of awaitBrowser: it needs no browser. Every tile sentinel
|
|
479
|
-
// below does — for the formatter hop, and the gate one for gateDecision.
|
|
480
436
|
if (mediaId == BrowserPathHelper.ROOT_PATH) {
|
|
481
437
|
return@future LibraryResult.ofItem(
|
|
482
438
|
MediaItem.Builder()
|
|
@@ -501,8 +457,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
501
457
|
}
|
|
502
458
|
|
|
503
459
|
if (mediaId == BrowserPathHelper.ERROR_PATH) {
|
|
504
|
-
// The exception that produced the tile is gone by now — the sentinel is all the controller
|
|
505
|
-
// hands back — so the copy formats for the sentinel under the generic failure code.
|
|
506
460
|
return@future LibraryResult.ofItem(
|
|
507
461
|
createBrowseErrorMediaItem(
|
|
508
462
|
player
|
|
@@ -514,9 +468,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
514
468
|
}
|
|
515
469
|
|
|
516
470
|
if (mediaId == BrowserPathHelper.EMPTY_PATH) {
|
|
517
|
-
// A controller re-reading the tile it was served. The page's path is gone by now — the
|
|
518
|
-
// sentinel is all it hands back — so the copy formats for the sentinel and lands on the
|
|
519
|
-
// app's generic empty wording, or the default.
|
|
520
471
|
return@future LibraryResult.ofItem(
|
|
521
472
|
createEmptyMediaItem(
|
|
522
473
|
player
|
|
@@ -527,10 +478,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
527
478
|
)
|
|
528
479
|
}
|
|
529
480
|
|
|
481
|
+
// No onGate: it fires where a browse or search is served, not on an item lookup.
|
|
530
482
|
if (mediaId == BrowserPathHelper.GATE_PATH) {
|
|
531
|
-
// A direct fetch of the gate tile's own sentinel (a controller re-reading the item it was
|
|
532
|
-
// served). Resolve the chrome for the gate path but do NOT emit onGate — that fires at the
|
|
533
|
-
// browse/search serve sites, not on an item lookup.
|
|
534
483
|
val outcome =
|
|
535
484
|
player
|
|
536
485
|
.awaitBrowser()
|
|
@@ -547,9 +496,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
547
496
|
|
|
548
497
|
val browserManager = player.awaitBrowser().browserManager
|
|
549
498
|
|
|
550
|
-
//
|
|
551
|
-
//
|
|
552
|
-
// __trackId and would return the *parent container's* metadata as the item.
|
|
499
|
+
// Cache first: resolve() strips __trackId from a contextual mediaId and would answer with the
|
|
500
|
+
// parent container's metadata.
|
|
553
501
|
val browseAuthority =
|
|
554
502
|
com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
|
|
555
503
|
browserManager.getCachedTrack(mediaId)?.let { track ->
|
|
@@ -561,9 +509,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
561
509
|
|
|
562
510
|
try {
|
|
563
511
|
val resolvedTrack = browserManager.resolve(mediaId)
|
|
564
|
-
//
|
|
565
|
-
//
|
|
566
|
-
// and the item's tag is a Track, as fromMedia3 expects.
|
|
512
|
+
// The same conversion as the cached path, so the item's tag is a Track, as fromMedia3
|
|
513
|
+
// expects.
|
|
567
514
|
LibraryResult.ofItem(
|
|
568
515
|
TrackFactory.toBrowseMediaItem(
|
|
569
516
|
resolvedTrack.toTrack(),
|
|
@@ -590,11 +537,9 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
590
537
|
|
|
591
538
|
synchronized(this) { parentIdSubscriptions.getOrPut(parentId) { mutableSetOf() }.add(browser) }
|
|
592
539
|
|
|
593
|
-
//
|
|
594
|
-
//
|
|
595
|
-
//
|
|
596
|
-
// failures. Keep the default's other behavior: notify Media3 (non-legacy) browsers so they
|
|
597
|
-
// fetch the children; legacy browsers get onLoadChildren from the framework after subscribing.
|
|
540
|
+
// Not super: its onSubscribe validates the parent through onGetItem, a full resolve whose
|
|
541
|
+
// result the legacy stub discards. Kept from it: Media3 browsers are told to fetch; legacy
|
|
542
|
+
// browsers get onLoadChildren from the framework.
|
|
598
543
|
if (browser.controllerVersion != MediaSession.ControllerInfo.LEGACY_CONTROLLER_VERSION) {
|
|
599
544
|
session.notifyChildrenChanged(browser, parentId, Int.MAX_VALUE, params)
|
|
600
545
|
}
|
|
@@ -618,10 +563,7 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
618
563
|
return super.onUnsubscribe(session, browser, parentId)
|
|
619
564
|
}
|
|
620
565
|
|
|
621
|
-
/**
|
|
622
|
-
* Safe to call from any thread: snapshots the subscribed paths and dispatches the session calls
|
|
623
|
-
* to the main (Media3 application) thread.
|
|
624
|
-
*/
|
|
566
|
+
/** Safe from any thread. */
|
|
625
567
|
private fun notifySubscribedChildrenChanged() {
|
|
626
568
|
val session = mediaLibrarySession ?: return
|
|
627
569
|
val parentIds = synchronized(this) { parentIdSubscriptions.keys.toList() }
|
|
@@ -630,21 +572,14 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
630
572
|
}
|
|
631
573
|
}
|
|
632
574
|
|
|
633
|
-
/**
|
|
634
|
-
* Notifies external controllers that content at the given path has changed, so controllers
|
|
635
|
-
* subscribed to it refresh their UI. Safe to call from any thread.
|
|
636
|
-
*/
|
|
575
|
+
/** Tells controllers subscribed to [path] to re-query it. Safe from any thread. */
|
|
637
576
|
fun notifyContentChanged(path: String) {
|
|
638
577
|
Timber.d("Notifying content changed for path: $path")
|
|
639
578
|
val session = mediaLibrarySession ?: return
|
|
640
579
|
scope.launch(Dispatchers.Main) { session.notifyChildrenChanged(path, Int.MAX_VALUE, null) }
|
|
641
580
|
}
|
|
642
581
|
|
|
643
|
-
/**
|
|
644
|
-
* Notifies all subscribed controllers that content everywhere has changed (e.g. on a locale
|
|
645
|
-
* switch) so they re-query their children. Pairs with AudioBrowser.invalidateAllContent(), which
|
|
646
|
-
* clears the content cache first.
|
|
647
|
-
*/
|
|
582
|
+
/** Pairs with AudioBrowser.invalidateAllContent(), which clears the content cache first. */
|
|
648
583
|
fun invalidateAllContent() {
|
|
649
584
|
Timber.d("Invalidating all content - notifying all subscribed paths")
|
|
650
585
|
notifySubscribedChildrenChanged()
|
|
@@ -655,7 +590,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
655
590
|
notifySubscribedChildrenChanged()
|
|
656
591
|
}
|
|
657
592
|
|
|
658
|
-
/** Cancels in-flight browse/search work. Call when the owning player is destroyed. */
|
|
659
593
|
fun destroy() {
|
|
660
594
|
scope.cancel()
|
|
661
595
|
}
|
|
@@ -677,20 +611,19 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
677
611
|
}
|
|
678
612
|
val browserManager = audioBrowser.browserManager
|
|
679
613
|
|
|
680
|
-
// External-surface search is gated with the rest of the browse tree — otherwise search is
|
|
681
|
-
// a way around the gate. One "result": the gate tile (see onGetSearchResult).
|
|
682
614
|
val searchOutcome =
|
|
683
615
|
audioBrowser.gateDecision(
|
|
684
616
|
NativeGateRequest(reason = GateReason.SEARCH, path = null, search = searchParams(query))
|
|
685
617
|
)
|
|
618
|
+
// Search is gated with the browse tree, or it would route around the gate. One result: the
|
|
619
|
+
// gate tile (see onGetSearchResult).
|
|
686
620
|
if (searchOutcome.gated) {
|
|
687
621
|
audioBrowser.onGate(GateEvent(GateReason.SEARCH))
|
|
688
622
|
session.notifySearchResultChanged(browser, query, 1, params)
|
|
689
623
|
return@future LibraryResult.ofVoid()
|
|
690
624
|
}
|
|
691
625
|
|
|
692
|
-
// Before
|
|
693
|
-
// answer is not-supported, online or not.
|
|
626
|
+
// Before announceSearch's offline branch: no search source is not-supported, online or not.
|
|
694
627
|
if (!browserManager.config.hasSearch) {
|
|
695
628
|
Timber.w("Search requested but no search source configured")
|
|
696
629
|
return@future LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED)
|
|
@@ -702,10 +635,9 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
702
635
|
}
|
|
703
636
|
|
|
704
637
|
/**
|
|
705
|
-
*
|
|
706
|
-
*
|
|
707
|
-
*
|
|
708
|
-
* it, so one controller holds at most its latest unanswered search.
|
|
638
|
+
* Tells [browser] how many items [onGetSearchResult] will serve for [query]: its hits, or the one
|
|
639
|
+
* tile standing in for them, since a controller told zero never asks. Offline keeps the query for
|
|
640
|
+
* [reannounceOfflineSearches]; any other outcome drops it.
|
|
709
641
|
*/
|
|
710
642
|
private suspend fun announceSearch(
|
|
711
643
|
session: MediaLibraryService.MediaLibrarySession,
|
|
@@ -725,8 +657,7 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
725
657
|
offlineSearches.forget(browser)
|
|
726
658
|
|
|
727
659
|
try {
|
|
728
|
-
// Caches the
|
|
729
|
-
// getCachedSearchResults.
|
|
660
|
+
// Caches the results under the query, for getCachedSearchResults.
|
|
730
661
|
val searchResults = browserManager.search(query)
|
|
731
662
|
failedSearch.clear()
|
|
732
663
|
val resultCount = announcedSearchCount(searchResults.normalizedSections)
|
|
@@ -737,19 +668,16 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
737
668
|
} catch (e: Exception) {
|
|
738
669
|
if (e is CancellationException && e !is TimeoutCancellationException) throw e
|
|
739
670
|
Timber.e(e, "Error during search for query: $query")
|
|
740
|
-
//
|
|
741
|
-
//
|
|
742
|
-
// the slot the failure is indistinguishable from an empty page by the time that call
|
|
743
|
-
// arrives, and a server error would read as the app's "no results" copy.
|
|
671
|
+
// Announces the browse-error tile: an ofError renders as nothing, and without the slot the
|
|
672
|
+
// failure reads as "no results" by the time onGetSearchResult arrives.
|
|
744
673
|
failedSearch.record(query, navigationErrorFor(e))
|
|
745
674
|
session.notifySearchResultChanged(browser, query, 1, params)
|
|
746
675
|
}
|
|
747
676
|
}
|
|
748
677
|
|
|
749
678
|
/**
|
|
750
|
-
* Re-runs
|
|
751
|
-
*
|
|
752
|
-
* to what [onGetSearchResult] will then serve from the cache this fills.
|
|
679
|
+
* Re-runs each search served the offline tile, so the announced count matches what
|
|
680
|
+
* [onGetSearchResult] then serves from the cache this fills.
|
|
753
681
|
*/
|
|
754
682
|
private suspend fun reannounceOfflineSearches() {
|
|
755
683
|
val pending = offlineSearches.drain()
|
|
@@ -790,11 +718,11 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
790
718
|
}
|
|
791
719
|
val browserManager = audioBrowser.browserManager
|
|
792
720
|
|
|
793
|
-
// Gated: the single search "result" is the gate tile (paired with onSearch's count of 1).
|
|
794
721
|
val searchOutcome =
|
|
795
722
|
audioBrowser.gateDecision(
|
|
796
723
|
NativeGateRequest(reason = GateReason.SEARCH, path = null, search = searchParams(query))
|
|
797
724
|
)
|
|
725
|
+
// The one result onSearch announced for a gated search.
|
|
798
726
|
if (searchOutcome.gated) {
|
|
799
727
|
audioBrowser.onGate(GateEvent(GateReason.SEARCH))
|
|
800
728
|
return@future LibraryResult.ofItemList(
|
|
@@ -803,8 +731,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
803
731
|
)
|
|
804
732
|
}
|
|
805
733
|
|
|
806
|
-
//
|
|
807
|
-
//
|
|
734
|
+
// Before the failure slot, as in onGetChildren: a search that never reached the network is
|
|
735
|
+
// fixed by connectivity, not a server failure.
|
|
808
736
|
if (
|
|
809
737
|
!player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
|
|
810
738
|
) {
|
|
@@ -823,8 +751,7 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
823
751
|
)
|
|
824
752
|
}
|
|
825
753
|
|
|
826
|
-
// The search
|
|
827
|
-
// SessionError the browse catch sends, worded for the error its exception mapped to.
|
|
754
|
+
// The search failed: the same tile and SessionError as a failed browse, not the empty page.
|
|
828
755
|
failedSearch.errorFor(query)?.let { error ->
|
|
829
756
|
sendBrowseError(session, browser, offline = false)
|
|
830
757
|
return@future LibraryResult.ofItemList(
|
|
@@ -840,9 +767,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
840
767
|
try {
|
|
841
768
|
val tracks = browserManager.getCachedSearchResults(query)
|
|
842
769
|
if (tracks == null) Timber.w("No cached search results for query: $query")
|
|
843
|
-
//
|
|
844
|
-
//
|
|
845
|
-
// items" (ADR 0001). Something must always come back: onSearch announced one item.
|
|
770
|
+
// No hits, all disabled, or nothing cached: the app's empty copy (ADR 0001). Something must
|
|
771
|
+
// come back: onSearch announced at least one item.
|
|
846
772
|
val mediaItems =
|
|
847
773
|
browseLevelItems(toFlatMediaItems(tracks?.toList().orEmpty())) {
|
|
848
774
|
audioBrowser.resolveFormattedError(
|
|
@@ -882,9 +808,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
882
808
|
return scope.future {
|
|
883
809
|
val audioBrowser = player.awaitBrowser()
|
|
884
810
|
|
|
885
|
-
//
|
|
886
|
-
//
|
|
887
|
-
// future runs on IO, so the reads hop to Main.
|
|
811
|
+
// Returning the current state unchanged is how handleTrackLoad tells Media3 to do nothing.
|
|
812
|
+
// Reads hop to Main: ExoPlayer is main-thread confined and this runs on IO.
|
|
888
813
|
suspend fun currentPlayerState(): MediaSession.MediaItemsWithStartPosition =
|
|
889
814
|
withContext(Dispatchers.Main) {
|
|
890
815
|
val currentItems = player.tracks.map { TrackFactory.toMedia3(it) }
|
|
@@ -894,11 +819,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
894
819
|
|
|
895
820
|
val browserManager = audioBrowser.browserManager
|
|
896
821
|
|
|
897
|
-
// A single tapped item resolves to the contextual path of the list it was
|
|
898
|
-
//
|
|
899
|
-
// stable-id mediaIds (see BrowserManager.contextualPathFor). A search
|
|
900
|
-
// selection is not a list tap — its queue comes from the search results
|
|
901
|
-
// (resolveMediaItemsForPlayback), never from a browsed container.
|
|
822
|
+
// A single tapped item resolves to the contextual path of the list it was tapped in. A search
|
|
823
|
+
// pick is not a list tap: its queue comes from the search results.
|
|
902
824
|
val singleContextualPath =
|
|
903
825
|
mediaItems
|
|
904
826
|
.singleOrNull()
|
|
@@ -909,8 +831,7 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
909
831
|
val parentPath = BrowserPathHelper.stripTrackId(singleContextualPath)
|
|
910
832
|
val trackId = BrowserPathHelper.extractTrackId(singleContextualPath)
|
|
911
833
|
|
|
912
|
-
// A tap
|
|
913
|
-
// identity for index-less paths — see indexOfTappedTrack).
|
|
834
|
+
// A tap within the queue's own source list skips rather than rebuilds.
|
|
914
835
|
if (trackId != null && parentPath == player.queueSourcePath) {
|
|
915
836
|
val queueTracks = withContext(Dispatchers.Main) { player.tracks }
|
|
916
837
|
val index = queueTracks.indexOfTappedTrack(singleContextualPath, trackId)
|
|
@@ -944,8 +865,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
944
865
|
result.startIndex.toDouble(),
|
|
945
866
|
::currentPlayerState,
|
|
946
867
|
) {
|
|
947
|
-
//
|
|
948
|
-
//
|
|
868
|
+
// Only on handleTrackLoad's default branch: a consumer that handles the load owns the
|
|
869
|
+
// queue.
|
|
949
870
|
if (singleContextualPath != null) {
|
|
950
871
|
val parentPath = BrowserPathHelper.stripTrackId(singleContextualPath)
|
|
951
872
|
withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
|
|
@@ -956,15 +877,10 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
956
877
|
}
|
|
957
878
|
|
|
958
879
|
/**
|
|
959
|
-
*
|
|
960
|
-
*
|
|
880
|
+
* Rebuilds the persisted queue for a system request (Bluetooth play, a head unit). With
|
|
881
|
+
* [isForPlayback] false it is the boot-time resumption notification asking: no network, stored
|
|
882
|
+
* track only.
|
|
961
883
|
*
|
|
962
|
-
* Reads the persisted playback state (URL + position + settings) and expands it into a full queue
|
|
963
|
-
* using the browse callback. This enables seamless resumption after app restart with the same
|
|
964
|
-
* player settings (repeat mode, shuffle, playback speed).
|
|
965
|
-
*
|
|
966
|
-
* @param isForPlayback True if this should start playback; false if just gathering info for the
|
|
967
|
-
* boot-time resumption notification (no network; local metadata only).
|
|
968
884
|
* @see https://developer.android.com/media/media3/session/background-playback#resumption
|
|
969
885
|
*/
|
|
970
886
|
override fun onPlaybackResumption(
|
|
@@ -994,8 +910,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
994
910
|
Timber.d("${controller.packageName}")
|
|
995
911
|
|
|
996
912
|
return scope.future {
|
|
997
|
-
// A pure read
|
|
998
|
-
//
|
|
913
|
+
// A pure read: restore() applies repeat/shuffle/speed to the live player and emits events to
|
|
914
|
+
// JS, so it waits for actual resumption.
|
|
999
915
|
val state =
|
|
1000
916
|
player.playbackStateStore.get()
|
|
1001
917
|
?: run {
|
|
@@ -1003,17 +919,14 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
1003
919
|
throw IllegalStateException("No playback state to resume")
|
|
1004
920
|
}
|
|
1005
921
|
|
|
1006
|
-
//
|
|
1007
|
-
//
|
|
1008
|
-
// (Track.disabled); failing the future refuses without touching the
|
|
1009
|
-
// player.
|
|
922
|
+
// A track disabled since it was saved never plays; failing the future refuses it without
|
|
923
|
+
// touching the player.
|
|
1010
924
|
if (state.track.disabled == true) {
|
|
1011
925
|
Timber.w("Refusing resumption of disabled track: ${state.track.title}")
|
|
1012
926
|
throw IllegalStateException("Persisted track is disabled")
|
|
1013
927
|
}
|
|
1014
928
|
|
|
1015
|
-
//
|
|
1016
|
-
// touch the live player or the network, and neither is permitted here.
|
|
929
|
+
// Before the restore and the expansion: both touch the live player or the network.
|
|
1017
930
|
if (!isForPlayback) {
|
|
1018
931
|
Timber.d("Info-gathering resumption (boot-time); returning stored track without expansion")
|
|
1019
932
|
return@future MediaSession.MediaItemsWithStartPosition(
|
|
@@ -1023,7 +936,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
1023
936
|
)
|
|
1024
937
|
}
|
|
1025
938
|
|
|
1026
|
-
// restore() sets player properties which must happen on main thread
|
|
1027
939
|
withContext(Dispatchers.Main) { player.playbackStateStore.restore() }
|
|
1028
940
|
|
|
1029
941
|
val path = state.track.path
|
|
@@ -1063,10 +975,10 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
1063
975
|
|
|
1064
976
|
/**
|
|
1065
977
|
* What a drill-in on a tile's sentinel path serves. Nothing, so Android Auto, which drills into a
|
|
1066
|
-
* tile whatever its flags, dead-ends at "No items" rather than stacking error pages.
|
|
1067
|
-
* Automotive OS
|
|
1068
|
-
*
|
|
1069
|
-
*
|
|
978
|
+
* tile whatever its flags, dead-ends at "No items" rather than stacking error pages. Android
|
|
979
|
+
* Automotive OS shows a root serving only a tile as one tab that drills in here, and an empty level
|
|
980
|
+
* as "Media isn't available for this list", so there [rootTile] is served again, unless it is the
|
|
981
|
+
* offline tile and the device is back online.
|
|
1070
982
|
*/
|
|
1071
983
|
internal fun deadEndChildren(
|
|
1072
984
|
parentId: String,
|
|
@@ -1087,16 +999,11 @@ internal fun deadEndTileOf(items: List<MediaItem>): MediaItem? =
|
|
|
1087
999
|
items.singleOrNull()?.takeIf { BrowserPathHelper.isDeadEndPath(it.mediaId) }
|
|
1088
1000
|
|
|
1089
1001
|
/**
|
|
1090
|
-
*
|
|
1091
|
-
*
|
|
1092
|
-
*
|
|
1093
|
-
*
|
|
1094
|
-
*
|
|
1095
|
-
* Tiles are the only in-browse error signal that exists. Verified on a head unit (2026-06): the
|
|
1096
|
-
* Android Auto browse list renders no error text for a transient [SessionError], for sticky
|
|
1097
|
-
* non-fatal replication, or for fatal replication (setLibraryErrorReplicationMode). Fatal
|
|
1098
|
-
* replication does surface the message on the playback screen, but at the cost of presenting the
|
|
1099
|
-
* session as STATE_ERROR with no actions, hiding the now-playing item and transport controls.
|
|
1002
|
+
* A non-playable item that stands in for a browse list's items: the only in-browse error signal.
|
|
1003
|
+
* Media3 drops [LibraryResult.ofError] on the legacy browse bridge, leaving "No items", and Android
|
|
1004
|
+
* Auto's browse list shows no text for a transient or replicated [SessionError]. Fatal replication
|
|
1005
|
+
* shows it on the playback screen only by putting the session in STATE_ERROR, which hides
|
|
1006
|
+
* now-playing and transport. https://github.com/androidx/media/issues/2901
|
|
1100
1007
|
*/
|
|
1101
1008
|
internal fun createErrorMediaItem(mediaId: String, title: String, subtitle: String): MediaItem =
|
|
1102
1009
|
MediaItem.Builder()
|
|
@@ -1105,91 +1012,72 @@ internal fun createErrorMediaItem(mediaId: String, title: String, subtitle: Stri
|
|
|
1105
1012
|
MediaMetadata.Builder()
|
|
1106
1013
|
.setTitle(title)
|
|
1107
1014
|
.setSubtitle(subtitle)
|
|
1108
|
-
// Android Automotive OS
|
|
1109
|
-
//
|
|
1015
|
+
// Android Automotive OS drops an item that is neither browsable nor playable; Android Auto
|
|
1016
|
+
// ignores these flags and drills in anyway (see deadEndChildren).
|
|
1110
1017
|
.setIsBrowsable(Automotive.device)
|
|
1111
1018
|
.setIsPlayable(false)
|
|
1112
1019
|
.build()
|
|
1113
1020
|
)
|
|
1114
1021
|
.build()
|
|
1115
1022
|
|
|
1116
|
-
/**
|
|
1117
|
-
* The formatted form every tile is built from: the message renders as the subtitle, with newlines
|
|
1118
|
-
* collapsed to spaces — list rows are single-line.
|
|
1119
|
-
*/
|
|
1120
1023
|
private fun createErrorMediaItem(mediaId: String, formatted: FormattedNavigationError): MediaItem =
|
|
1121
1024
|
createErrorMediaItem(
|
|
1122
1025
|
mediaId = mediaId,
|
|
1123
1026
|
title = formatted.title,
|
|
1027
|
+
// List rows are single-line.
|
|
1124
1028
|
subtitle = formatted.message?.replace('\n', ' ') ?: "",
|
|
1125
1029
|
)
|
|
1126
1030
|
|
|
1127
1031
|
/**
|
|
1128
|
-
*
|
|
1129
|
-
*
|
|
1130
|
-
* tiles, and deliberately NOT accompanied by a SessionError: an empty page is a successful resolve.
|
|
1032
|
+
* From the app's path-aware empty copy (ADR 0001). No SessionError goes with it: an empty page
|
|
1033
|
+
* resolved fine.
|
|
1131
1034
|
*/
|
|
1132
1035
|
internal fun createEmptyMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1133
1036
|
createErrorMediaItem(BrowserPathHelper.EMPTY_PATH, formatted)
|
|
1134
1037
|
|
|
1135
|
-
/**
|
|
1136
|
-
* Builds the offline tile from the app's formatted `network-error` copy for the path being served,
|
|
1137
|
-
* so one browse list never mixes the app's locale with the device's.
|
|
1138
|
-
*/
|
|
1038
|
+
/** From the app's copy, so one browse list never mixes the app's locale with the device's. */
|
|
1139
1039
|
internal fun createOfflineMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1140
1040
|
createErrorMediaItem(BrowserPathHelper.OFFLINE_PATH, formatted)
|
|
1141
1041
|
|
|
1142
1042
|
/**
|
|
1143
|
-
*
|
|
1144
|
-
*
|
|
1145
|
-
* guards; anything reaching a catch block is an online-but-failed request (e.g. server down, bad
|
|
1146
|
-
* status), so it must NOT be labelled "no internet connection".
|
|
1043
|
+
* For a request that failed while online; offline is caught earlier by the networkMonitor guards,
|
|
1044
|
+
* so this must not say "no internet connection".
|
|
1147
1045
|
*/
|
|
1148
1046
|
internal fun createBrowseErrorMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1149
1047
|
createErrorMediaItem(BrowserPathHelper.ERROR_PATH, formatted)
|
|
1150
1048
|
|
|
1151
1049
|
/**
|
|
1152
|
-
*
|
|
1153
|
-
*
|
|
1154
|
-
* root is not served through here — an empty tab list is a different condition.
|
|
1050
|
+
* A non-root level's or a search's items, or the lone empty tile. [formatted] is a JS hop, run only
|
|
1051
|
+
* when there are none. The root is not served through here.
|
|
1155
1052
|
*/
|
|
1156
1053
|
internal suspend fun browseLevelItems(
|
|
1157
1054
|
children: List<MediaItem>,
|
|
1158
1055
|
formatted: suspend () -> FormattedNavigationError,
|
|
1159
1056
|
): List<MediaItem> = children.ifEmpty { listOf(createEmptyMediaItem(formatted())) }
|
|
1160
1057
|
|
|
1161
|
-
/**
|
|
1058
|
+
/** No message of its own: the path carries the copy. */
|
|
1162
1059
|
internal fun emptyContentError(): NavigationError =
|
|
1163
1060
|
NavigationError(NavigationErrorType.EMPTY_CONTENT, "", null, null)
|
|
1164
1061
|
|
|
1165
|
-
/** The navigation error a browse or search served while offline raises. */
|
|
1166
1062
|
internal fun offlineError(): NavigationError =
|
|
1167
1063
|
NavigationError(NavigationErrorType.NETWORK_ERROR, "", null, null)
|
|
1168
1064
|
|
|
1169
|
-
/**
|
|
1065
|
+
/** What a re-read of the browse-error tile formats under: its exception is gone. */
|
|
1170
1066
|
internal fun browseFailureError(): NavigationError =
|
|
1171
1067
|
NavigationError(NavigationErrorType.UNKNOWN_ERROR, "", null, null)
|
|
1172
1068
|
|
|
1173
1069
|
/**
|
|
1174
|
-
*
|
|
1175
|
-
*
|
|
1176
|
-
* servable announces one — the empty tile [MediaSessionCallback.onGetSearchResult] serves in their
|
|
1177
|
-
* place — because a controller told zero never asks for items. The gate and failure branches
|
|
1178
|
-
* announce their own single tile by the same rule.
|
|
1070
|
+
* Disabled tracks hide, so they do not count. Never zero: a controller told zero never asks for
|
|
1071
|
+
* items, and the empty tile [MediaSessionCallback.onGetSearchResult] serves stands in.
|
|
1179
1072
|
*/
|
|
1180
1073
|
internal fun announcedSearchCount(sections: List<Section>?): Int =
|
|
1181
1074
|
(sections?.sumOf { section -> section.children.count { it.disabled != true } } ?: 0)
|
|
1182
1075
|
.coerceAtLeast(1)
|
|
1183
1076
|
|
|
1184
1077
|
/**
|
|
1185
|
-
* The search each controller was last served the offline tile for. Media3
|
|
1186
|
-
*
|
|
1187
|
-
*
|
|
1188
|
-
* again. Only an offline-served query is kept: a search that ran found what it found, and one that
|
|
1189
|
-
* failed did so with a network.
|
|
1190
|
-
*
|
|
1191
|
-
* Written from the callback's IO scope and read from the connectivity observer, so every accessor
|
|
1192
|
-
* is synchronized.
|
|
1078
|
+
* The search each controller was last served the offline tile for. Media3 keeps no record of a
|
|
1079
|
+
* search and it has no subscription, so without this the offline tile stays until the user searches
|
|
1080
|
+
* again. Written from the IO scope and read from the connectivity observer.
|
|
1193
1081
|
*/
|
|
1194
1082
|
internal class OfflineSearchRegistry {
|
|
1195
1083
|
private val searches = mutableMapOf<MediaSession.ControllerInfo, OfflineSearch>()
|
|
@@ -1213,7 +1101,6 @@ internal class OfflineSearchRegistry {
|
|
|
1213
1101
|
fun drain(): List<OfflineSearch> = searches.values.toList().also { searches.clear() }
|
|
1214
1102
|
}
|
|
1215
1103
|
|
|
1216
|
-
/** One controller's unanswered search: everything announcing it again needs. */
|
|
1217
1104
|
internal data class OfflineSearch(
|
|
1218
1105
|
val browser: MediaSession.ControllerInfo,
|
|
1219
1106
|
val query: String,
|
|
@@ -1221,13 +1108,9 @@ internal data class OfflineSearch(
|
|
|
1221
1108
|
)
|
|
1222
1109
|
|
|
1223
1110
|
/**
|
|
1224
|
-
*
|
|
1225
|
-
*
|
|
1226
|
-
*
|
|
1227
|
-
*
|
|
1228
|
-
* One slot, matching BrowserManager's single-entry result cache: two failures in a row leave only
|
|
1229
|
-
* the later query recorded, so a late fetch of the earlier one serves the empty tile instead of the
|
|
1230
|
-
* error tile. Acceptable while only the most recent search's results are retrievable at all.
|
|
1111
|
+
* The query whose search threw, so [MediaSessionCallback.onGetSearchResult] serves the error tile
|
|
1112
|
+
* rather than the empty one. One slot, like BrowserManager's single-entry result cache: a late
|
|
1113
|
+
* fetch of an earlier failed query serves the empty tile.
|
|
1231
1114
|
*/
|
|
1232
1115
|
internal class FailedSearchSlot {
|
|
1233
1116
|
@Volatile private var failed: Pair<String, NavigationError>? = null
|
|
@@ -1240,6 +1123,5 @@ internal class FailedSearchSlot {
|
|
|
1240
1123
|
failed = null
|
|
1241
1124
|
}
|
|
1242
1125
|
|
|
1243
|
-
/** The error [query] failed with, or null when it is not the query that failed. */
|
|
1244
1126
|
fun errorFor(query: String): NavigationError? = failed?.takeIf { it.first == query }?.second
|
|
1245
1127
|
}
|