Merge pull request #222 from THEOplayer/release/v3.1.0

Release/v3.1.0

CHANGELOG.md

@@ -5,6 +5,18 @@ 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.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.1.0] - 23-10-27
+
+### Changed
+
+- Revised audio focus protocol on Android. When resuming an app, audio focus is retrieved only if the player is not paused.
+- Changed the behaviour of the Android component supporting background playback. It is stopped but not disabled when setting `backgroundAudioConfiguration.enabled = true`.
+
+### Fixed
+
+- Fixed an issue on Android where during play-out of a locally stored media asset the `seekable` property would not update.
+- Fixed an issue on iOS where the error was not forwarded to theoplayer if a drm request fails on the iOS bridge
+
 ## [3.0.2] - 23-10-17
 
 ### Fixed

android/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
       android:name="com.theoplayer.media.MediaPlaybackService"
       android:description="@string/background_playback_service_description"
       android:exported="false"
-      android:enabled="false"
+      android:enabled="true"
       android:foregroundServiceType="mediaPlayback">
       <intent-filter>
         <action android:name="android.media.browse.MediaBrowserService" />

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

@@ -5,7 +5,6 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.os.Handler
 import android.os.IBinder
@@ -74,7 +73,7 @@ class ReactTHEOplayerContext private constructor(
   var imaIntegration: GoogleImaIntegration? = null
   var castIntegration: CastIntegration? = null
   var wasPlayingOnHostPause: Boolean = false
-  var isHostPaused: Boolean = false
+  private var isHostPaused: Boolean = false
 
   private val isBackgroundAudioEnabled: Boolean
     get() = backgroundAudioConfig.enabled
@@ -113,27 +112,6 @@ class ReactTHEOplayerContext private constructor(
     }
   }
 
-  private fun setPlaybackServiceEnabled(enabled: Boolean) {
-    // Toggle the MediaPlaybackService.
-    toggleComponent(enabled, ComponentName(reactContext.applicationContext, MediaPlaybackService::class.java))
-
-    // Also toggle any registered MediaButtonReceiver broadcast receiver.
-    // It will crash the app if it remains active and tries to find our disabled MediaBrowserService instance.
-    toggleComponent(enabled, ComponentName(reactContext.applicationContext, androidx.media.session.MediaButtonReceiver::class.java))
-  }
-
-  /**
-   * Enable or disable a receiver component.
-   */
-  private fun toggleComponent(enabled: Boolean, componentName: ComponentName) {
-    reactContext.applicationContext.packageManager.setComponentEnabledSetting(
-      componentName,
-      if (enabled) PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-      else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-      PackageManager.DONT_KILL_APP
-    )
-  }
-
   private fun applyBackgroundPlaybackConfig(
     config: BackgroundAudioConfig,
     prevConfig: BackgroundAudioConfig?
@@ -148,13 +126,8 @@ class ReactTHEOplayerContext private constructor(
     if (BuildConfig.USE_PLAYBACK_SERVICE) {
       if (prevConfig?.enabled != true && config.enabled) {
         // Enable & bind background playback
-        setPlaybackServiceEnabled(true)
         bindMediaPlaybackService()
       } else if (prevConfig?.enabled == true) {
-        // First disable the MediaPlaybackService and MediaButtonReceiver so that no more media
-        // button events can be captured.
-        setPlaybackServiceEnabled(false)
-
         // Stop & unbind MediaPlaybackService.
         binder?.stopForegroundService()
         unbindMediaPlaybackService()
@@ -379,7 +352,9 @@ class ReactTHEOplayerContext private constructor(
     isHostPaused = false
     mediaSessionConnector?.setActive(true)
     playerView.onResume()
-    audioFocusManager?.retrieveAudioFocus()
+    if (!player.isPaused) {
+      audioFocusManager?.retrieveAudioFocus()
+    }
   }
 
   fun destroy() {

ios/THEOplayerRCTNetworkUtils.swift

@@ -31,7 +31,6 @@ class THEOplayerRCTNetworkUtils: NSObject, URLSessionDataDelegate {
         let task = self.defaultUrlSession.dataTask(with: request) { data, response, error in
             if let error = error {
                 PrintUtils.printLog(logText: "request Error: \(error.localizedDescription)")
-                return
             }
             if let urlResponse = response as? HTTPURLResponse {
                 let statusCode = urlResponse.statusCode
@@ -44,7 +43,10 @@ class THEOplayerRCTNetworkUtils: NSObject, URLSessionDataDelegate {
                     }
                 }
                 completion?(data, statusCode, allHeaders, error)
+            } else {
+                completion?(data, -1, [:], error)
             }
+
         }
         // start the task
         task.resume()

ios/contentprotection/THEOplayerRCTContentProtectionAPI.swift

@@ -211,8 +211,10 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
             THEOplayerRCTNetworkUtils.shared.requestFromUrl(url: url, method: method, body: bodyData, headers: headers) { data, statusCode, responseHeaders, error in
                 if let responseError = error {
                     print(CPI_TAG, "Certificate request failure: error = \(responseError.localizedDescription)")
+                    completion(data, error)
                 } else if statusCode >= 400 {
                     PrintUtils.printLog(logText: "Certificate request failure: statusCode = \(statusCode)")
+                    completion(data, nil)
                 } else {
                     if DEBUG_CONTENT_PROTECTION_API {print(CPI_TAG, "Certificate request success: statusCode = \(statusCode)") }
                     let certificateRequest = CertificateRequest(url: urlString, method: method, headers: headers, body: bodyData)
@@ -278,8 +280,10 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
             THEOplayerRCTNetworkUtils.shared.requestFromUrl(url: url, method: method, body: bodyData, headers: headers) { data, statusCode, responseHeaders, error in
                 if let responseError = error {
                     print(CPI_TAG, "License request failure: error = \(responseError.localizedDescription)")
+                    completion(data, error)
                 } else if statusCode >= 400 {
                     print(CPI_TAG, "License request failure: statusCode = \(statusCode)")
+                    completion(data, nil)
                 } else {
                     if DEBUG_CONTENT_PROTECTION_API {print(CPI_TAG, "License request success: statusCode = \(statusCode)") }
                     let licenseRequest = LicenseRequest(url: urlString, method: method, headers: headers, body: bodyData, fairplaySkdUrl: nil, useCredentials: false)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/internal/adapter/THEOplayerAdapter.ts

@@ -142,6 +142,9 @@ export class THEOplayerAdapter extends DefaultEventDispatcher<PlayerEventMap> im
     this._state.selectedAudioTrack = event.selectedAudioTrack;
     this._state.selectedVideoTrack = event.selectedVideoTrack;
     this._state.selectedTextTrack = event.selectedTextTrack;
+    if (isFinite(this._state.duration)) {
+      this._state.seekable = [{start: 0, end: this._state.duration}];
+    }
   };
 
   private onDurationChange = (event: DurationChangeEvent) => {