react-native-theoplayer 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased 2.1.0]
+
+### Fixed
+
+- Fixed invalid location of the typescript declaration file.
+- Fixed an issue on Android where the player would not pause when closing the app while background playback is disabled.
+
+### Changed
+
+- Removed `backgroundAudioConfiguration.mediaPlaybackServiceEnabled` property on Android. Disabling background playback disables the service as well.
+
 ## [2.0.0] - 23-04-06
 
 ### Added

package/android/build.gradle

@@ -107,7 +107,7 @@ dependencies {
 
   def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '+')
 //  def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', theoplayer_sdk_version)
-  def theoplayer_mediasession_version = "4.11.0-local"
+  def theoplayer_mediasession_version = "4.12.0-local"
   def enabledV4 = theoplayer_sdk_version.toString().startsWith("4.")
   def core_prefix = enabledV4 ? 'unified' : 'core'
   def integration_prefix = enabledV4 ? 'unified' : 'integration'

package/android/local/com/theoplayer/android-connector/mediasession/{4.11.0-local/mediasession-4.11.0-local.pom → 4.12.0-local/mediasession-4.12.0-local.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.theoplayer.android-connector</groupId>
   <artifactId>mediasession</artifactId>
-  <version>4.11.0-local</version>
+  <version>4.12.0-local</version>
   <packaging>aar</packaging>
   <dependencies>
     <dependency>

package/android/local/com/theoplayer/android-connector/mediasession/maven-metadata-local.xml

@@ -3,11 +3,11 @@
   <groupId>com.theoplayer.android-connector</groupId>
   <artifactId>mediasession</artifactId>
   <versioning>
-    <latest>4.11.0-local</latest>
-    <release>4.11.0-local</release>
+    <latest>4.12.0-local</latest>
+    <release>4.12.0-local</release>
     <versions>
-      <version>4.11.0-local</version>
+      <version>4.12.0-local</version>
     </versions>
-    <lastUpdated>20230403121710</lastUpdated>
+    <lastUpdated>20230408184844</lastUpdated>
   </versioning>
 </metadata>

package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt

@@ -39,12 +39,9 @@ class ReactTHEOplayerContext private constructor(
   private var binder: MediaPlaybackService.MediaPlaybackBinder? = null
   private var mediaSessionConnector: MediaSessionConnector? = null
 
-  var backgroundAudioConfig: BackgroundAudioConfig = BackgroundAudioConfig(
-    enabled = false,
-    mediaPlaybackServiceEnabled = true
-  )
+  var backgroundAudioConfig: BackgroundAudioConfig = BackgroundAudioConfig(enabled = false)
     set(value) {
-      applyBackgroundPlaybackConfig(value)
+      applyBackgroundPlaybackConfig(value, field)
       field = value
     }
 
@@ -56,14 +53,18 @@ class ReactTHEOplayerContext private constructor(
   var daiIntegration: GoogleDaiIntegration? = null
   var imaIntegration: GoogleImaIntegration? = null
   var castIntegration: CastIntegration? = null
+  var wasPlayingOnHostPause: Boolean = false
 
   private val isBackgroundAudioEnabled: Boolean
-    get() = backgroundAudioConfig.enabled && backgroundAudioConfig.mediaPlaybackServiceEnabled
+    get() = backgroundAudioConfig.enabled
 
   companion object {
     private var mediaControlledInstance: ReactTHEOplayerContext? = null
 
-    fun create(reactContext: ThemedReactContext, playerConfig: THEOplayerConfig): ReactTHEOplayerContext {
+    fun create(
+      reactContext: ThemedReactContext,
+      playerConfig: THEOplayerConfig
+    ): ReactTHEOplayerContext {
       return ReactTHEOplayerContext(reactContext).apply {
         initializePlayerView(playerConfig)
       }
@@ -74,7 +75,10 @@ class ReactTHEOplayerContext private constructor(
     override fun onServiceConnected(className: ComponentName, service: IBinder) {
       binder = service as MediaPlaybackService.MediaPlaybackBinder
 
-      // Get media session
+      // Clean-up any existing media session connector
+      mediaSessionConnector?.destroy()
+
+      // Get media session connector from service
       mediaSessionConnector = binder?.mediaSessionConnector
       mediaSessionConnector?.player = player
       mediaSessionConnector?.setMediaSessionMetadata(player.source)
@@ -91,17 +95,37 @@ class ReactTHEOplayerContext private constructor(
     }
   }
 
-  private fun applyBackgroundPlaybackConfig(config: BackgroundAudioConfig) {
-    if (BuildConfig.USE_PLAYBACK_SERVICE) {
-      reactContext.applicationContext.packageManager.setComponentEnabledSetting(
-        ComponentName(reactContext.applicationContext, MediaPlaybackService::class.java),
-        if (config.mediaPlaybackServiceEnabled) PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-        else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-        PackageManager.DONT_KILL_APP
-      )
+  private fun setPlaybackServiceEnabled(enabled: Boolean) {
+    reactContext.applicationContext.packageManager.setComponentEnabledSetting(
+      ComponentName(reactContext.applicationContext, MediaPlaybackService::class.java),
+      if (enabled) PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+      else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+      PackageManager.DONT_KILL_APP
+    )
+  }
+
+  private fun applyBackgroundPlaybackConfig(
+    config: BackgroundAudioConfig,
+    prevConfig: BackgroundAudioConfig?
+  ) {
+    if (prevConfig?.enabled == config.enabled) {
+      // No changes
+      return
     }
 
-    binder?.setEnablePlaybackControls(config.enabled)
+    if (BuildConfig.USE_PLAYBACK_SERVICE) {
+      if (prevConfig?.enabled != true && config.enabled) {
+        // Enabling background playback
+        setPlaybackServiceEnabled(true)
+        bindMediaPlaybackService()
+      } else if (prevConfig?.enabled == true) {
+        // Disabling background playback
+        binder?.stopForegroundService()
+        unbindMediaPlaybackService()
+        setPlaybackServiceEnabled(false)
+        initDefaultMediaSession()
+      }
+    }
   }
 
   private fun bindMediaPlaybackService() {
@@ -128,6 +152,7 @@ class ReactTHEOplayerContext private constructor(
         reactContext.unbindService(connection)
       }
     }
+    binder = null
   }
 
   private fun initializePlayerView(playerConfig: THEOplayerConfig) {
@@ -156,13 +181,13 @@ class ReactTHEOplayerContext private constructor(
 
     if (mediaControlledInstance == null) {
       mediaControlledInstance = this
-      if (!BuildConfig.USE_PLAYBACK_SERVICE) {
+      if (!BuildConfig.USE_PLAYBACK_SERVICE || !isBackgroundAudioEnabled) {
         initDefaultMediaSession()
       }
     }
 
     // Apply initial backgroundPlayback config
-    applyBackgroundPlaybackConfig(backgroundAudioConfig)
+    applyBackgroundPlaybackConfig(backgroundAudioConfig, null)
   }
 
   private fun initDefaultMediaSession() {
@@ -225,7 +250,7 @@ class ReactTHEOplayerContext private constructor(
   }
 
   private val onPlay = EventListener<PlayEvent> {
-    if (BuildConfig.USE_PLAYBACK_SERVICE) {
+    if (BuildConfig.USE_PLAYBACK_SERVICE && isBackgroundAudioEnabled) {
       bindMediaPlaybackService()
     }
     binder?.updateNotification(PlaybackStateCompat.STATE_PLAYING)
@@ -266,8 +291,10 @@ class ReactTHEOplayerContext private constructor(
    * The host activity is paused.
    */
   fun onHostPause() {
+    // Keep current playing state when going to background
+    wasPlayingOnHostPause = !player.isPaused
+
     if (!isBackgroundAudioEnabled) {
-      mediaSessionConnector?.setActive(false)
       playerView.onPause()
     }
   }

package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt

@@ -85,9 +85,7 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
     if (BuildConfig.LOG_VIEW_EVENTS) {
       Log.d(TAG, "onHostPause")
     }
-    if (presentationManager?.shouldPauseOnHostPause != false) {
-      playerContext?.onHostPause()
-    }
+    playerContext?.onHostPause()
   }
 
   /**

package/android/src/main/java/com/theoplayer/audio/BackgroundAudioConfig.kt

@@ -7,11 +7,4 @@ data class BackgroundAudioConfig(
    * @defaultValue `false`
    */
   val enabled: Boolean,
-
-  /**
-   * Set whether the mediaPlaybackService is enabled.
-   *
-   * @defaultValue `true`
-   */
-  val mediaPlaybackServiceEnabled: Boolean
 )

package/android/src/main/java/com/theoplayer/audio/BackgroundAudioConfigAdapter.kt

@@ -4,16 +4,12 @@ import com.facebook.react.bridge.ReadableMap
 
 object BackgroundAudioConfigAdapter {
   private const val PROP_ENABLED = "enabled"
-  private const val PROP_SERVICE_ENABLED = "mediaPlaybackServiceEnabled"
 
   private const val DEFAULT_ENABLED = false
-  private const val DEFAULT_SERVICE_ENABLED = true
 
   fun fromProps(props: ReadableMap?): BackgroundAudioConfig {
     val enabled =
       if (props?.hasKey(PROP_ENABLED) == true) props.getBoolean(PROP_ENABLED) else DEFAULT_ENABLED
-    val serviceEnabled =
-      if (props?.hasKey(PROP_SERVICE_ENABLED) == true) props.getBoolean(PROP_SERVICE_ENABLED) else DEFAULT_SERVICE_ENABLED
-    return BackgroundAudioConfig(enabled, serviceEnabled)
+    return BackgroundAudioConfig(enabled)
   }
 }

package/android/src/main/java/com/theoplayer/audio/MediaNotificationBuilder.kt

@@ -141,9 +141,7 @@ class MediaNotificationBuilder(
 
       // Associate the notification with your session. This allows third-party apps and
       // companion devices to access and control the session.
-      if (enableMediaControls) {
-        style.setMediaSession(mediaSession.sessionToken)
-      }
+      style.setMediaSession(mediaSession.sessionToken)
 
       // Add up to 3 actions to be shown in the notification's standard-sized contentView.
       style.setShowActionsInCompactView(0)

package/android/src/main/java/com/theoplayer/presentation/PresentationManager.kt

@@ -81,18 +81,6 @@ class PresentationManager(
     )
   }
 
-  /**
-   * Whether playback should be allowed to continue when the activity is paused.
-   *
-   * Pause if:
-   * - No PiP available: Build.VERSION.SDK_INT < Build.VERSION_CODES.N (API 24), or;
-   * - Not in PiP mode, and;
-   * - Not configured to automatically go into PiP when going to the background.
-   */
-  val shouldPauseOnHostPause: Boolean
-    get() = Build.VERSION.SDK_INT < Build.VERSION_CODES.N ||
-      (reactContext.currentActivity?.isInPictureInPictureMode != true && pipConfig.startsAutomatically != true)
-
   fun destroy() {
     try {
       reactContext.currentActivity?.unregisterReceiver(onUserLeaveHintReceiver)
@@ -241,6 +229,11 @@ class PresentationManager(
     currentPresentationMode = presentationMode
     eventEmitter.emitPresentationModeChange(presentationMode, prevPresentationMode, context)
 
+    // Resume playing when going to PiP and player was playing
+    if (presentationMode == PresentationMode.PICTURE_IN_PICTURE && viewCtx.wasPlayingOnHostPause) {
+      viewCtx.player.play()
+    }
+
     // Apply background audio config when closing PiP window
     if (context?.pip == PresentationModeChangePipContext.CLOSED && !viewCtx.backgroundAudioConfig.enabled) {
       viewCtx.player.pause()

package/lib/commonjs/api/backgroundAudio/BackgroundAudioConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["BackgroundAudioConfiguration.ts"],"sourcesContent":["/**\n * Describes the configuration of the background audio feature.\n *\n * @public\n */\nexport interface BackgroundAudioConfiguration {\n  /**\n   * Whether background audio should be enabled when transitioning to background.\n   *\n   * @defaultValue `false`\n   */\n  readonly enabled?: boolean;\n\n  /**\n   * Whether Android's mediaPlaybackService is enabled.\n   *\n   * The mediaPlaybackService is a MediaBrowserService that provides notifications and background playback.\n   * It can be dynamically disabled if the host app already registers a MediaBrowserService that conflicts with this one.\n   *\n   * @defaultValue `true`\n   */\n  readonly mediaPlaybackServiceEnabled?: boolean;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["BackgroundAudioConfiguration.ts"],"sourcesContent":["/**\n * Describes the configuration of the background audio feature.\n *\n * @public\n */\nexport interface BackgroundAudioConfiguration {\n  /**\n   * Whether background audio should be enabled when transitioning to background.\n   *\n   * @defaultValue `false`\n   */\n  readonly enabled?: boolean;\n}\n"],"mappings":""}

package/lib/module/api/backgroundAudio/BackgroundAudioConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["BackgroundAudioConfiguration.ts"],"sourcesContent":["/**\n * Describes the configuration of the background audio feature.\n *\n * @public\n */\nexport interface BackgroundAudioConfiguration {\n  /**\n   * Whether background audio should be enabled when transitioning to background.\n   *\n   * @defaultValue `false`\n   */\n  readonly enabled?: boolean;\n\n  /**\n   * Whether Android's mediaPlaybackService is enabled.\n   *\n   * The mediaPlaybackService is a MediaBrowserService that provides notifications and background playback.\n   * It can be dynamically disabled if the host app already registers a MediaBrowserService that conflicts with this one.\n   *\n   * @defaultValue `true`\n   */\n  readonly mediaPlaybackServiceEnabled?: boolean;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["BackgroundAudioConfiguration.ts"],"sourcesContent":["/**\n * Describes the configuration of the background audio feature.\n *\n * @public\n */\nexport interface BackgroundAudioConfiguration {\n  /**\n   * Whether background audio should be enabled when transitioning to background.\n   *\n   * @defaultValue `false`\n   */\n  readonly enabled?: boolean;\n}\n"],"mappings":""}

package/lib/typescript/api/backgroundAudio/BackgroundAudioConfiguration.d.ts

@@ -10,13 +10,4 @@ export interface BackgroundAudioConfiguration {
      * @defaultValue `false`
      */
     readonly enabled?: boolean;
-    /**
-     * Whether Android's mediaPlaybackService is enabled.
-     *
-     * The mediaPlaybackService is a MediaBrowserService that provides notifications and background playback.
-     * It can be dynamically disabled if the host app already registers a MediaBrowserService that conflicts with this one.
-     *
-     * @defaultValue `true`
-     */
-    readonly mediaPlaybackServiceEnabled?: boolean;
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "react-native-theoplayer",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
-  "types": "lib/typescript/src/index.d.ts",
+  "types": "lib/typescript/index.d.ts",
   "react-native": "src/index",
   "source": "src/index",
   "files": [

package/react-native-theoplayer.podspec

@@ -6,7 +6,7 @@ if File.exists?(theoconfigpath)
   theoconfig = JSON.parse(File.read(theoconfigpath))
   theofeatures = theoconfig["ios"]["features"]
 else
-  theofeatures = []
+  theofeatures = ["NONE"]
 end
 
 Pod::Spec.new do |s|
@@ -28,17 +28,21 @@ Pod::Spec.new do |s|
   
   # THEOplayer Dependencies
   if theofeatures.include?("WEB") 
+  	puts "Using THEOplayer-basic SDK, marked features: #{theofeatures.join(' ')}"
     s.dependency "THEOplayerSDK-basic"
     s.pod_target_xcconfig = {
       'SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Release]' => theofeatures.join(' '),
       'SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug]' => theofeatures.join(' ')
     }
   else 
+  	puts "Using THEOplayer-core SDK"
     s.dependency "THEOplayerSDK-core"
     if theofeatures.include?("GOOGLE_IMA") 
+	  puts "Adding THEOplayer-Integration-GoogleIMA"
       s.dependency "THEOplayer-Integration-GoogleIMA"
     end
     if theofeatures.include?("CHROMECAST")
+	  puts "Adding THEOplayer-Integration-GoogleCast"
       s.ios.dependency "THEOplayer-Integration-GoogleCast"
       s.ios.dependency "google-cast-sdk-dynamic-xcframework-no-bluetooth"
     end

package/src/api/backgroundAudio/BackgroundAudioConfiguration.ts

@@ -10,14 +10,4 @@ export interface BackgroundAudioConfiguration {
    * @defaultValue `false`
    */
   readonly enabled?: boolean;
-
-  /**
-   * Whether Android's mediaPlaybackService is enabled.
-   *
-   * The mediaPlaybackService is a MediaBrowserService that provides notifications and background playback.
-   * It can be dynamically disabled if the host app already registers a MediaBrowserService that conflicts with this one.
-   *
-   * @defaultValue `true`
-   */
-  readonly mediaPlaybackServiceEnabled?: boolean;
 }