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
|
@@ -24,26 +24,15 @@ import org.json.JSONObject
|
|
|
24
24
|
import timber.log.Timber
|
|
25
25
|
|
|
26
26
|
/**
|
|
27
|
-
* Persists
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
* Settings (repeatMode, shuffleEnabled, playbackSpeed) are auto-persisted when set via properties.
|
|
32
|
-
* Position/track are persisted via save() on pause or track change.
|
|
27
|
+
* Persists the current track, position and player settings so a media button (a Bluetooth play
|
|
28
|
+
* press) can resume playback after process death. The settings properties write through on set;
|
|
29
|
+
* track and position persist only through the save calls.
|
|
33
30
|
*/
|
|
34
31
|
class PlaybackStateStore(private val player: Player) {
|
|
35
32
|
private val prefs: SharedPreferences =
|
|
36
33
|
player.context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
|
37
34
|
|
|
38
|
-
/**
|
|
39
|
-
* Persisted playback state for resumption.
|
|
40
|
-
*
|
|
41
|
-
* @param track The track being played (includes path for queue expansion)
|
|
42
|
-
* @param positionMs The playback position in milliseconds (C.TIME_UNSET for default/live edge)
|
|
43
|
-
* @param repeatMode The repeat mode setting
|
|
44
|
-
* @param shuffleEnabled Whether shuffle mode was enabled
|
|
45
|
-
* @param playbackSpeed The playback speed (1.0 = normal)
|
|
46
|
-
*/
|
|
35
|
+
/** [positionMs] is [C.TIME_UNSET] for a live track: Media3 starts it at the live edge. */
|
|
47
36
|
data class PersistedState(
|
|
48
37
|
val track: Track,
|
|
49
38
|
val positionMs: Long,
|
|
@@ -52,7 +41,6 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
52
41
|
val playbackSpeed: Float,
|
|
53
42
|
)
|
|
54
43
|
|
|
55
|
-
/** Repeat mode setting - auto-persisted when set. */
|
|
56
44
|
var repeatMode: RepeatMode
|
|
57
45
|
get() =
|
|
58
46
|
prefs.getString(KEY_REPEAT_MODE, null)?.let { name ->
|
|
@@ -62,14 +50,12 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
62
50
|
prefs.edit { putString(KEY_REPEAT_MODE, value.name) }
|
|
63
51
|
}
|
|
64
52
|
|
|
65
|
-
/** Shuffle mode setting - auto-persisted when set. */
|
|
66
53
|
var shuffleEnabled: Boolean
|
|
67
54
|
get() = prefs.getBoolean(KEY_SHUFFLE_ENABLED, false)
|
|
68
55
|
set(value) {
|
|
69
56
|
prefs.edit { putBoolean(KEY_SHUFFLE_ENABLED, value) }
|
|
70
57
|
}
|
|
71
58
|
|
|
72
|
-
/** Playback speed setting - auto-persisted when set. */
|
|
73
59
|
var playbackSpeed: Float
|
|
74
60
|
get() = prefs.getFloat(KEY_PLAYBACK_SPEED, 1.0f)
|
|
75
61
|
set(value) {
|
|
@@ -79,13 +65,16 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
79
65
|
private val scope = MainScope()
|
|
80
66
|
private var periodicSaveJob: Job? = null
|
|
81
67
|
|
|
82
|
-
/**
|
|
68
|
+
/**
|
|
69
|
+
* Saves the position every [PERIODIC_SAVE_INTERVAL_MS] while playing, skipping live tracks. A
|
|
70
|
+
* no-op when already running or when the player is not set to play.
|
|
71
|
+
*/
|
|
83
72
|
fun startPeriodicSave() {
|
|
84
73
|
if (periodicSaveJob != null) return
|
|
85
74
|
launchPeriodicSave()
|
|
86
75
|
}
|
|
87
76
|
|
|
88
|
-
/**
|
|
77
|
+
/** Restarts the interval, so a [save] on track change is not followed by an immediate repeat. */
|
|
89
78
|
fun resetPeriodicSave() {
|
|
90
79
|
periodicSaveJob?.cancel()
|
|
91
80
|
periodicSaveJob = null
|
|
@@ -105,30 +94,26 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
105
94
|
}
|
|
106
95
|
}
|
|
107
96
|
|
|
108
|
-
/**
|
|
97
|
+
/**
|
|
98
|
+
* Stops the periodic save without a final save, for engine teardown: a save against the released
|
|
99
|
+
* player would persist position 0 over the real one.
|
|
100
|
+
*/
|
|
109
101
|
fun cancelPeriodicSave() {
|
|
110
102
|
periodicSaveJob?.cancel()
|
|
111
103
|
periodicSaveJob = null
|
|
112
104
|
}
|
|
113
105
|
|
|
114
|
-
/** Stops periodic
|
|
106
|
+
/** Stops the periodic save and saves the position once more. */
|
|
115
107
|
fun stopPeriodicSave() {
|
|
116
108
|
cancelPeriodicSave()
|
|
117
|
-
//
|
|
118
|
-
//
|
|
119
|
-
// strictly afterwards — a save here would overwrite that 0 with the
|
|
120
|
-
// end-of-track position, making cold-start resume restart at the very end.
|
|
109
|
+
// After a natural end, setPlaybackState(ENDED) has saved position 0 and the dropped intent
|
|
110
|
+
// calls this afterwards; saving here would make resumption start at the end of the track.
|
|
121
111
|
if (!player.isCurrentItemLive && player.playbackState != PlaybackState.ENDED) {
|
|
122
112
|
savePosition()
|
|
123
113
|
}
|
|
124
114
|
}
|
|
125
115
|
|
|
126
|
-
/**
|
|
127
|
-
* Saves the current playback state for later resumption. Call on track change.
|
|
128
|
-
*
|
|
129
|
-
* For live streams, position is stored as C.TIME_UNSET to signal "use default position", which
|
|
130
|
-
* Media3 interprets as the live edge.
|
|
131
|
-
*/
|
|
116
|
+
/** Saves the current track and its position; does nothing without a current track. */
|
|
132
117
|
fun save() {
|
|
133
118
|
val track = player.currentTrack ?: return
|
|
134
119
|
val positionMs = if (player.isCurrentItemLive) C.TIME_UNSET else player.position
|
|
@@ -140,7 +125,6 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
140
125
|
Timber.d("Saved playback state: title=${track.title}, positionMs=$positionMs")
|
|
141
126
|
}
|
|
142
127
|
|
|
143
|
-
/** Saves just the current position. Call on pause. */
|
|
144
128
|
fun savePosition() {
|
|
145
129
|
val positionMs = if (player.isCurrentItemLive) C.TIME_UNSET else player.position
|
|
146
130
|
|
|
@@ -148,29 +132,21 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
148
132
|
Timber.d("Saved position: positionMs=$positionMs")
|
|
149
133
|
}
|
|
150
134
|
|
|
151
|
-
/** Resets saved position to 0. Call when queue ends to start from beginning on resumption. */
|
|
152
135
|
fun savePositionZero() {
|
|
153
136
|
prefs.edit { putLong(KEY_POSITION_MS, 0) }
|
|
154
137
|
Timber.d("Saved position: positionMs=0 (queue ended)")
|
|
155
138
|
}
|
|
156
139
|
|
|
157
140
|
/**
|
|
158
|
-
*
|
|
159
|
-
*
|
|
160
|
-
* Applies repeatMode, shuffleMode, and playbackSpeed to the player. The caller is responsible for
|
|
161
|
-
* using the returned path and positionMs to set up the playback queue.
|
|
162
|
-
*
|
|
163
|
-
* @return PersistedState if available, null otherwise
|
|
141
|
+
* [get], then applies its repeat mode, shuffle and speed to the player, which emits option-change
|
|
142
|
+
* events. Main thread only. The caller sets up the queue from the returned track and position.
|
|
164
143
|
*/
|
|
165
144
|
fun restore(): PersistedState? =
|
|
166
145
|
get()?.also { state ->
|
|
167
|
-
// Apply player settings from persisted state
|
|
168
146
|
player.repeatMode = state.repeatMode
|
|
169
147
|
player.shuffleMode = state.shuffleEnabled
|
|
170
|
-
//
|
|
171
|
-
//
|
|
172
|
-
// corrupted prefs file — the normal write path can't produce it) would then throw on
|
|
173
|
-
// every resume, permanently, since the bad value stays persisted.
|
|
148
|
+
// ExoPlayer throws on a non-positive speed; a corrupted prefs file holding one would fail
|
|
149
|
+
// every resume for good, since the value stays persisted.
|
|
174
150
|
if (state.playbackSpeed > 0f) player.playbackSpeed = state.playbackSpeed
|
|
175
151
|
|
|
176
152
|
Timber.d(
|
|
@@ -178,11 +154,7 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
178
154
|
)
|
|
179
155
|
}
|
|
180
156
|
|
|
181
|
-
/**
|
|
182
|
-
* Retrieves the persisted playback state.
|
|
183
|
-
*
|
|
184
|
-
* @return PersistedState if available, null otherwise
|
|
185
|
-
*/
|
|
157
|
+
/** The persisted state, read without touching the player; null if none or it won't parse. */
|
|
186
158
|
fun get(): PersistedState? {
|
|
187
159
|
val trackJson = prefs.getString(KEY_TRACK, null) ?: return null
|
|
188
160
|
val track = trackFromJson(trackJson) ?: return null
|
|
@@ -191,14 +163,12 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
191
163
|
return PersistedState(track, positionMs, repeatMode, shuffleEnabled, playbackSpeed)
|
|
192
164
|
}
|
|
193
165
|
|
|
194
|
-
/** Clears the persisted playback state. */
|
|
195
166
|
fun clear() {
|
|
196
167
|
prefs.edit { clear() }
|
|
197
168
|
Timber.d("Cleared playback state")
|
|
198
169
|
}
|
|
199
170
|
|
|
200
171
|
companion object {
|
|
201
|
-
// Internal (not private) so the round-trip is testable without a Player.
|
|
202
172
|
internal fun trackToJson(track: Track): String =
|
|
203
173
|
JSONObject()
|
|
204
174
|
.apply {
|
|
@@ -214,9 +184,7 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
214
184
|
put("description", track.description)
|
|
215
185
|
put("genre", track.genre)
|
|
216
186
|
put("duration", track.duration)
|
|
217
|
-
//
|
|
218
|
-
// strings) and `disabled` beside it: a restored queue keeps its
|
|
219
|
-
// visible fidelity across process death (ADR 0011).
|
|
187
|
+
// Persisted in its wire shape so a restored queue keeps its styling (ADR 0011).
|
|
220
188
|
put(
|
|
221
189
|
"style",
|
|
222
190
|
track.style?.let { style ->
|
|
@@ -250,15 +218,14 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
250
218
|
albumPath = obj.optString("albumPath").takeIf { it.isNotEmpty() },
|
|
251
219
|
album = obj.optString("album").takeIf { it.isNotEmpty() },
|
|
252
220
|
artwork = artworkOf(obj.optString("artwork").takeIf { it.isNotEmpty() }),
|
|
253
|
-
artworkSource = null, // Not persisted -
|
|
221
|
+
artworkSource = null, // Not persisted: re-derived on the next browse
|
|
254
222
|
description = obj.optString("description").takeIf { it.isNotEmpty() },
|
|
255
223
|
genre = obj.optString("genre").takeIf { it.isNotEmpty() },
|
|
256
224
|
duration =
|
|
257
225
|
if (obj.has("duration") && !obj.isNull("duration")) obj.getDouble("duration")
|
|
258
226
|
else null,
|
|
259
|
-
//
|
|
260
|
-
// `style` as
|
|
261
|
-
// yields null and the track restores without a declaration.
|
|
227
|
+
// optJSONObject, not getJSONObject: a snapshot from before the block model holds
|
|
228
|
+
// `style` as a string, and its track restores without a style (ADR 0011).
|
|
262
229
|
style =
|
|
263
230
|
obj
|
|
264
231
|
.optJSONObject("style")
|
|
@@ -272,8 +239,7 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
272
239
|
cardImage = style.optString("cardImage").toCardImage(),
|
|
273
240
|
)
|
|
274
241
|
}
|
|
275
|
-
// An empty block
|
|
276
|
-
// every platform, matching the browse decoders.
|
|
242
|
+
// An empty block means no style, as in the browse decoders on every platform.
|
|
277
243
|
?.takeIf { it != EMPTY_TRACK_STYLE },
|
|
278
244
|
disabled =
|
|
279
245
|
if (obj.has("disabled") && !obj.isNull("disabled")) obj.getBoolean("disabled")
|
|
@@ -283,9 +249,7 @@ class PlaybackStateStore(private val player: Player) {
|
|
|
283
249
|
else null,
|
|
284
250
|
live = if (obj.has("live") && !obj.isNull("live")) obj.getBoolean("live") else null,
|
|
285
251
|
icyCharset = obj.optString("icyCharset").takeIf { it.isNotEmpty() },
|
|
286
|
-
// Not persisted:
|
|
287
|
-
// (expandQueueFromContextualPath), which re-parses each track's request
|
|
288
|
-
// from the API's current response and re-caches it.
|
|
252
|
+
// Not persisted: resumption re-browses the contextual path, which supplies requests.
|
|
289
253
|
request = null,
|
|
290
254
|
)
|
|
291
255
|
}
|
|
@@ -7,9 +7,8 @@ import kotlinx.coroutines.delay
|
|
|
7
7
|
import kotlinx.coroutines.launch
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* off-switch.
|
|
10
|
+
* Runs [onTick] on the main thread every interval seconds while the latest playback state passed to
|
|
11
|
+
* [onPlaybackStateChanged] satisfies [isActive]. Starts inactive until the first state arrives.
|
|
13
12
|
*/
|
|
14
13
|
class PlaybackTimer(
|
|
15
14
|
private val isActive: (PlaybackState) -> Boolean,
|
|
@@ -17,14 +16,19 @@ class PlaybackTimer(
|
|
|
17
16
|
) {
|
|
18
17
|
private val scope = MainScope()
|
|
19
18
|
private var job: Job? = null
|
|
19
|
+
// Seconds.
|
|
20
20
|
private var interval: Double? = null
|
|
21
21
|
private var active = false
|
|
22
22
|
|
|
23
|
+
/**
|
|
24
|
+
* Sets the tick interval in seconds; null or <= 0 stops the timer. A new value restarts the
|
|
25
|
+
* timer, so the next tick comes a full new interval later.
|
|
26
|
+
*/
|
|
23
27
|
fun setInterval(value: Double?) {
|
|
24
28
|
val normalized = if (value != null && value > 0) value else null
|
|
25
29
|
if (normalized == interval) return
|
|
26
30
|
interval = normalized
|
|
27
|
-
stop() //
|
|
31
|
+
stop() // start() is a no-op while a job runs
|
|
28
32
|
reconcile()
|
|
29
33
|
}
|
|
30
34
|
|