@takeoffmedia/react-native-penthera 0.4.2 → 0.4.4

package/android/build.gradle

@@ -81,9 +81,9 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   //penthera
-  implementation 'com.penthera:cnc-android-sdk:5.3.9'
-  implementation 'com.google.code.gson:gson:2.8.6'
-  implementation "com.penthera:cnc-android-bitmovin-support:5.3.6-beta"
+  implementation 'com.penthera:cnc-android-sdk:5.4.3'
+  implementation 'com.google.code.gson:gson:2.10.1'
+  implementation 'com.penthera:cnc-android-bitmovin-support:5.4.3'
 
   implementation 'com.bitmovin.player:player:3.38.2'
   implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'

package/android/src/main/java/com/takeoffmediareactnativepenthera/virtuoso/OfflineVideoEngine.kt

@@ -3,12 +3,13 @@ package com.takeoffmediareactnativepenthera.virtuoso
 import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Log
+import com.bitmovin.player.api.media.subtitle.SubtitleTrack
 import com.bitmovin.player.reactnative.PlayerModule
-import com.bitmovin.player.reactnative.converter.JsonConverter
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.UiThreadUtil
 import com.google.gson.Gson
 import com.penthera.virtuososdk.client.AncillaryFile
@@ -37,6 +38,7 @@ import com.penthera.virtuososdk.client.IService
 import com.takeoffmediareactnativepenthera.EventEmitter
 import com.takeoffmediareactnativepenthera.PentheraEvent
 import com.takeoffmediareactnativepenthera.virtuoso.errors.PentheraErrors
+import java.util.UUID
 
 class OfflineVideoEngine(private val context: ReactApplicationContext) {
   private val virtuoso = Virtuoso(context)
@@ -328,6 +330,52 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     return null
   }
 
+  private fun toSubtitleMimeType(format: String?): String? {
+    if (format == null) {
+      return null
+    }
+    return "text/${format}"
+  }
+
+  private fun toSubtitleTrack(json: ReadableMap?): SubtitleTrack? {
+    val url = json?.getString("url")
+    val label = json?.getString("label")
+    if (json == null || url == null || label == null) {
+      return null
+    }
+    val identifier = json.getString("identifier") ?: UUID.randomUUID().toString()
+    val isDefault = if (json.hasKey("isDefault")) {
+      json.getBoolean("isDefault")
+    } else {
+      false
+    }
+    val isForced = if (json.hasKey("isForced")) {
+      json.getBoolean("isForced")
+    } else {
+      false
+    }
+    val format = json.getString("format")
+    if (!format.isNullOrBlank()) {
+      return SubtitleTrack(
+        url = url,
+        label = label,
+        id = identifier,
+        isDefault = isDefault,
+        language = json.getString("language"),
+        isForced = isForced,
+        mimeType = toSubtitleMimeType(format),
+      )
+    }
+    return SubtitleTrack(
+      url = url,
+      label = label,
+      id = identifier,
+      isDefault = isDefault,
+      language = json.getString("language"),
+      isForced = isForced,
+    )
+  }
+
   fun loadBitmovinSourceManager(
     assetId: String,
     nativeId: String,
@@ -340,10 +388,10 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       val sourceItem = sourceManager.bitmovinSourceItem
       val playerModule = context.getNativeModule(PlayerModule::class.java)
       if (playerModule != null && sourceItem != null) {
-        var player = playerModule.getPlayer(nativeId)
+        var player = playerModule.getPlayerOrNull(nativeId)
         while (player == null) {
           Thread.sleep(100)
-          player = playerModule.getPlayer(nativeId) as Nothing?
+          player = playerModule.getPlayerOrNull(nativeId) as Nothing?
         }
         val metadata = JSONObject(asset.metadata)
         val subtitles = JSONArray(metadata["subtitles"] as String)
@@ -362,7 +410,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
           subtitleMap.putString("label", subtitle.getString("label"))
           subtitleMap.putString("format", "vtt")
 
-          JsonConverter.toSubtitleTrack(subtitleMap)?.let {
+          toSubtitleTrack(subtitleMap)?.let {
             sourceItem.addSubtitleTrack(it)
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeoffmedia/react-native-penthera",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/ios/Penthera.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

package/ios/Penthera.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

package/ios/Penthera.xcodeproj/xcuserdata/joseguerreroot.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "3AE98629-7421-4561-B12C-C06B8B6A3023"
-   type = "1"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A5D166B0-3C57-4F4D-A845-BDB81498DA0F"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Penthera.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "18"
-            endingLineNumber = "18"
-            landmarkName = "Penthera"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5D7AE47B-D5FC-4468-A75B-C414F3F8A58C"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Penthera.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "25"
-            endingLineNumber = "25"
-            landmarkName = "updateStatusInfo()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E3C50B30-46CF-4D56-8C49-C257C70E0ACC"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Penthera.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "26"
-            endingLineNumber = "26"
-            landmarkName = "updateStatusInfo()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "75EF43BF-56FF-4727-B372-E1A0EBC02C61"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Penthera.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "101"
-            endingLineNumber = "101"
-            landmarkName = "initializeSdk(user:backplaneUrl:publicKey:privateKey:resolve:reject:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "EF36B51B-4FC2-4989-A791-180E3212EFE3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Penthera.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "149"
-            endingLineNumber = "149"
-            landmarkName = "getDownloadedAsset(assetID:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C467C00E-2428-4D24-843A-E7CDF28CB553"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Penthera.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "148"
-            endingLineNumber = "148"
-            landmarkName = "getDownloadedAsset(assetID:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>

package/ios/Penthera.xcodeproj/xcuserdata/joseguerreroot.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>Penthera.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>