@takeoffmedia/react-native-penthera 0.2.36 → 0.2.38

package/android/src/main/java/com/takeoffmediareactnativepenthera/PentheraModule.kt

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.takeoffmediareactnativepenthera.virtuoso.OfflineVideoEngine
@@ -17,7 +18,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEm
 
 class PentheraModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
-  private var offlineVideoEngine: OfflineVideoEngine? = OfflineVideoEngine(reactContext)
+  private var offlineVideoEngine: OfflineVideoEngine = OfflineVideoEngine(reactContext)
   private var activity: Activity? = null
   private var appState: String = "active"
   val reactContext: ReactApplicationContext = reactContext
@@ -48,21 +49,22 @@ class PentheraModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
   }
   @ReactMethod
   fun getDownloads(blank: String, promise: Promise) {
-    promise.resolve(offlineVideoEngine?.getDownloads())
+    promise.resolve(offlineVideoEngine.getDownloads())
   }
 
   @ReactMethod
   fun getByAssetId(assetId: String, promise: Promise) {
-    promise.resolve(offlineVideoEngine?.getByAssetId(assetId))
+    promise.resolve(offlineVideoEngine.getByAssetId(assetId))
   }
   @ReactMethod
-  fun delete(assetId: String) {
-    offlineVideoEngine?.deleteAsset(assetId)
+  fun deleteMany(assetIds: ReadableArray, promise: Promise) {
+    val result = offlineVideoEngine.deleteMany(assetIds, promise)
+    promise.resolve(result)
   }
 
   @ReactMethod
   fun loadBitmovinSourceManager(assetId: String, nativeId: String, promise: Promise) {
-    val bitmovinSourceItem = offlineVideoEngine?.loadBitmovinSourceManager(assetId, nativeId)
+    val bitmovinSourceItem = offlineVideoEngine.loadBitmovinSourceManager(assetId, nativeId)
     promise.resolve(bitmovinSourceItem)
   }
   @ReactMethod
@@ -79,7 +81,7 @@ class PentheraModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
 
     reactContext.addLifecycleEventListener(object : LifecycleEventListener {
       override fun onHostResume() {
-        offlineVideoEngine!!.onResume()
+        offlineVideoEngine.onResume()
         appStateListener("active")
 
       }
@@ -87,7 +89,7 @@ class PentheraModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
 
 
       override fun onHostPause() {
-        offlineVideoEngine!!.onPause()
+        offlineVideoEngine.onPause()
         appStateListener("background")
       }
 

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

@@ -33,13 +33,16 @@ import java.net.URL
 import java.util.UUID
 import com.bitmovin.player.reactnative.SourceModule
 import com.bitmovin.player.reactnative.converter.JsonConverter
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.WritableMap
 
 class OfflineVideoEngine(private val context: ReactApplicationContext) {
 
-  var virtuoso: Virtuoso? = null
+  lateinit var  virtuoso : Virtuoso
   private lateinit var queueObserver: AssetQueueObserver
 
   var asset: IAsset? = null
@@ -56,38 +59,38 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     virtuoso = Virtuoso(context)
     queueObserver = AssetQueueObserver(this)
     onResume()
-    return virtuoso!!
+    return virtuoso
   }
 
   fun onResume() {
-    virtuoso?.onResume()
-    virtuoso?.addObserver(queueObserver)
-    virtuoso?.addObserver(enginePauseObserver)
+    virtuoso.onResume()
+    virtuoso.addObserver(queueObserver)
+    virtuoso.addObserver(enginePauseObserver)
   }
 
   fun onPause() {
-    virtuoso?.onPause()
-    virtuoso?.removeObserver(queueObserver)
-    virtuoso?.removeObserver(enginePauseObserver)
+    virtuoso.onPause()
+    virtuoso.removeObserver(queueObserver)
+    virtuoso.removeObserver(enginePauseObserver)
   }
 
   fun setup(
-    user: String,
+    userId: String,
     backplaneUrl: String,
     publicKey: String,
     privateKey: String,
     activity: Activity,
     promise: Promise,
-  ): Unit {
+  ) {
     val backplane = getVirtuoso(activity)
     val status = backplane.backplane?.authenticationStatus
+    val nameDevice = android.os.Build.MODEL
     if (status == AuthenticationStatus.NOT_AUTHENTICATED) {
-      virtuoso!!.startup(
-        URL(backplaneUrl),//substitute the proper backplane url for you implementation
-        // substitute the proper backplane url for your implementation
-        user,    // provide an appropriate unique user id. A random uuid is used here for demonstration purposes only
-        null, //Optional additional device id to be associated with the user account.  This is not the device id generated by the virtuoso SDK
-        publicKey,//Penthera demo public key.  Substitute the correct one.
+      virtuoso.startup(
+        URL(backplaneUrl),
+        userId,
+        nameDevice,
+        publicKey,
         privateKey,
         object : IPushRegistrationObserver {
           override fun onServiceAvailabilityResponse(
@@ -117,12 +120,12 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       setClientSideAdSupport(true)
     }.build()
 
-    virtuoso!!.assetManager.createMPDSegmentedAssetAsync(params)
+    virtuoso.assetManager.createMPDSegmentedAssetAsync(params)
   }
 
    fun getDownloads(): String? {
     val completedList = mutableListOf<MutableMap<String, Any>>()
-    val cursor = virtuoso?.assetManager?.cursor
+    val cursor = virtuoso.assetManager?.cursor
     val count = cursor?.count
     if( count == 0){
       cursor.close()
@@ -171,28 +174,31 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     }
   }
 
-  fun deleteAsset(assetId: String) {
-    //load asset if it has already been downloaded
-    val list: MutableList<IIdentifier>? = virtuoso?.assetManager?.getByAssetId(assetId)
 
-    list?.let {
-      if (it.isNotEmpty())
-        asset = list[0] as IAsset
-      EventEmitter.sharedInstance.dispatch(
-        "penthera",
-        PentheraEvent.ASSET_DELETED,
-        asset!!.assetId,
-        "test"
-      )
-      virtuoso?.assetManager?.delete(asset)
-      asset = null
+  fun deleteMany(assetIds: ReadableArray, promise: Promise) {
+    val assetManager = virtuoso.assetManager
+    val result = Arguments.createMap()
+
+    for (i in 0 until assetIds.size()) {
+      val assetId = assetIds.getString(i)
+      val asset = assetManager.getByAssetId(assetId)
+        .firstOrNull() as? IAsset
+
+      if (asset != null) {
+        assetManager.delete(asset)
+        result.putBoolean(assetId, true)
+      } else {
+        result.putBoolean(assetId, false)
+      }
     }
 
+    promise.resolve(result);
   }
 
+
   fun getByAssetId(assetId: String): String? {
     //load asset if it has already been downloaded
-    val list: MutableList<IIdentifier>? = virtuoso?.assetManager?.getByAssetId(assetId)
+    val list: MutableList<IIdentifier>? = virtuoso.assetManager.getByAssetId(assetId)
 
     list?.let {
       if (it.isNotEmpty()) {
@@ -210,7 +216,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
   fun updateUI() {}
 
   fun loadBitmovinSourceManager(assetId: String, nativeId: String): Boolean {
-    virtuoso?.assetManager?.getByAssetId(assetId)?.firstOrNull()?.let { asset ->
+    virtuoso.assetManager?.getByAssetId(assetId)?.firstOrNull()?.let { asset ->
       val sourceManager = BitmovinSourceManager(context, asset as ISegmentedAsset)
       val sourceItem = sourceManager.bitmovinSourceItem
       val playerModule = context.getNativeModule(PlayerModule::class.java)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeoffmedia/react-native-penthera",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -166,4 +166,4 @@
   "dependencies": {
     "zustand": "^4.4.0"
   }
-}
+}

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>