react-native-theoplayer 7.9.0 → 8.0.1

package/CHANGELOG.md

@@ -5,6 +5,26 @@ 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).
 
+## [8.0.1] - 24-09-11
+
+### Fixed
+
+- Fixed an issue on Android where registering a content protection integration would fail.
+
+## [8.0.0] - 24-09-11
+
+### Added
+
+- Added support for THEOplayer 8.0.
+
+### Changed
+
+- Deprecated Jitpack.io in favor of the THEOplayer Maven repository on Android.
+
+### Fixed
+
+- Fixed an issue on iOS where the initial `duration` property of the player would be `0` instead of `NaN`.
+
 ## [7.9.0] - 24-09-06
 
 ### Added

package/README.md

@@ -13,7 +13,9 @@ This projects falls under the license as defined in https://github.com/THEOplaye
 3. [How to use these guides](#how-to-use-these-guides)
 4. [Features](#features)
 5. [Available connectors](#available-connectors)
-6. [Getting Started](#getting-started)
+6. [Creating your first app](#creating-your-first-app)
+7. [Knowledge Base](#knowledge-base)
+8. [API Reference](#api-reference)
 
 ## Overview
 
@@ -89,6 +91,11 @@ please reach out to us for support.
 <td colspan="3">Adobe, Agama, Comscore, Conviva, Mux, Nielsen, Youbora</td>
 </tr>
 <tr>
+<td><strong>Other Connectors</strong></td>
+<td colspan="1">Yospace SSAI</td>
+<td colspan="2"></td>
+</tr>
+<tr>
 <td><strong>Subtitles &amp; Closed Captions</strong></td>
 <td colspan="3">CEA-608/708, SRT, TTML, WebVTT</td>
 </tr>
@@ -141,6 +148,7 @@ functionality. Currently, the following connectors are available:
 | Mux analytics                                             | [![%40theoplayer/react-native-analytics-mux](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-mux?label=%40theoplayer/react-native-analytics-mux)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-mux)                        | [`Mux`](https://github.com/THEOplayer/react-native-connectors/tree/main/mux)                     |
 | Nielsen analytics                                         | [![%40theoplayer/react-native-analytics-nielsen](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-nielsen?label=%40theoplayer/react-native-analytics-nielsen)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-nielsen)        | [`Nielsen`](https://github.com/THEOplayer/react-native-connectors/tree/main/nielsen)             |
 | Youbora analytics                                         | [![%40theoplayer/react-native-analytics-youbora](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-youbora?label=%40theoplayer/react-native-analytics-youbora)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-youbora)        | [`Youbora`](https://github.com/THEOplayer/react-native-connectors/tree/main/youbora)             |
+| Yospace SSAI                                              | [![%40theoplayer/react-native-yospace](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-yospace?label=%40theoplayer/react-native-yospace)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-yospace)                                                | [`Yospace`](https://github.com/THEOplayer/react-native-connectors/tree/main/yospace)             |
 | Content protection (DRM)                                  | [![%40theoplayer/react-native-drm](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-drm?label=%40theoplayer/react-native-drm)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-drm)                                                                | [`DRM`](https://github.com/THEOplayer/react-native-theoplayer-drm)                               |
 | React Native Open UI                                      | [![%40theoplayer/react-native-ui](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-ui?label=%40theoplayer/react-native-ui)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-ui)                                                                    | [`Open UI`](https://github.com/THEOplayer/react-native-theoplayer-ui)                            |
 | A template for<br/>`react-native-theoplayer` connectors.  | [![%40theoplayer/react-native-connector-template](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-connector-template?label=%40theoplayer/react-native-connector-template)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-connector-template)    | [`Connector template`](https://github.com/THEOplayer/react-native-theoplayer-connector-template) |

package/android/build.gradle

@@ -102,7 +102,7 @@ repositories {
   google()
   mavenCentral()
   maven { url("local") }
-  maven { url 'https://jitpack.io' }
+  maven { url "https://maven.theoplayer.com/releases" }
 }
 
 dependencies {
@@ -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.1"
+  implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:8.0.0"
   implementation "com.theoplayer.android-connector:mediasession:${theoplayer_mediasession_version}"
 
   if (enabledGoogleIMA) {

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/{7.6.1/ads-wrapper-7.6.1.pom → 8.0.0/ads-wrapper-8.0.0.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.1</modelVersion>
+  <modelVersion>8.0.0</modelVersion>
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
-  <version>7.6.1</version>
+  <version>8.0.0</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.1</latest>
-    <release>7.6.1</release>
+    <latest>8.0.0</latest>
+    <release>8.0.0</release>
     <versions>
-      <version>7.6.1</version>
+      <version>8.0.0</version>
     </versions>
-    <lastUpdated>20240620111503</lastUpdated>
+    <lastUpdated>20240909163212</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1,6 +1,5 @@
 package com.theoplayer
 
-import android.text.TextUtils
 import com.facebook.react.bridge.ReadableMap
 import com.google.ads.interactivemedia.v3.api.AdsRenderingSettings
 import com.google.ads.interactivemedia.v3.api.ImaSdkFactory
@@ -11,14 +10,12 @@ import com.theoplayer.android.api.cast.CastStrategy
 import com.theoplayer.android.api.cast.CastConfiguration
 import com.theoplayer.android.api.pip.PipConfiguration
 import com.theoplayer.android.api.player.NetworkConfiguration
-import com.theoplayer.android.api.ui.UIConfiguration
 import com.theoplayer.media.MediaSessionConfig
 import com.theoplayer.media.MediaSessionConfigAdapter
 
 private const val PROP_LICENSE = "license"
 private const val PROP_LICENSE_URL = "licenseUrl"
 private const val PROP_PRELOAD = "preload"
-private const val PROP_LANGUAGE = "language"
 private const val PROP_LIVE_OFFSET = "liveOffset"
 private const val PROP_UI_ENABLED = "uiEnabled"
 private const val PROP_CAST_STRATEGY = "strategy"
@@ -30,7 +27,6 @@ private const val PROP_RETRY_MAX_BACKOFF = "maximumBackoff"
 private const val PROP_CAST_CONFIGURATION = "cast"
 private const val PROP_ADS_CONFIGURATION = "ads"
 private const val PROP_IMA_CONFIGURATION = "ima"
-private const val PROP_UI_CONFIGURATION = "ui"
 private const val PROP_MEDIA_CONTROL = "mediaControl"
 private const val PROP_PPID = "ppid"
 private const val PROP_MAX_REDIRECTS = "maxRedirects"
@@ -62,9 +58,6 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
         if (hasKey(PROP_LIVE_OFFSET)) {
           liveOffset(getDouble(PROP_LIVE_OFFSET))
         }
-        if (hasKey(PROP_UI_CONFIGURATION)) {
-          ui(uiConfig())
-        }
         if (hasKey(PROP_HLS_DATE_RANGE)) {
           hlsDateRange(getBoolean(PROP_HLS_DATE_RANGE))
         }
@@ -115,10 +108,6 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
           }
           featureFlags = convertedMap
         }
-        // The current ISO 639-1 language code, get it from the UI config.
-        uiConfig().language?.let {
-          language = it
-        }
         // The maximum number of VAST redirects.
         if (hasKey(PROP_MAX_REDIRECTS)) {
           maxRedirects = getInt(PROP_MAX_REDIRECTS)
@@ -164,21 +153,6 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
     }
   }
 
-  /**
-   * Get UIConfiguration object; these properties apply:
-   * - language: The language used to localize the ui elements.
-   */
-  private fun uiConfig(): UIConfiguration {
-    return UIConfiguration.Builder().apply {
-      configProps?.getMap(PROP_UI_CONFIGURATION)?.run {
-        val languageString = getString(PROP_LANGUAGE)
-        if (languageString != null && !TextUtils.isEmpty(languageString)) {
-          language(languageString)
-        }
-      }
-    }.build()
-  }
-
   /**
    * Get CastConfiguration object; these properties apply:
    * - strategy: The join strategy of the player.

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

@@ -88,7 +88,7 @@ private const val EVENT_PROP_SUITE_VERSION = "playerSuiteVersion"
 @Suppress("UNCHECKED_CAST")
 class PlayerEventEmitter internal constructor(
   private val reactContext: ReactApplicationContext,
-  playerView: ReactTHEOplayerView
+  private val playerView: ReactTHEOplayerView
 ) {
   @Retention(AnnotationRetention.SOURCE)
   @StringDef(
@@ -163,7 +163,6 @@ class PlayerEventEmitter internal constructor(
   private val textTrackListeners = HashMap<EventType<*>, EventListener<*>>()
   private val audioTrackListeners = HashMap<EventType<*>, EventListener<*>>()
   private val videoTrackListeners = HashMap<EventType<*>, EventListener<*>>()
-  private val playerView: ReactTHEOplayerView
   private var adEventAdapter: AdEventAdapter? = null
   private var castEventAdapter: CastEventAdapter? = null
   private var lastTimeUpdate: Long = 0
@@ -175,7 +174,6 @@ class PlayerEventEmitter internal constructor(
   }
 
   init {
-    this.playerView = playerView
 
     // Create listeners
     playerListeners[PlayerEventTypes.SOURCECHANGE] = EventListener<PlayerEvent<*>> {

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

@@ -1,7 +1,6 @@
 package com.theoplayer
 
 import android.annotation.SuppressLint
-import android.content.*
 import android.util.Log
 import android.view.ViewGroup
 import android.widget.FrameLayout

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

@@ -75,10 +75,7 @@ object AdAdapter {
    */
   private fun fromAd(ad: Ad, includeAdBreak: Boolean): WritableMap {
     val adPayload = Arguments.createMap()
-    adPayload.putString(
-      PROP_AD_INTEGRATION, if (ad.integration != null) ad.integration!!
-        .type else ""
-    )
+    adPayload.putString(PROP_AD_INTEGRATION, ad.integration.type)
     adPayload.putString(PROP_AD_TYPE, ad.type)
     adPayload.putString(PROP_AD_ID, ad.id)
     val adBreak = ad.adBreak
@@ -206,13 +203,18 @@ object AdAdapter {
       }
 
       override fun getIntegration(): AdIntegrationKind {
-        return AdIntegrationKind.from(ad.getString(PROP_AD_INTEGRATION))
+        return AdIntegrationKind.from(ad.getString(PROP_AD_INTEGRATION)) ?: AdIntegrationKind.CUSTOM
       }
 
       override fun getCustomIntegration(): String? {
         return ad.getString(PROP_AD_CUSTOM_INTEGRATION)
       }
 
+      override fun getCustomData(): Any? {
+        // Not supported yet
+        return null
+      }
+
       override fun getImaAd(): com.google.ads.interactivemedia.v3.api.Ad {
         return parseImaAd(ad)
       }
@@ -282,12 +284,17 @@ object AdAdapter {
       }
 
       override fun getIntegration(): AdIntegrationKind {
-        return AdIntegrationKind.from(adBreak.getString(PROP_ADBREAK_INTEGRATION))
+        return AdIntegrationKind.from(adBreak.getString(PROP_ADBREAK_INTEGRATION)) ?: AdIntegrationKind.CUSTOM
       }
 
       override fun getCustomIntegration(): String? {
         return adBreak.getString(PROP_AD_CUSTOM_INTEGRATION)
       }
+
+      override fun getCustomData(): Any? {
+        // Not supported yet
+        return null
+      }
     }
   }
 

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

@@ -21,36 +21,35 @@ private const val EVENT_PROP_TYPE = "type"
 private const val EVENT_PROP_SUBTYPE = "subType"
 
 class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmitter) {
-  private val eventListener: AdEventListener
+  private val eventListener: AdEventListener = object : AdEventListener {
+    override fun <E : AdEvent<*>?> onAdEvent(type: EventType<E>?, ad: Ad?, adData: Map<String, String>?, adError: AdError?) {
+      val payload = Arguments.createMap()
+      if (type != null) {
+        payload.putString(EVENT_PROP_TYPE, mapAdType(type))
+      }
+      if (ad != null) {
+        payload.putMap(EVENT_PROP_AD, AdAdapter.fromAd(ad))
+      }
+      eventEmitter.emit(payload)
+    }
+
+    override fun <E : AdEvent<*>?> onAdBreakEvent(type: EventType<E>?, adBreak: AdBreak?, adData: Map<String, String>?, adError: AdError?) {
+      val payload = Arguments.createMap()
+      if (type != null) {
+        payload.putString(EVENT_PROP_TYPE, mapAdType(type))
+      }
+      if (adBreak != null) {
+        payload.putMap(EVENT_PROP_AD, AdAdapter.fromAdBreak(adBreak))
+      }
+      eventEmitter.emit(payload)
+    }
+  }
 
   interface AdEventEmitter {
     fun emit(payload: WritableMap?)
   }
 
   init {
-    eventListener = object : AdEventListener {
-      override fun <E : AdEvent<*>?> onAdEvent(type: EventType<E>?, ad: Ad?, adData: Map<String, String>?, adError: AdError?) {
-        val payload = Arguments.createMap()
-        if (type != null) {
-          payload.putString(EVENT_PROP_TYPE, mapAdType(type))
-        }
-        if (ad != null) {
-          payload.putMap(EVENT_PROP_AD, AdAdapter.fromAd(ad))
-        }
-        eventEmitter.emit(payload)
-      }
-
-      override fun <E : AdEvent<*>?> onAdBreakEvent(type: EventType<E>?, adBreak: AdBreak?, adData: Map<String, String>?, adError: AdError?) {
-        val payload = Arguments.createMap()
-        if (type != null) {
-          payload.putString(EVENT_PROP_TYPE, mapAdType(type))
-        }
-        if (adBreak != null) {
-          payload.putMap(EVENT_PROP_AD, AdAdapter.fromAdBreak(adBreak))
-        }
-        eventEmitter.emit(payload)
-      }
-    }
     adsApi.addAllEventsListener(eventListener)
   }
 

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

@@ -13,11 +13,7 @@ private const val TAG = "THEORCTAdsModule"
 
 class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
   private val sourceHelper = SourceAdapter()
-  private val viewResolver: ViewResolver
-
-  init {
-    viewResolver = ViewResolver(context)
-  }
+  private val viewResolver: ViewResolver = ViewResolver(context)
 
   override fun getName(): String {
     return TAG

package/android/src/main/java/com/theoplayer/broadcast/EventBroadcastModule.kt

@@ -14,11 +14,7 @@ private const val TAG = "THEORCTEventBroadcastModule"
 @ReactModule(name = TAG)
 class EventBroadcastModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
 
-  private val viewResolver: ViewResolver
-
-  init {
-    viewResolver = ViewResolver(context)
-  }
+  private val viewResolver: ViewResolver = ViewResolver(context)
 
   override fun getName(): String {
     return TAG

package/android/src/main/java/com/theoplayer/cache/CacheModule.kt

@@ -46,14 +46,14 @@ class CacheModule(private val context: ReactApplicationContext) :
   private val onTaskError = mutableMapOf<String, EventListener<CachingTaskErrorEvent>>()
   private val onTaskStateChange = mutableMapOf<String, EventListener<CachingTaskStateChangeEvent>>()
   private val sourceAdapter = SourceAdapter()
-  private val cache: Cache?
+  private val cache: Cache
     get() = THEOplayerGlobal.getSharedInstance(context.applicationContext).cache
   private val handler = Handler(Looper.getMainLooper())
 
   init {
     // Add cache event listeners
     handler.post {
-      cache?.apply {
+      cache.apply {
         // Listen for cache state changes
         addEventListener(CacheEventTypes.CACHE_STATE_CHANGE) { event ->
           emit("onCacheStatusChange", Arguments.createMap().apply {
@@ -155,7 +155,7 @@ class CacheModule(private val context: ReactApplicationContext) :
   @ReactMethod
   fun getInitialState(promise: Promise) {
     handler.post {
-      cache?.apply {
+      cache.apply {
 
         // Add listeners to existing tasks
         tasks.forEach { task ->
@@ -175,7 +175,7 @@ class CacheModule(private val context: ReactApplicationContext) :
     val sourceDescription = sourceAdapter.parseSourceFromJS(source)
     if (sourceDescription != null) {
       handler.post {
-        cache?.createTask(
+        cache.createTask(
           sourceDescription,
           CacheAdapter.parseCachingParameters(parameters)
         )
@@ -186,21 +186,21 @@ class CacheModule(private val context: ReactApplicationContext) :
   @ReactMethod
   fun pauseCachingTask(id: String) {
     handler.post {
-      cache?.tasks?.getTaskById(id)?.pause()
+      cache.tasks.getTaskById(id)?.pause()
     }
   }
 
   @ReactMethod
   fun removeCachingTask(id: String) {
     handler.post {
-      cache?.tasks?.getTaskById(id)?.remove()
+      cache.tasks.getTaskById(id)?.remove()
     }
   }
 
   @ReactMethod
   fun startCachingTask(id: String) {
     handler.post {
-      cache?.tasks?.getTaskById(id)?.start()
+      cache.tasks.getTaskById(id)?.start()
     }
   }
 
@@ -232,7 +232,7 @@ class CacheModule(private val context: ReactApplicationContext) :
   }
 
   private fun taskById(id: String): CachingTask? {
-    return cache?.tasks?.getTaskById(id) ?: run {
+    return cache.tasks.getTaskById(id) ?: run {
       Log.w(TAG, "CachingTask with id $id not found")
       return null
     }

package/android/src/main/java/com/theoplayer/drm/ContentProtectionModule.kt

@@ -19,7 +19,7 @@ data class BridgeRequest(
   val onTimeout: Runnable
 )
 
-private const val TAG = "THEORCTContentProtectionModule"
+private const val TAG = "ContentProtectionModule"
 
 private const val EVENT_CERTIFICATE_REQUEST = "onCertificateRequest"
 private const val EVENT_CERTIFICATE_REQUEST_PROCESSED_AS_REQUEST = "onCertificateRequestProcessedAsRequest"
@@ -34,6 +34,7 @@ private const val EVENT_LICENSE_REQUEST_PROCESSED_AS_LICENSE = "onLicenseRequest
 private const val EVENT_LICENSE_RESPONSE = "onLicenseResponse"
 private const val EVENT_LICENSE_RESPONSE_PROCESSED = "onLicenseResponseProcessed"
 
+@Suppress("unused")
 class ContentProtectionModule(private val context: ReactApplicationContext) :
   ReactContextBaseJavaModule(context) {
 
@@ -48,7 +49,7 @@ class ContentProtectionModule(private val context: ReactApplicationContext) :
   private val requestQueue: HashMap<String, BridgeRequest> = HashMap()
 
   override fun getName(): String {
-    return TAG
+    return "THEORCTContentProtectionModule"
   }
 
   @ReactMethod

package/android/src/main/java/com/theoplayer/player/PlayerModule.kt

@@ -19,11 +19,7 @@ private const val TAG = "THEORCTPlayerModule"
 
 @Suppress("unused")
 class PlayerModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
-  private val viewResolver: ViewResolver
-
-  init {
-    viewResolver = ViewResolver(context)
-  }
+  private val viewResolver: ViewResolver = ViewResolver(context)
 
   override fun getName(): String {
     return TAG

package/android/src/main/java/com/theoplayer/source/GoogleDaiSourceAdapter.kt

@@ -14,6 +14,7 @@ private const val PROP_AVAILABILITY_TYPE = "availabilityType"
 private const val AVAILABILITY_TYPE_VOD = "vod"
 private const val ERROR_DAI_NOT_ENABLED = "Google DAI support not enabled."
 
+@Suppress("UNUSED_PARAMETER")
 @Throws(THEOplayerException::class)
 fun googleDaiBuilderFromJson(builder: TypedSource.Builder, json: JSONObject): TypedSource.Builder {
   // Check whether the integration was enabled

package/android/src/main/java/com/theoplayer/source/SSAIAdapterRegistry.kt

@@ -20,7 +20,7 @@ object SSAIAdapterRegistry {
     _adapters[integration] = adapter
   }
 
-  fun hasIntegration(integration: String): Boolean {
+  private fun hasIntegration(integration: String): Boolean {
     return _adapters[integration] != null
   }
 

package/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt

@@ -4,26 +4,13 @@ import com.theoplayer.android.api.player.track.mediatrack.quality.Quality
 import com.theoplayer.android.api.player.track.mediatrack.quality.QualityList
 import java.util.*
 
-fun <Q: Quality> emptyQualityList(): QualityList<Q>  {
-  return QualityListAdapter()
-}
-
 /**
  * Adapts an Android List to a QualityList.
  */
-class QualityListAdapter<Q : Quality> : QualityList<Q> {
-  private var qualities: MutableList<Q>
-
-  constructor() {
-    this.qualities = arrayListOf()
-  }
+class QualityListAdapter<Q : Quality>(qualities: QualityList<Q>) : QualityList<Q> {
+  private var qualities: MutableList<Q> = ArrayList()
 
-  constructor(qualities: MutableList<Q>) {
-    this.qualities = qualities
-  }
-
-  constructor(qualities: QualityList<Q>) {
-    this.qualities = ArrayList()
+  init {
     for (quality in qualities) {
       this.qualities.add(quality)
     }
@@ -41,10 +28,6 @@ class QualityListAdapter<Q : Quality> : QualityList<Q> {
     return qualities.iterator()
   }
 
-  fun asList(): List<Q> {
-    return qualities
-  }
-
   fun sort(comparator: Comparator<Q>) {
     Collections.sort(qualities, comparator)
   }

package/android/src/main/java/com/theoplayer/track/TextTrackStyleAdapter.kt

@@ -4,18 +4,18 @@ import android.graphics.Color
 import com.facebook.react.bridge.ReadableMap
 import com.theoplayer.android.api.player.track.texttrack.TextTrackStyle
 
-private val PROP_BACKGROUND_COLOR = "backgroundColor"
-private val PROP_EDGE_STYLE = "edgeStyle"
-private val PROP_FONT_COLOR = "fontColor"
-private val PROP_FONT_FAMILY = "fontFamily"
-private val PROP_FONT_SIZE = "fontSize"
-private val PROP_WINDOW_COLOR = "windowColor"
-private val PROP_MARGIN_LEFT = "marginLeft"
-private val PROP_MARGIN_TOP = "marginTop"
-private val PROP_COLOR_R = "r"
-private val PROP_COLOR_G = "g"
-private val PROP_COLOR_B = "b"
-private val PROP_COLOR_A = "a"
+private const val PROP_BACKGROUND_COLOR = "backgroundColor"
+private const val PROP_EDGE_STYLE = "edgeStyle"
+private const val PROP_FONT_COLOR = "fontColor"
+private const val PROP_FONT_FAMILY = "fontFamily"
+private const val PROP_FONT_SIZE = "fontSize"
+private const val PROP_WINDOW_COLOR = "windowColor"
+private const val PROP_MARGIN_LEFT = "marginLeft"
+private const val PROP_MARGIN_TOP = "marginTop"
+private const val PROP_COLOR_R = "r"
+private const val PROP_COLOR_G = "g"
+private const val PROP_COLOR_B = "b"
+private const val PROP_COLOR_A = "a"
 
 object TextTrackStyleAdapter {
 

package/android/src/main/java/com/theoplayer/util/BridgeUtils.kt

@@ -37,7 +37,7 @@ object BridgeUtils {
   /**
    * Convert a JSONArray to bridge data.
    */
-  fun fromJSONArrayToBridge(jsonArray: JSONArray): WritableArray {
+  private fun fromJSONArrayToBridge(jsonArray: JSONArray): WritableArray {
     return Arguments.createArray().apply {
       try {
         for (i in 0 until jsonArray.length()) {

package/app.plugin.js

@@ -8,50 +8,47 @@
  *         }]
  *     ]
  */
-const {withProjectBuildGradle, withGradleProperties} = require('@expo/config-plugins');
+const { withProjectBuildGradle, withGradleProperties } = require('@expo/config-plugins');
 
 function mapAndroidExtensionKey(ext) {
-    switch (ext) {
-        case "ima":
-            return "THEOplayer_extensionGoogleIMA";
-        case "dai":
-            return "THEOplayer_extensionGoogleDAI";
-        case "cast":
-            return "THEOplayer_extensionCast";
-        default:
-            return undefined;
-    }
+  switch (ext) {
+    case 'ima':
+      return 'THEOplayer_extensionGoogleIMA';
+    case 'dai':
+      return 'THEOplayer_extensionGoogleDAI';
+    case 'cast':
+      return 'THEOplayer_extensionCast';
+    default:
+      return undefined;
+  }
 }
 
 const applyAndroidExtensions = (config, extensions) => {
-    return withGradleProperties(config, (config) => {
-        extensions?.forEach(ext => {
-            const key = mapAndroidExtensionKey(ext);
-            if (key) {
-                config.modResults.push({type: "property", key, value: true});
-            }
-        });
-        return config;
+  return withGradleProperties(config, (config) => {
+    extensions?.forEach((ext) => {
+      const key = mapAndroidExtensionKey(ext);
+      if (key) {
+        config.modResults.push({ type: 'property', key, value: true });
+      }
     });
-}
+    return config;
+  });
+};
 
 const withAndroidTHEOplayer = (config, props) => {
-    // Apply Android extensions
-    const {extensions} = props | {};
-    config = applyAndroidExtensions(config, extensions);
+  // Apply Android extensions
+  const { extensions } = props | {};
+  config = applyAndroidExtensions(config, extensions);
 
-    // Add the localMaven repo to the project's repositories
-    return withProjectBuildGradle(config, (config) => {
-        const localMaven = 'maven { url("$rootDir/../node_modules/react-native-theoplayer/android/local") }';
-        config.modResults.contents = config.modResults.contents.replace(
-            /allprojects\s*\{\s*repositories\s*\{/,
-            `$&\n\t\t${localMaven}`
-        )
-        return config;
-    });
+  // Add the localMaven repo to the project's repositories
+  return withProjectBuildGradle(config, (config) => {
+    const localMaven = 'maven { url("$rootDir/../node_modules/react-native-theoplayer/android/local") }';
+    config.modResults.contents = config.modResults.contents.replace(/allprojects\s*\{\s*repositories\s*\{/, `$&\n\t\t${localMaven}`);
+    return config;
+  });
 };
 
 module.exports = (config, props) => {
-    // Apply Android modifications
-    return withAndroidTHEOplayer(config, props);
-}
+  // Apply Android modifications
+  return withAndroidTHEOplayer(config, props);
+};