react-native-theoplayer 7.5.0 → 7.5.1

package/CHANGELOG.md

@@ -5,6 +5,12 @@ 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).
 
+## [7.5.1] - 24-06-20
+
+### Added
+
+- Added ad event support for custom SSAI integrations.
+
 ## [7.5.0] - 24-06-18
 
 ### Fixed

package/android/build.gradle

@@ -118,7 +118,7 @@ dependencies {
 
   println("Using THEOplayer (${versionString(theoplayer_sdk_version)})")
   implementation "com.theoplayer.theoplayer-sdk-android:core:${theoplayer_sdk_version}"
-  implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:7.6.0"
+  implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:7.6.1"
   implementation "com.theoplayer.android-connector:mediasession:${theoplayer_mediasession_version}"
 
   if (enabledGoogleIMA) {

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/{7.6.0/ads-wrapper-7.6.0.pom → 7.6.1/ads-wrapper-7.6.1.pom}

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>7.6.0</modelVersion>
+  <modelVersion>7.6.1</modelVersion>
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
-  <version>7.6.0</version>
+  <version>7.6.1</version>
   <packaging>aar</packaging>
 </project>

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/maven-metadata-local.xml

@@ -3,11 +3,11 @@
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
   <versioning>
-    <latest>7.6.0</latest>
-    <release>7.6.0</release>
+    <latest>7.6.1</latest>
+    <release>7.6.1</release>
     <versions>
-      <version>7.6.0</version>
+      <version>7.6.1</version>
     </versions>
-    <lastUpdated>20240618230000</lastUpdated>
+    <lastUpdated>20240620111503</lastUpdated>
   </versioning>
 </metadata>

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

@@ -652,15 +652,14 @@ class PlayerEventEmitter internal constructor(
       )
     }
 
-    // Attach AdStateHolder
-    if (BuildConfig.EXTENSION_ADS) {
-      adEventAdapter = AdEventAdapter(playerView.adsApi,
-        object : AdEventEmitter {
-          override fun emit(payload: WritableMap?) {
-            receiveEvent(EVENT_AD_EVENT, payload)
-          }
-        })
-    }
+    // Attach ad event adapter
+    adEventAdapter = AdEventAdapter(playerView.adsApi,
+      object : AdEventEmitter {
+        override fun emit(payload: WritableMap?) {
+          receiveEvent(EVENT_AD_EVENT, payload)
+        }
+      })
+
     if (BuildConfig.EXTENSION_CAST) {
       castEventAdapter = playerView.castApi?.let {
         CastEventAdapter(it, object : CastEventAdapter.Emitter {

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

@@ -54,9 +54,7 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
       reactContext,
       PlayerConfigAdapter(configProps)
     ).apply {
-      if (BuildConfig.EXTENSION_ADS) {
-        adsApi.initialize(player, imaIntegration, daiIntegration)
-      }
+      adsApi.initialize(player, imaIntegration, daiIntegration)
       val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
       playerView.layoutParams = layoutParams
       (playerView.parent as? ViewGroup)?.removeView(playerView)

package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt

@@ -13,33 +13,13 @@ import com.theoplayer.android.api.ads.ima.GoogleImaAdEventType
 import com.theoplayer.android.api.ads.wrapper.AdEventListener
 import com.theoplayer.android.api.event.EventType
 import com.theoplayer.android.api.event.ads.AdEvent
+import com.theoplayer.android.api.event.ads.AdsEventTypes
 import java.util.*
 
 private const val EVENT_PROP_AD = "ad"
 private const val EVENT_PROP_TYPE = "type"
 private const val EVENT_PROP_SUBTYPE = "subType"
 
-private val ALL_AD_EVENTS = arrayOf(
-  GoogleImaAdEventType.LOADED,
-  GoogleImaAdEventType.AD_BREAK_STARTED,
-  GoogleImaAdEventType.STARTED,
-  GoogleImaAdEventType.FIRST_QUARTILE,
-  GoogleImaAdEventType.MIDPOINT,
-  GoogleImaAdEventType.THIRD_QUARTILE,
-  GoogleImaAdEventType.COMPLETED,
-  GoogleImaAdEventType.AD_BREAK_ENDED,
-  GoogleImaAdEventType.SKIPPED,
-  GoogleImaAdEventType.AD_ERROR,
-  GoogleImaAdEventType.AD_BUFFERING,
-  GoogleImaAdEventType.AD_BREAK_FETCH_ERROR,
-  GoogleImaAdEventType.CONTENT_PAUSE_REQUESTED,
-  GoogleImaAdEventType.CONTENT_RESUME_REQUESTED,
-  GoogleImaAdEventType.CLICKED,
-  GoogleImaAdEventType.TAPPED,
-  GoogleImaAdEventType.ICON_TAPPED,
-  GoogleImaAdEventType.ICON_FALLBACK_IMAGE_CLOSED,
-)
-
 class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmitter) {
   private val eventListener: AdEventListener
 
@@ -71,9 +51,7 @@ class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmi
         eventEmitter.emit(payload)
       }
     }
-    for (eventType in ALL_AD_EVENTS) {
-      adsApi.addEventListener(eventType, eventListener)
-    }
+    adsApi.addAllEventsListener(eventListener)
   }
 
   companion object {
@@ -123,33 +101,36 @@ class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmi
     }
 
     private fun mapAdType(eventType: EventType<*>): String {
-      return when (eventType as GoogleImaAdEventType) {
-        GoogleImaAdEventType.LOADED -> "adloaded"
-        GoogleImaAdEventType.STARTED -> "adbegin"
-        GoogleImaAdEventType.FIRST_QUARTILE -> "adfirstquartile"
-        GoogleImaAdEventType.MIDPOINT -> "admidpoint"
-        GoogleImaAdEventType.THIRD_QUARTILE -> "adthirdquartile"
-        GoogleImaAdEventType.COMPLETED -> "adend"
-        GoogleImaAdEventType.SKIPPED -> "adskip"
-        GoogleImaAdEventType.AD_ERROR -> "aderror"
+      return when (eventType) {
+        GoogleImaAdEventType.LOADED, AdsEventTypes.AD_LOADED -> "adloaded"
+        GoogleImaAdEventType.STARTED, AdsEventTypes.AD_BEGIN -> "adbegin"
+        GoogleImaAdEventType.FIRST_QUARTILE, AdsEventTypes.AD_FIRST_QUARTILE -> "adfirstquartile"
+        GoogleImaAdEventType.MIDPOINT, AdsEventTypes.AD_MIDPOINT -> "admidpoint"
+        GoogleImaAdEventType.THIRD_QUARTILE, AdsEventTypes.AD_THIRD_QUARTILE -> "adthirdquartile"
+        GoogleImaAdEventType.COMPLETED, AdsEventTypes.AD_END -> "adend"
+        GoogleImaAdEventType.SKIPPED, AdsEventTypes.AD_SKIP -> "adskip"
+        GoogleImaAdEventType.AD_ERROR, AdsEventTypes.AD_ERROR -> "aderror"
         GoogleImaAdEventType.AD_BUFFERING -> "adbuffering"
         GoogleImaAdEventType.CONTENT_PAUSE_REQUESTED -> "adbreakbegin"
         GoogleImaAdEventType.CONTENT_RESUME_REQUESTED -> "adbreakend"
-        GoogleImaAdEventType.AD_BREAK_STARTED -> "adbreakbegin"
-        GoogleImaAdEventType.AD_BREAK_ENDED -> "adbreakend"
+        GoogleImaAdEventType.AD_BREAK_STARTED, AdsEventTypes.AD_BREAK_BEGIN -> "adbreakbegin"
+        GoogleImaAdEventType.AD_BREAK_ENDED, AdsEventTypes.AD_BREAK_END -> "adbreakend"
         GoogleImaAdEventType.AD_BREAK_FETCH_ERROR -> "aderror"
         GoogleImaAdEventType.CLICKED -> "adclicked"
         GoogleImaAdEventType.TAPPED -> "adtapped"
         GoogleImaAdEventType.ICON_TAPPED -> "adicontapped"
         GoogleImaAdEventType.ICON_FALLBACK_IMAGE_CLOSED -> "adiconfallbackimageclosed"
-        else -> eventType.getName().lowercase(Locale.getDefault())
+        AdsEventTypes.ADD_AD -> "addad"
+        AdsEventTypes.AD_IMPRESSION -> "adimpression"
+        AdsEventTypes.ADD_AD_BREAK -> "addadbreak"
+        AdsEventTypes.REMOVE_AD_BREAK -> "removeadbreak"
+        AdsEventTypes.AD_BREAK_CHANGE -> "adbreakchange"
+        else -> eventType.name.lowercase(Locale.getDefault())
       }
     }
   }
 
   fun destroy() {
-    for (eventType in ALL_AD_EVENTS) {
-      adsApi.removeEventListener(eventType, eventListener)
-    }
+    adsApi.removeAllEventsListener(eventListener)
   }
 }

package/package.json

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