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
|
@@ -17,39 +17,15 @@ import com.margelo.nitro.audiobrowser.OutputType
|
|
|
17
17
|
import timber.log.Timber
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
|
-
*
|
|
21
|
-
*
|
|
20
|
+
* Reports the audio output media plays to: a selected [RemoteOutputs] route first, else the local
|
|
21
|
+
* device.
|
|
22
22
|
*
|
|
23
|
-
* On API 33+ the
|
|
24
|
-
* which
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
* track (both report the merely *connected* device).
|
|
23
|
+
* On API 33+ the local device is [AudioManager.getAudioDevicesForAttributes] for `USAGE_MEDIA`,
|
|
24
|
+
* which follows a manual reroute through the system output switcher while headphones stay
|
|
25
|
+
* connected; `isBluetoothA2dpOn` and MediaRouter's selected route report only the connected device.
|
|
26
|
+
* Below 33 a heuristic over the connected devices stands in, and misses such a reroute.
|
|
28
27
|
*
|
|
29
|
-
* Change
|
|
30
|
-
* - [AudioDeviceCallback] fires immediately on device connect/disconnect/plug, and stays registered
|
|
31
|
-
* the whole time (works in the background too).
|
|
32
|
-
* - A poll catches a **manual reroute** (the active stream moved to another already-connected
|
|
33
|
-
* device via the system output switcher). This is the only way to detect that case, verified the
|
|
34
|
-
* hard way: it emits no public event — [AudioDeviceCallback] is device add/remove only,
|
|
35
|
-
* `AudioPlaybackCallback` fires on start/stop only, `MediaRouter`'s selected route stays stuck on
|
|
36
|
-
* the connected device, and [getAudioDevicesForAttributes] has no public listener. The player's
|
|
37
|
-
* `AudioTrack` routing listener would catch it, but only while a track is playing — polling is
|
|
38
|
-
* the only mechanism that also works when nothing is playing. The poll runs **only while the app
|
|
39
|
-
* is in the foreground** (gated on [ProcessLifecycleOwner]) and fires once immediately on
|
|
40
|
-
* foreground entry, so a reroute made while backgrounded is reflected the moment the user
|
|
41
|
-
* returns. Each tick is a cheap binder query (no wakelock).
|
|
42
|
-
*
|
|
43
|
-
* On API < 33 [getAudioDevicesForAttributes] is unavailable, so we fall back to a coarse heuristic
|
|
44
|
-
* over the connected output devices; that fallback cannot detect a manual reroute while a device
|
|
45
|
-
* stays connected (the long-standing limitation).
|
|
46
|
-
*
|
|
47
|
-
* A selected [RemoteOutputs] route takes precedence over the local device. Unlike a local device's,
|
|
48
|
-
* a remote route's selection is reliable: the router owns it.
|
|
49
|
-
*
|
|
50
|
-
* Threading: [AudioManager] queries are thread-safe, so [current] recomputes live on read (safe
|
|
51
|
-
* from the JS thread's `getOutput()`); emitted change events come from the main-thread
|
|
52
|
-
* callbacks/poll.
|
|
28
|
+
* Change events arrive on the main thread; [current] can be read from any thread.
|
|
53
29
|
*/
|
|
54
30
|
class OutputMonitor(private val context: Context) : DefaultLifecycleObserver {
|
|
55
31
|
|
|
@@ -62,12 +38,12 @@ class OutputMonitor(private val context: Context) : DefaultLifecycleObserver {
|
|
|
62
38
|
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
|
|
63
39
|
.build()
|
|
64
40
|
|
|
65
|
-
// Last emitted
|
|
41
|
+
// Last emitted output, the baseline for change detection; [current] reads it from any thread.
|
|
66
42
|
@Volatile private var cached: Output? = null
|
|
67
43
|
|
|
68
44
|
private var onOutputChanged: ((Output) -> Unit)? = null
|
|
69
45
|
|
|
70
|
-
/**
|
|
46
|
+
/** Read live; the last emitted output when there is no reading, null before any. */
|
|
71
47
|
val current: Output?
|
|
72
48
|
get() = computeOutput() ?: cached
|
|
73
49
|
|
|
@@ -86,8 +62,9 @@ class OutputMonitor(private val context: Context) : DefaultLifecycleObserver {
|
|
|
86
62
|
|
|
87
63
|
private val remoteOutputListener = { recompute("remote-output") }
|
|
88
64
|
|
|
89
|
-
//
|
|
90
|
-
//
|
|
65
|
+
// A manual reroute to an already-connected device emits no public event: AudioDeviceCallback is
|
|
66
|
+
// add/remove only, AudioPlaybackCallback start/stop only, and getAudioDevicesForAttributes has no
|
|
67
|
+
// listener. Polling catches it even when nothing plays. Scheduled only in the foreground.
|
|
91
68
|
private val poll =
|
|
92
69
|
object : Runnable {
|
|
93
70
|
override fun run() {
|
|
@@ -96,32 +73,29 @@ class OutputMonitor(private val context: Context) : DefaultLifecycleObserver {
|
|
|
96
73
|
}
|
|
97
74
|
}
|
|
98
75
|
|
|
99
|
-
/**
|
|
76
|
+
/** Safe from any thread: registers on the main thread. */
|
|
100
77
|
fun start() {
|
|
101
78
|
mainHandler.post {
|
|
102
79
|
audioManager.registerAudioDeviceCallback(deviceCallback, mainHandler)
|
|
103
80
|
RemoteOutputs.addListener(remoteOutputListener)
|
|
104
|
-
// Delivers onStart
|
|
81
|
+
// Delivers onStart at once when already in the foreground, which starts the poll.
|
|
105
82
|
ProcessLifecycleOwner.get().lifecycle.addObserver(this)
|
|
106
83
|
}
|
|
107
84
|
}
|
|
108
85
|
|
|
109
|
-
|
|
86
|
+
// Reads at once, so a reroute made in the background shows on return.
|
|
110
87
|
override fun onStart(owner: LifecycleOwner) {
|
|
111
88
|
recompute("foreground")
|
|
112
89
|
mainHandler.removeCallbacks(poll)
|
|
113
90
|
mainHandler.postDelayed(poll, POLL_INTERVAL_MS)
|
|
114
91
|
}
|
|
115
92
|
|
|
116
|
-
|
|
93
|
+
// The device callback stays registered in the background; only the poll stops.
|
|
117
94
|
override fun onStop(owner: LifecycleOwner) {
|
|
118
95
|
mainHandler.removeCallbacks(poll)
|
|
119
96
|
}
|
|
120
97
|
|
|
121
|
-
/**
|
|
122
|
-
* Stops monitoring. Must be called from the owner's teardown (AudioBrowser.dispose) so the
|
|
123
|
-
* callbacks don't leak across JS runtime reloads.
|
|
124
|
-
*/
|
|
98
|
+
/** Must be called on the owner's dispose, or the callbacks leak across JS runtime reloads. */
|
|
125
99
|
fun destroy() {
|
|
126
100
|
mainHandler.post {
|
|
127
101
|
mainHandler.removeCallbacks(poll)
|
|
@@ -132,8 +106,8 @@ class OutputMonitor(private val context: Context) : DefaultLifecycleObserver {
|
|
|
132
106
|
}
|
|
133
107
|
|
|
134
108
|
private fun recompute(reason: String) {
|
|
135
|
-
//
|
|
136
|
-
//
|
|
109
|
+
// With no local reading, a remote output that is gone falls back to the phone speaker, so
|
|
110
|
+
// listeners hear that it is gone.
|
|
137
111
|
val output =
|
|
138
112
|
computeOutput()
|
|
139
113
|
?: if (cached?.type in REMOTE_TYPES)
|
|
@@ -163,10 +137,7 @@ class OutputMonitor(private val context: Context) : DefaultLifecycleObserver {
|
|
|
163
137
|
return computeOutputLegacy()
|
|
164
138
|
}
|
|
165
139
|
|
|
166
|
-
|
|
167
|
-
* API < 33 fallback: pick from the connected output devices. Cannot tell which is *actively*
|
|
168
|
-
* rendering, so it mirrors the old `isBluetoothA2dpOn` heuristic.
|
|
169
|
-
*/
|
|
140
|
+
// API < 33: cannot tell which connected device renders, so it guesses from isBluetoothA2dpOn.
|
|
170
141
|
@Suppress("DEPRECATION")
|
|
171
142
|
private fun computeOutputLegacy(): Output? {
|
|
172
143
|
val outputs = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS).filterNotNull()
|
|
@@ -202,7 +173,7 @@ class OutputMonitor(private val context: Context) : DefaultLifecycleObserver {
|
|
|
202
173
|
private const val POLL_INTERVAL_MS = 1000L
|
|
203
174
|
private val REMOTE_TYPES = setOf(OutputType.REMOTE, OutputType.CAST, OutputType.SONOS)
|
|
204
175
|
|
|
205
|
-
/** Maps an [AudioDeviceInfo]
|
|
176
|
+
/** Maps an [AudioDeviceInfo] `TYPE_*` to an [OutputType]; [OutputType.OTHER] if unknown. */
|
|
206
177
|
fun outputTypeOf(deviceType: Int): OutputType =
|
|
207
178
|
when (deviceType) {
|
|
208
179
|
AudioDeviceInfo.TYPE_BLUETOOTH_A2DP,
|
|
@@ -7,26 +7,17 @@ import android.os.Build
|
|
|
7
7
|
import timber.log.Timber
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* System-rendered; the app does not own its look.
|
|
13
|
-
*
|
|
14
|
-
* Availability is Android 11+ (API 30, [isSupported]): API 34+ has the direct
|
|
15
|
-
* `MediaRouter2.showSystemOutputSwitcher()` call, and API 30–33 open the `MEDIA_OUTPUT` settings
|
|
16
|
-
* panel. Below 30 there is no system switcher, so callers should hide the control rather than call
|
|
17
|
-
* [open] (which no-ops + logs).
|
|
18
|
-
*
|
|
19
|
-
* (Android, unlike iOS, does not let an app force media to an arbitrary specific Bluetooth device —
|
|
20
|
-
* route selection is the system's job, which is exactly what this switcher hands off to.)
|
|
10
|
+
* Opens the system output switcher, where the user picks the device media plays to. Android lets no
|
|
11
|
+
* app route media to a specific Bluetooth device itself.
|
|
21
12
|
*/
|
|
22
13
|
object OutputSwitcher {
|
|
14
|
+
/** Android 11+. Below it [open] only logs, so callers hide the control. */
|
|
23
15
|
fun isSupported(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
|
|
24
16
|
|
|
25
17
|
fun open(context: Context) {
|
|
26
18
|
when {
|
|
27
19
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> {
|
|
28
|
-
//
|
|
29
|
-
// (e.g. no eligible routes); fall back to the settings panel.
|
|
20
|
+
// False when it cannot be shown, e.g. no eligible routes.
|
|
30
21
|
val shown =
|
|
31
22
|
runCatching { MediaRouter2.getInstance(context).showSystemOutputSwitcher() }
|
|
32
23
|
.getOrDefault(false)
|
|
@@ -37,11 +28,8 @@ object OutputSwitcher {
|
|
|
37
28
|
}
|
|
38
29
|
}
|
|
39
30
|
|
|
40
|
-
//
|
|
41
|
-
//
|
|
42
|
-
// settings-panel action string. Launched from the application context, so it
|
|
43
|
-
// needs NEW_TASK. The package extra scopes the switcher to this app's media
|
|
44
|
-
// routing; harmless if the panel ignores it.
|
|
31
|
+
// NEW_TASK because the context may be the application's. The package extra scopes the panel to
|
|
32
|
+
// this app's media.
|
|
45
33
|
private fun openSettingsPanel(context: Context) {
|
|
46
34
|
val intent =
|
|
47
35
|
Intent(ACTION_MEDIA_OUTPUT)
|
|
@@ -51,8 +39,7 @@ object OutputSwitcher {
|
|
|
51
39
|
.onFailure { Timber.e(it, "OutputSwitcher: failed to open MEDIA_OUTPUT panel") }
|
|
52
40
|
}
|
|
53
41
|
|
|
54
|
-
//
|
|
55
|
-
// Not public SDK symbols — verify on device.
|
|
42
|
+
// The framework's settings-panel strings; not public SDK symbols.
|
|
56
43
|
private const val ACTION_MEDIA_OUTPUT = "com.android.settings.panel.action.MEDIA_OUTPUT"
|
|
57
44
|
private const val EXTRA_OUTPUT_SWITCHER_PACKAGE = "com.android.settings.panel.extra.PACKAGE_NAME"
|
|
58
45
|
}
|
|
@@ -5,12 +5,10 @@ import com.margelo.nitro.audiobrowser.PlayingState
|
|
|
5
5
|
|
|
6
6
|
object PlayingStateFactory {
|
|
7
7
|
/**
|
|
8
|
-
*
|
|
8
|
+
* `playing` reports intent, not audible output: it holds through every state but ERROR, ENDED,
|
|
9
|
+
* NONE and STOPPED, PAUSED included. `buffering` implies `playing`.
|
|
9
10
|
*
|
|
10
|
-
* @param shouldPlayWhenReady
|
|
11
|
-
* output back
|
|
12
|
-
* @param playbackState The current player state
|
|
13
|
-
* @return A PlayingState representing the current playing/buffering status
|
|
11
|
+
* @param shouldPlayWhenReady playWhenReady and no suppression of output, not playWhenReady alone
|
|
14
12
|
*/
|
|
15
13
|
fun derive(shouldPlayWhenReady: Boolean, playbackState: PlaybackState): PlayingState {
|
|
16
14
|
val playing =
|
|
@@ -3,12 +3,11 @@ package com.audiobrowser.util
|
|
|
3
3
|
import androidx.media3.common.HeartRating
|
|
4
4
|
import androidx.media3.common.Rating
|
|
5
5
|
|
|
6
|
-
/**
|
|
7
|
-
* Maps a Media3 [Rating] arriving from a controller (e.g. Android Automotive OS's rating control)
|
|
8
|
-
* to a favorite intent. Only an explicitly-rated heart carries favorite intent: a thumbs / star /
|
|
9
|
-
* percentage rating, or an unrated (cleared) heart, returns null — no favorite change.
|
|
10
|
-
*/
|
|
11
6
|
object RatingFavorites {
|
|
7
|
+
/**
|
|
8
|
+
* The favorite state a controller's [rating] asks for, or null for no change. Only a rated
|
|
9
|
+
* [HeartRating] counts: a thumb, star or percentage rating, or an unrated heart, returns null.
|
|
10
|
+
*/
|
|
12
11
|
fun favoritedFor(rating: Rating): Boolean? =
|
|
13
12
|
(rating as? HeartRating)?.takeIf { it.isRated }?.isHeart
|
|
14
13
|
}
|
|
@@ -9,9 +9,9 @@ import com.margelo.nitro.audiobrowser.StyleDisplay
|
|
|
9
9
|
import com.margelo.nitro.audiobrowser.TrackStyle
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
|
-
* The all-
|
|
13
|
-
*
|
|
14
|
-
*
|
|
12
|
+
* The all-null blocks a decode collapses to "no declaration". Compare against these rather than
|
|
13
|
+
* listing fields in a guard, so a field added to the constructor breaks this file instead of
|
|
14
|
+
* slipping past a guard.
|
|
15
15
|
*/
|
|
16
16
|
internal val EMPTY_TRACK_STYLE =
|
|
17
17
|
TrackStyle(
|
|
@@ -37,8 +37,8 @@ internal val EMPTY_SECTION_STYLE =
|
|
|
37
37
|
|
|
38
38
|
/**
|
|
39
39
|
* The style block's wire strings (ADR 0011) ↔ Nitro enums, shared by the browse decoder and the
|
|
40
|
-
* playback-state store. Inbound
|
|
41
|
-
*
|
|
40
|
+
* playback-state store. Inbound is lenient: an unknown or empty value is "no declaration", never an
|
|
41
|
+
* error.
|
|
42
42
|
*/
|
|
43
43
|
internal fun StyleDisplay.toWireString(): String =
|
|
44
44
|
when (this) {
|
|
@@ -2,17 +2,13 @@ package com.audiobrowser.util
|
|
|
2
2
|
|
|
3
3
|
import android.net.Uri
|
|
4
4
|
|
|
5
|
-
/**
|
|
6
|
-
* Utility for SVG artwork detection.
|
|
7
|
-
*
|
|
8
|
-
* Artwork delivery for Android Auto browse items is handled via the content:// provider
|
|
9
|
-
* (ArtworkContentProvider + CoilArtworkLoader), which supports SVG natively in-process. This object
|
|
10
|
-
* retains [isSvgUrl] which is still used by [TrackFactory.toBrowseMediaItem] and
|
|
11
|
-
* [CoilArtworkLoader] to tag registrations with the correct decoder hint.
|
|
12
|
-
*/
|
|
5
|
+
/** Detects SVG URLs only; SVG decoding happens in [CoilArtworkLoader] through Coil's SvgDecoder. */
|
|
13
6
|
object SvgArtworkRenderer {
|
|
14
7
|
|
|
15
|
-
/**
|
|
8
|
+
/**
|
|
9
|
+
* Whether the URL's path ends in `.svg`, ignoring case and any query. An SVG served from a path
|
|
10
|
+
* without that extension reads as false.
|
|
11
|
+
*/
|
|
16
12
|
fun isSvgUrl(url: String?): Boolean {
|
|
17
13
|
if (url == null) return false
|
|
18
14
|
return try {
|
|
@@ -7,10 +7,8 @@ import android.content.IntentFilter
|
|
|
7
7
|
import android.media.AudioManager
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* Uses a BroadcastReceiver for VOLUME_CHANGED_ACTION to detect volume changes. Reports volume as a
|
|
13
|
-
* normalized value between 0.0 and 1.0.
|
|
10
|
+
* The music stream's volume as 0.0–1.0. Registers its receiver on construction; the owner must call
|
|
11
|
+
* [destroy].
|
|
14
12
|
*/
|
|
15
13
|
class SystemVolumeMonitor(private val context: Context) {
|
|
16
14
|
private val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
|
|
@@ -19,6 +17,7 @@ class SystemVolumeMonitor(private val context: Context) {
|
|
|
19
17
|
|
|
20
18
|
fun getVolume(): Double = getCurrentVolume()
|
|
21
19
|
|
|
20
|
+
/** Clamps to 0.0–1.0 and truncates to the stream's step below. */
|
|
22
21
|
fun setVolume(volume: Double) {
|
|
23
22
|
val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
|
|
24
23
|
val newVolume = (volume.coerceIn(0.0, 1.0) * maxVolume).toInt()
|
|
@@ -46,19 +45,17 @@ class SystemVolumeMonitor(private val context: Context) {
|
|
|
46
45
|
}
|
|
47
46
|
|
|
48
47
|
init {
|
|
48
|
+
// Hidden AudioManager broadcast: the SDK has no public constant for it or its stream extra.
|
|
49
49
|
context.registerReceiver(volumeReceiver, IntentFilter("android.media.VOLUME_CHANGED_ACTION"))
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
/**
|
|
53
|
-
* Unregisters the
|
|
54
|
-
* (AudioBrowser.dispose) — without it the receiver leaks across JS runtime reloads. Safe to call
|
|
53
|
+
* Unregisters the receiver. Without it the receiver leaks across JS runtime reloads. Safe to call
|
|
55
54
|
* more than once.
|
|
56
55
|
*/
|
|
57
56
|
fun destroy() {
|
|
58
57
|
try {
|
|
59
58
|
context.unregisterReceiver(volumeReceiver)
|
|
60
|
-
} catch (_: IllegalArgumentException) {
|
|
61
|
-
// already unregistered
|
|
62
|
-
}
|
|
59
|
+
} catch (_: IllegalArgumentException) {}
|
|
63
60
|
}
|
|
64
61
|
}
|
|
@@ -10,34 +10,28 @@ import com.margelo.nitro.audiobrowser.Track
|
|
|
10
10
|
import com.margelo.nitro.audiobrowser.TrackStyle
|
|
11
11
|
|
|
12
12
|
/**
|
|
13
|
-
* The
|
|
14
|
-
*
|
|
15
|
-
* and the mediaId is the stable `id` for playable tracks, falling back to `path` then `src` (a
|
|
16
|
-
* Track must have one of the latter two — see the `src` vs `path` note in GLOSSARY.md). The list
|
|
17
|
-
* line renders from `subtitle` (the now-playing line is re-stamped from `artist` by the now-playing
|
|
18
|
-
* pipeline; see the Now Playing Metadata guide).
|
|
13
|
+
* The one Track → Media3 [MediaItem] conversion. A Track needs `path` or `src`; see the `src` vs
|
|
14
|
+
* `path` note in GLOSSARY.md.
|
|
19
15
|
*/
|
|
20
16
|
object TrackFactory {
|
|
21
|
-
/** Set once by the Player. */
|
|
22
17
|
@Volatile var artworkRoutes: ArtworkRoutes? = null
|
|
23
18
|
|
|
24
19
|
/**
|
|
25
|
-
* The artwork URI the session publishes for [url]
|
|
26
|
-
* loads artwork only from `content://`, `android.resource://` and `file://`
|
|
27
|
-
* is served through the provider
|
|
20
|
+
* The artwork URI the session publishes for [url]: [url] itself, except on Android Automotive OS,
|
|
21
|
+
* whose car media app loads artwork only from `content://`, `android.resource://` and `file://`
|
|
22
|
+
* URIs, where http(s) artwork is served through the provider.
|
|
28
23
|
*/
|
|
29
24
|
fun sessionArtworkUri(url: String, headers: Map<String, String>?, isSvg: Boolean): String {
|
|
30
25
|
val provider = artworkRoutes?.takeIf { Automotive.device } ?: return url
|
|
31
26
|
return provider.route(url, headers, isSvg, pinned = true)
|
|
32
27
|
}
|
|
33
28
|
|
|
34
|
-
/** Whether favoriting is on: the `favorite` capability, set by the Player. */
|
|
35
29
|
@Volatile var favoriteEnabled = false
|
|
36
30
|
|
|
37
31
|
/**
|
|
38
|
-
* Sets the heart
|
|
39
|
-
*
|
|
40
|
-
*
|
|
32
|
+
* Sets the heart user rating: [favorited], or unrated when that is unknown on a [playable] item,
|
|
33
|
+
* so Android Automotive OS, which draws its own favorite control from it, always has one to draw.
|
|
34
|
+
* None while [favoriteEnabled] is off.
|
|
41
35
|
*/
|
|
42
36
|
fun MediaMetadata.Builder.setFavorite(
|
|
43
37
|
favorited: Boolean?,
|
|
@@ -52,19 +46,16 @@ object TrackFactory {
|
|
|
52
46
|
}
|
|
53
47
|
)
|
|
54
48
|
|
|
49
|
+
/** Throws unless [mediaItem] was built here, which tags it with its Track. */
|
|
55
50
|
fun fromMedia3(mediaItem: MediaItem): Track {
|
|
56
51
|
return mediaItem.localConfiguration!!.tag as Track
|
|
57
52
|
}
|
|
58
53
|
|
|
59
54
|
/**
|
|
60
|
-
* A
|
|
61
|
-
*
|
|
62
|
-
*
|
|
63
|
-
*
|
|
64
|
-
* on), and without it Android Auto would always render that page as a list.
|
|
65
|
-
*
|
|
66
|
-
* [title] is the consumer's `viewMoreTitle`, one string for every section — not the section's own
|
|
67
|
-
* title, which the group header above the row already shows.
|
|
55
|
+
* A browsable Track for a section's "view more" row (ADR 0010). It carries the section's style,
|
|
56
|
+
* `display` included: nothing else can declare the layout of the page it opens, and without it
|
|
57
|
+
* Android Auto renders that page as a list. [title] is the consumer's `viewMoreTitle`, not the
|
|
58
|
+
* section's title.
|
|
68
59
|
*/
|
|
69
60
|
fun navigationTrack(section: Section, title: String): Track =
|
|
70
61
|
Track(
|
|
@@ -111,10 +102,9 @@ object TrackFactory {
|
|
|
111
102
|
}
|
|
112
103
|
|
|
113
104
|
/**
|
|
114
|
-
*
|
|
115
|
-
* SVG apply in
|
|
116
|
-
*
|
|
117
|
-
* unchanged so vector/category icons survive.
|
|
105
|
+
* Routes http(s) artwork through the `content://` provider, registered in [registry], so headers
|
|
106
|
+
* and SVG rendering apply in this process and no bytes cross the Binder. Other artwork
|
|
107
|
+
* (`android.resource://` icons, `file://`) passes through unchanged, so vector icons survive.
|
|
118
108
|
*/
|
|
119
109
|
fun toBrowseMediaItem(
|
|
120
110
|
track: Track,
|
|
@@ -135,16 +125,12 @@ object TrackFactory {
|
|
|
135
125
|
SvgArtworkRenderer.isSvgUrl(artworkUri(track)) ||
|
|
136
126
|
SvgArtworkRenderer.isSvgUrl(track.artwork?.url)
|
|
137
127
|
|
|
138
|
-
/** The transformed artworkSource wins over the raw artwork field. */
|
|
139
128
|
private fun artworkUri(track: Track): String? = track.artworkSource?.uri ?: track.artwork?.url
|
|
140
129
|
|
|
141
|
-
/**
|
|
142
|
-
* All metadata except artwork. The owning [section] (browse surfaces only) supplies the
|
|
143
|
-
* group-title header hint and the per-item style default (ADR 0010).
|
|
144
|
-
*/
|
|
145
130
|
private fun metadataBuilder(track: Track, section: Section? = null): MediaMetadata.Builder =
|
|
146
131
|
MediaMetadata.Builder()
|
|
147
132
|
.setTitle(track.title)
|
|
133
|
+
// The list line shows `subtitle`; the now-playing pipeline re-stamps it from `artist`.
|
|
148
134
|
.setArtist(track.subtitle)
|
|
149
135
|
.setAlbumTitle(track.album)
|
|
150
136
|
.setDescription(track.description)
|
|
@@ -155,18 +141,11 @@ object TrackFactory {
|
|
|
155
141
|
.setFavorite(track.favorited, playable = track.src != null)
|
|
156
142
|
|
|
157
143
|
private fun buildMediaItem(track: Track, metadata: MediaMetadata): MediaItem {
|
|
158
|
-
//
|
|
159
|
-
//
|
|
160
|
-
//
|
|
161
|
-
//
|
|
162
|
-
//
|
|
163
|
-
// mediaId equality between the row and the player's current item (media3
|
|
164
|
-
// announces `currentMediaItem.mediaId` in the legacy playback state), and a
|
|
165
|
-
// consumer-loaded track's `src` can differ textually from the browse row's
|
|
166
|
-
// for the same item (absolute vs relative, extra query params) — the id is
|
|
167
|
-
// the one string both sides share. It is also context-free, so the same
|
|
168
|
-
// station gets the same mediaId in every tab. Browsable-only tracks keep
|
|
169
|
-
// `path` so navigation parentIds stay resolvable paths.
|
|
144
|
+
// Android Auto marks the now-playing browse row by exact mediaId equality with the player's
|
|
145
|
+
// current item, and a loaded track's `src` can differ textually from the row's, so a playable
|
|
146
|
+
// track uses its `id`, then `path`, deliberately not Track.identity (ADR 0008). The id is also
|
|
147
|
+
// context-free: the same item gets the same mediaId in every tab. Browsable tracks keep `path`
|
|
148
|
+
// so navigation parentIds stay resolvable.
|
|
170
149
|
val stableId = if (track.src != null) track.id?.takeUnless { it.isBlank() } else null
|
|
171
150
|
val mediaId =
|
|
172
151
|
stableId
|
|
@@ -178,10 +157,9 @@ object TrackFactory {
|
|
|
178
157
|
return MediaItem.Builder()
|
|
179
158
|
.setMediaId(mediaId)
|
|
180
159
|
.setUri(track.src)
|
|
181
|
-
//
|
|
182
|
-
//
|
|
183
|
-
//
|
|
184
|
-
// itself — resolveMediaItemToTrack rebuilds a minimal track from this.
|
|
160
|
+
// A controller replaying this item after process death sends back only mediaId and
|
|
161
|
+
// requestMetadata, and an id mediaId cannot be played on its own: resolveMediaItemToTrack
|
|
162
|
+
// rebuilds the track from this.
|
|
185
163
|
.setRequestMetadata(
|
|
186
164
|
MediaItem.RequestMetadata.Builder().setMediaUri(track.src?.toUri()).build()
|
|
187
165
|
)
|
|
@@ -4,11 +4,9 @@ import android.content.Context
|
|
|
4
4
|
import com.audiobrowser.remote.RemotePlayback
|
|
5
5
|
import timber.log.Timber
|
|
6
6
|
|
|
7
|
-
/** The library is built without Cast: no Cast routes. */
|
|
8
7
|
@Suppress("UNUSED_PARAMETER")
|
|
9
8
|
internal fun castRouteCategory(receiverApplicationId: String?): String? = null
|
|
10
9
|
|
|
11
|
-
/** The library is built without Cast: always null, with a warning. */
|
|
12
10
|
@Suppress("UNUSED_PARAMETER")
|
|
13
11
|
internal fun createCastRemote(context: Context, receiverApplicationId: String?): RemotePlayback? {
|
|
14
12
|
Timber.w(
|
|
@@ -24,8 +24,7 @@ import org.robolectric.RobolectricTestRunner
|
|
|
24
24
|
import org.robolectric.Shadows.shadowOf
|
|
25
25
|
import org.robolectric.annotation.Config
|
|
26
26
|
|
|
27
|
-
// Robolectric:
|
|
28
|
-
// ShadowService records each.
|
|
27
|
+
// Robolectric: ShadowService records startForeground, stopForeground and stopSelf.
|
|
29
28
|
@OptIn(UnstableApi::class)
|
|
30
29
|
@RunWith(RobolectricTestRunner::class)
|
|
31
30
|
class ForegroundStartTest {
|
|
@@ -19,9 +19,9 @@ import org.robolectric.RuntimeEnvironment
|
|
|
19
19
|
import org.robolectric.Shadows.shadowOf
|
|
20
20
|
|
|
21
21
|
/**
|
|
22
|
-
* Media3 hands a legacy controller's `setRating` to the
|
|
23
|
-
*
|
|
24
|
-
*
|
|
22
|
+
* Media3 hands a legacy controller's `setRating` to the media-id callback with the current item's
|
|
23
|
+
* id. Robolectric cannot route a MediaControllerCompat to the session, so these call that callback
|
|
24
|
+
* directly.
|
|
25
25
|
*/
|
|
26
26
|
@RunWith(RobolectricTestRunner::class)
|
|
27
27
|
class LegacyRatingTest {
|
|
@@ -13,8 +13,6 @@ import org.robolectric.RobolectricTestRunner
|
|
|
13
13
|
import org.robolectric.RuntimeEnvironment
|
|
14
14
|
import org.robolectric.Shadows.shadowOf
|
|
15
15
|
|
|
16
|
-
// Robolectric: bindService/unbindService only exist under the framework, and ShadowApplication
|
|
17
|
-
// records both sides — which is precisely the leak being guarded against.
|
|
18
16
|
@RunWith(RobolectricTestRunner::class)
|
|
19
17
|
class ServiceBindingTest {
|
|
20
18
|
|
|
@@ -29,7 +27,6 @@ class ServiceBindingTest {
|
|
|
29
27
|
override fun onServiceDisconnected(name: ComponentName?) = Unit
|
|
30
28
|
}
|
|
31
29
|
|
|
32
|
-
/** Both the auto-bind at construction and setup's bind reach the same object. */
|
|
33
30
|
@Test
|
|
34
31
|
fun bindingTwiceTakesOnlyOneBinding() {
|
|
35
32
|
val binding = ServiceBinding(app)
|
|
@@ -45,7 +42,6 @@ class ServiceBindingTest {
|
|
|
45
42
|
assertEquals(1, shadowOf(app).unboundServiceConnections.size)
|
|
46
43
|
}
|
|
47
44
|
|
|
48
|
-
/** dispose() must not throw, and Android throws when unbinding a connection it never had. */
|
|
49
45
|
@Test
|
|
50
46
|
fun unbindWithoutBindIsANoOp() {
|
|
51
47
|
val binding = ServiceBinding(app)
|
|
@@ -56,11 +52,6 @@ class ServiceBindingTest {
|
|
|
56
52
|
assertTrue(shadowOf(app).unboundServiceConnections.isEmpty())
|
|
57
53
|
}
|
|
58
54
|
|
|
59
|
-
/**
|
|
60
|
-
* Android registers the connection before it asks the ActivityManager, so a false return still
|
|
61
|
-
* leaves a binding to release. Treating false as "nothing bound" strands it permanently — the
|
|
62
|
-
* leak this class exists to prevent.
|
|
63
|
-
*/
|
|
64
55
|
@Test
|
|
65
56
|
fun failedBindStillHoldsAConnectionToRelease() {
|
|
66
57
|
val binding = ServiceBinding(app)
|
|
@@ -75,10 +66,6 @@ class ServiceBindingTest {
|
|
|
75
66
|
assertEquals(1, shadowOf(app).unboundServiceConnections.size)
|
|
76
67
|
}
|
|
77
68
|
|
|
78
|
-
/**
|
|
79
|
-
* setupPlayer binds after the auto-bind at construction already has. If that first bind failed,
|
|
80
|
-
* the service never connects, so setup must hear false and reject rather than wait for it.
|
|
81
|
-
*/
|
|
82
69
|
@Test
|
|
83
70
|
fun bindingAgainAfterAFailedBindReportsTheFailure() {
|
|
84
71
|
val binding = ServiceBinding(app)
|
|
@@ -18,8 +18,6 @@ import org.robolectric.RobolectricTestRunner
|
|
|
18
18
|
import org.robolectric.RuntimeEnvironment
|
|
19
19
|
import org.robolectric.Shadows.shadowOf
|
|
20
20
|
|
|
21
|
-
// Robolectric: the Service builds a real ExoPlayer and MediaLibrarySession, and ServiceController
|
|
22
|
-
// drives onBind/onUnbind/onRebind as the framework would.
|
|
23
21
|
@RunWith(RobolectricTestRunner::class)
|
|
24
22
|
class ServiceTaskRemovedTest {
|
|
25
23
|
|
|
@@ -80,6 +78,7 @@ class ServiceTaskRemovedTest {
|
|
|
80
78
|
|
|
81
79
|
removeTask()
|
|
82
80
|
|
|
81
|
+
// The first variant is null: no timer.
|
|
83
82
|
assertTrue(player.sleepTimer.get().isFirst)
|
|
84
83
|
}
|
|
85
84
|
|
|
@@ -93,7 +92,7 @@ class ServiceTaskRemovedTest {
|
|
|
93
92
|
|
|
94
93
|
assertFalse(player.exoPlayer.isReleased)
|
|
95
94
|
assertEquals(listOf("b"), player.tracks.map { it.title })
|
|
96
|
-
// Moves only on events from a live engine.
|
|
95
|
+
// Moves past BUFFERING only on events from a live engine.
|
|
97
96
|
assertEquals(PlaybackState.BUFFERING, player.playbackState)
|
|
98
97
|
}
|
|
99
98
|
|
|
@@ -21,9 +21,8 @@ import com.margelo.nitro.audiobrowser.TransformableRequestConfig
|
|
|
21
21
|
import com.margelo.nitro.core.Promise
|
|
22
22
|
|
|
23
23
|
/**
|
|
24
|
-
*
|
|
25
|
-
* only
|
|
26
|
-
* test.
|
|
24
|
+
* Builders for Nitro structs, whose generated constructors take every field, so a new field breaks
|
|
25
|
+
* only this file instead of every test.
|
|
27
26
|
*/
|
|
28
27
|
object TestFixtures {
|
|
29
28
|
|
|
@@ -60,7 +59,6 @@ object TestFixtures {
|
|
|
60
59
|
icyCharset = null,
|
|
61
60
|
)
|
|
62
61
|
|
|
63
|
-
/** A page [Section] — plain list by default. */
|
|
64
62
|
fun section(
|
|
65
63
|
children: Array<Track> = emptyArray(),
|
|
66
64
|
title: String? = null,
|
|
@@ -109,11 +107,6 @@ object TestFixtures {
|
|
|
109
107
|
userAgent = null,
|
|
110
108
|
)
|
|
111
109
|
|
|
112
|
-
/**
|
|
113
|
-
* Builds a minimal browse-only Track (no src → browsable, not playable). Pass [artworkSource] for
|
|
114
|
-
* a pre-resolved HTTP artwork URL or [artwork] for a raw resource/file URI; omit both for no
|
|
115
|
-
* artwork.
|
|
116
|
-
*/
|
|
117
110
|
fun browseTrack(
|
|
118
111
|
title: String = "T",
|
|
119
112
|
path: String = "https://api.example.com/channel/abc",
|
|
@@ -124,7 +117,7 @@ object TestFixtures {
|
|
|
124
117
|
Track(
|
|
125
118
|
id = null,
|
|
126
119
|
path = path,
|
|
127
|
-
src = null,
|
|
120
|
+
src = null,
|
|
128
121
|
artwork = artworkOf(artwork),
|
|
129
122
|
artworkSource = artworkSource,
|
|
130
123
|
request = null,
|
|
@@ -143,7 +136,6 @@ object TestFixtures {
|
|
|
143
136
|
icyCharset = null,
|
|
144
137
|
)
|
|
145
138
|
|
|
146
|
-
/** A container [ResolvedTrack] — what a browse route hands back for a path. */
|
|
147
139
|
fun resolvedTrack(
|
|
148
140
|
path: String = "/container",
|
|
149
141
|
title: String = "Container",
|
|
@@ -177,9 +169,8 @@ object TestFixtures {
|
|
|
177
169
|
)
|
|
178
170
|
|
|
179
171
|
/**
|
|
180
|
-
* A route serving [browseStatic] verbatim
|
|
181
|
-
*
|
|
182
|
-
* unit test gives [com.audiobrowser.browser.BrowserManager] page content to resolve.
|
|
172
|
+
* A route serving [browseStatic] verbatim: the one browse arm that needs neither the JNI bridge
|
|
173
|
+
* nor HTTP.
|
|
183
174
|
*/
|
|
184
175
|
fun staticRoute(path: String, browseStatic: ResolvedTrack) =
|
|
185
176
|
NativeRouteEntry(
|