Merge pull request #770 from THEOplayer/release/v10.11.0

Release/v10.11.0

Author: tvanlaerhoven

CHANGELOG.md

@@ -5,11 +5,30 @@ 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).
 
+## [10.11.0] - 26-03-10
+
+### Fixed
+
+- Fixed an issue on Android where transitioning from picture-in-picture presentation mode would fail when using Expo Router.
+- Fixed an issue where the player would remove all listeners when using `<StrictMode>` on mobile platforms.
+
+### Changed
+
+- Updated `NativeAdBreak` to prevent iOS build failure caused by changed `AdBreak` protocol.
+
 ## [10.10.0] - 26-02-17
 
 ### Fixed
 
-- Fixed an issue on iOS where the onPlayerStateSync callback was not called from the main thread.
+- Fixed an issue on iOS where the `onPlayerStateSync` callback was not called from the main thread.
+
+### Added
+
+- Added the `DistributionLoaded` event for THEOlive.
+
+### Added
+
+- Added contentProtection extraction for THEOlive endpoints on iOS.
 
 ## [10.9.0] - 26-01-29
 

android/build.gradle

@@ -124,8 +124,8 @@ repositories {
     mavenLocal()
 }
 
-// The minimum supported THEOplayer version is 10.0.1
-def theoVersion = safeExtGet('THEOplayer_sdk', '[10.0.1, 11.0.0)')
+// The minimum supported THEOplayer version is 10.10.0
+def theoVersion = safeExtGet('THEOplayer_sdk', '[10.10.0, 11.0.0)')
 def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[8.0.0, 11.0.0)')
 def theoAdsWrapperVersion = "10.0.0"
 def coroutinesVersion = safeExtGet('coroutinesVersion', '1.10.2')

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

@@ -286,36 +286,43 @@ class PresentationManager(
     get() = findReactRootView( reactContext, reactPlayerGroup)
 
   private fun reparentPlayerToRoot() {
-    reactPlayerGroup?.let { playerGroup ->
-      playerGroupRestoreOptions.parentNode = (playerGroup.parent as? ViewGroup)?.also { parent ->
-        playerGroupRestoreOptions.childIndex = parent.indexOfChild(playerGroup)
+    val root = rootView ?: return
+    val playerGroup = reactPlayerGroup ?: return
+    val playerGroupParent = (playerGroup.parent as? ViewGroup) ?: return
 
-        // Re-parent the playerViewGroup to the root node
-        parent.removeView(playerGroup)
-        rootView?.let { root ->
-          root.addView(playerGroup)
-
-          // Attach an observer that overrides the react-native lay-out and forces fullscreen.
-          fullScreenLayoutObserver.attach(playerGroup, root)
-        }
-      }
+    // already reparented?
+    if (playerGroup.parent == root) {
+      return
     }
+
+    // Store the original parent and child index to be able to restore it later
+    playerGroupRestoreOptions.store(playerGroupParent, playerGroup)
+
+    // Re-parent the playerViewGroup to the root node
+    playerGroupParent.removeView(playerGroup)
+    root.addView(playerGroup)
+
+    // Attach an observer that overrides the react-native lay-out and forces fullscreen.
+    fullScreenLayoutObserver.attach(playerGroup, root)
   }
 
   private fun reparentPlayerToOriginal() {
-    rootView?.run {
-      reactPlayerGroup?.let { playerGroup ->
-        // Remove forced layout observer
-        fullScreenLayoutObserver.remove()
-
-        // Re-parent the playerViewGroup from the root node to its original parent
-        removeView(playerGroup)
-        playerGroupRestoreOptions.parentNode?.addView(
-          playerGroup, playerGroupRestoreOptions.childIndex ?: 0
-        )
-        playerGroupRestoreOptions.reset()
-      }
+    val root = rootView ?: return
+    val playerGroup = reactPlayerGroup ?: return
+
+    // Not re-parented?
+    if (!playerGroupRestoreOptions.isStored()) {
+      return
     }
+
+    // Remove forced layout observer
+    fullScreenLayoutObserver.remove()
+
+    // Remove the playerViewGroup the root node
+    root.removeView(playerGroup)
+
+    // Restore the original parent and child index
+    playerGroupRestoreOptions.restore()
   }
 // endregion
 
@@ -346,11 +353,31 @@ class PresentationManager(
   }
 }
 
+/**
+ * Helper class to store the original parent and child index of the playerViewGroup when re-parenting it
+ * to the root view for fullscreen or PiP presentation mode, and restore it when going back to inline mode.
+ */
 private class PlayerGroupRestoreOptions {
   var childIndex: Int? = null
+    private set
   var parentNode: ViewGroup? = null
+    private set
+  var childNode: ReactViewGroup? = null
+    private set
+
+  fun isStored(): Boolean = parentNode != null && childNode != null
 
-  fun reset() {
+  fun store(parent: ViewGroup, child: ReactViewGroup) {
+    parentNode = parent
+    childNode = child
+    childIndex = parent.indexOfChild(child)
+  }
+
+  fun restore() {
+    childNode?.let { child ->
+      parentNode?.addView(child, childIndex ?: 0)
+    }
+    childNode = null
     parentNode = null
     childIndex = null
   }

android/src/main/java/com/theoplayer/theolive/THEOliveEventAdapter.kt

@@ -4,6 +4,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.theoplayer.android.api.event.EventListener
 import com.theoplayer.android.api.event.player.theolive.DistributionLoadStartEvent
+import com.theoplayer.android.api.event.player.theolive.DistributionLoadedEvent
 import com.theoplayer.android.api.event.player.theolive.DistributionOfflineEvent
 import com.theoplayer.android.api.event.player.theolive.EndpointLoadedEvent
 import com.theoplayer.android.api.event.player.theolive.IntentToFallbackEvent
@@ -13,8 +14,11 @@ import com.theoplayer.util.PayloadBuilder
 
 private const val EVENT_PROP_TYPE = "type"
 private const val EVENT_PROP_DISTRIBUTION_ID = "distributionId"
+private const val EVENT_PROP_DISTRIBUTION = "distribution"
 private const val EVENT_PROP_ENDPOINT = "endpoint"
 private const val EVENT_PROP_REASON = "reason"
+private const val EVENT_PROP_NAME = "name"
+private const val EVENT_PROP_ID = "id"
 
 class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitter: Emitter) {
 
@@ -24,6 +28,8 @@ class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitte
 
   private val onDistributionLoadStart =
     EventListener<DistributionLoadStartEvent> { onDistributionLoadStart(it) }
+  private val onDistributionLoaded =
+    EventListener<DistributionLoadedEvent> { onDistributionLoaded(it) }
   private val onDistributionOffline =
     EventListener<DistributionOfflineEvent> { onDistributionOffline(it) }
   private val onEndPointLoaded =
@@ -33,6 +39,7 @@ class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitte
 
   init {
     theoLiveApi.addEventListener(TheoLiveEventTypes.DISTRIBUTIONLOADSTART, onDistributionLoadStart)
+    theoLiveApi.addEventListener(TheoLiveEventTypes.DISTRIBUTIONLOADED, onDistributionLoaded)
     theoLiveApi.addEventListener(TheoLiveEventTypes.DISTRIBUTIONOFFLINE, onDistributionOffline)
     theoLiveApi.addEventListener(TheoLiveEventTypes.ENDPOINTLOADED, onEndPointLoaded)
     theoLiveApi.addEventListener(TheoLiveEventTypes.INTENTTOFALLBACK, onIntentOfFallback)
@@ -43,6 +50,7 @@ class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitte
       TheoLiveEventTypes.DISTRIBUTIONLOADSTART,
       onDistributionLoadStart
     )
+    theoLiveApi.removeEventListener(TheoLiveEventTypes.DISTRIBUTIONLOADED, onDistributionLoaded)
     theoLiveApi.removeEventListener(TheoLiveEventTypes.DISTRIBUTIONOFFLINE, onDistributionOffline)
     theoLiveApi.removeEventListener(TheoLiveEventTypes.ENDPOINTLOADED, onEndPointLoaded)
     theoLiveApi.removeEventListener(TheoLiveEventTypes.INTENTTOFALLBACK, onIntentOfFallback)
@@ -55,6 +63,16 @@ class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitte
     })
   }
 
+  private fun onDistributionLoaded(event: DistributionLoadedEvent) {
+    emitter.emit(Arguments.createMap().apply {
+      putString(EVENT_PROP_TYPE, "distributionloaded")
+      putMap(EVENT_PROP_DISTRIBUTION, Arguments.createMap().apply {
+        putString(EVENT_PROP_ID, event.getDistribution().id)
+        putString(EVENT_PROP_NAME, event.getDistribution().name)
+      })
+    })
+  }
+
   private fun onDistributionOffline(event: DistributionOfflineEvent) {
     emitter.emit(Arguments.createMap().apply {
       putString(EVENT_PROP_TYPE, "distributionoffline")

e2e/android/gradle.properties

@@ -41,7 +41,7 @@ newArchEnabled=true
 hermesEnabled=true
 
 # Version of the THEOplayer SDK, if not specified, the latest available version within bounds is set.
-#THEOplayer_sdk=[8.1.0, 11.0.0)
+#THEOplayer_sdk=[10.10.0, 11.0.0)
 
 # Override Android sdk versions
 #THEOplayer_compileSdkVersion = 34