@takeoffmedia/react-native-penthera 0.2.56 → 0.2.58

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

@@ -1,25 +1,19 @@
 package com.takeoffmediareactnativepenthera
 
 import EventEmitter
-import android.app.Activity
 import android.util.Log
-import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.LifecycleEventListener
 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
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 
 
 class PentheraModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
   private var offlineVideoEngine: OfflineVideoEngine = OfflineVideoEngine(reactContext)
-  private var activity: Activity? = null
   private var appState: String = "active"
   val reactContext: ReactApplicationContext = reactContext
 
@@ -28,7 +22,6 @@ class PentheraModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
     super.initialize()
 
     EventEmitter.sharedInstance.registerEventEmitter(this)
-    activity = currentActivity
   }
 
   // Example method
@@ -40,12 +33,12 @@ class PentheraModule(reactContext: ReactApplicationContext) : ReactContextBaseJa
 
   @ReactMethod
   fun initializeSdk(user: String, backplaneUrl: String, publicKey: String, privateKey: String, promise: Promise) {
-    offlineVideoEngine?.setup(user, backplaneUrl, publicKey, privateKey, activity!!, promise)
+    offlineVideoEngine?.setup(user, backplaneUrl, publicKey, privateKey, promise)
   }
 
   @ReactMethod
   fun download(data: String){
-    offlineVideoEngine?.downloadAsset(data, activity!!)
+    offlineVideoEngine?.downloadAsset(data)
   }
   @ReactMethod
   fun getDownloads(blank: String, promise: Promise) {

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.util.Log
-import android.widget.Toast
 import com.bitmovin.player.reactnative.PlayerModule
 import com.bitmovin.player.reactnative.converter.JsonConverter
 
@@ -28,13 +27,11 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
 import com.penthera.virtuososdk.client.AncillaryFile
 import org.json.JSONArray
 import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.Calendar
-import java.util.TimeZone
 
 class OfflineVideoEngine(private val context: ReactApplicationContext) {
 
@@ -52,7 +49,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     }
   }
 
-  private fun getVirtuoso(activity: Activity): Virtuoso {
+  private fun getInstanceVirtuoso(): Virtuoso {
     virtuoso = Virtuoso(context)
     queueObserver = AssetQueueObserver(this, virtuoso)
     onResume()
@@ -76,10 +73,9 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     backplaneUrl: String,
     publicKey: String,
     privateKey: String,
-    activity: Activity,
     promise: Promise,
   ) {
-    val backplane = getVirtuoso(activity)
+    val backplane = getInstanceVirtuoso()
     val status = backplane.backplane?.authenticationStatus
     val nameDevice = android.os.Build.MODEL
     if (status == AuthenticationStatus.NOT_AUTHENTICATED) {
@@ -104,7 +100,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
   }
 
 
-  fun downloadAsset(newItem: String, activity: Activity) {
+  fun downloadAsset(newItem: String) {
     val data = JSONObject(newItem)
     val item = data["item"] as JSONObject
     assetId.add(item["id"].toString())
@@ -172,7 +168,6 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     val columnNames = cursor?.columnNames
 
       while (cursor?.moveToNext() == true && columnNames != null) {
-        val assetManager = virtuoso.assetManager
         val dataMap = mutableMapOf<String, Any>()
         var eap = ""
         var ead = ""
@@ -208,6 +203,11 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
             if (columnName == "eap") {
               eap = value
             }
+            if(columnName == "activePercentOfDownloads"){
+              val percentage = value.toDouble() * 100
+              val isComplete = percentage == 100.0
+              dataMap["isCompleted"] = isComplete
+            }
             if (columnName == "firstPlayTime") {
               var eadFormated = dateToString(ead)
               var eapFormated = dateToString(eap)
@@ -218,7 +218,6 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
 
           }
         }
-        dataMap["isCompleted"] = dataMap["currentSize"] == dataMap["expectedSize"]
         dataMap["isPaused"] = false
         completedList.add(dataMap)
       }

package/package.json

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