@takeoffmedia/react-native-penthera 0.2.52 → 0.2.53

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

@@ -3,7 +3,6 @@ package com.takeoffmediareactnativepenthera
 import android.util.Log
 import com.penthera.common.Common
 import com.penthera.virtuososdk.client.IAsset
-import com.penthera.virtuososdk.client.IAssetManager
 import com.penthera.virtuososdk.client.IIdentifier
 import com.penthera.virtuososdk.client.Observers
 import com.penthera.virtuososdk.client.Virtuoso
@@ -34,7 +33,7 @@ class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso)
     val assetId = updateAsset.assetId
     updateItem(aAsset, true)
     EventEmitter.sharedInstance.dispatch("penthera", PentheraEvent.DOWNLOAD_COMPLETE, assetId, "")
-
+    mOfflineVideo.assetId.remove(assetId)
   }
 
   override fun engineEncounteredErrorDownloadingAsset(aAsset: IIdentifier) {
@@ -62,7 +61,7 @@ class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso)
     val assetId = updateAsset.assetId
 
     // Progress is for catalog item
-    if (assetId.isNotEmpty() && mOfflineVideo.assetId == assetId) {
+    if (assetId.isNotEmpty() && assetId in mOfflineVideo.assetId) {
       //update our asset status
       //mActivity.runOnUiThread{ updateItemStatus(updateAsset, forceUpdate) }
       //mOfflineVideo { updateItemStatus(updateAsset, forceUpdate) }
@@ -74,11 +73,11 @@ class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso)
     Log.e("MiModulo","<<<<<<<<<<updateItemStatus>>>>>>>>>>>>")
 
     asset?.let{
-      if(mOfflineVideo.assetId == it.assetId){
+      if(it.assetId in mOfflineVideo.assetId){
         mOfflineVideo.asset = asset
 
         var progress = (asset.fractionComplete * 100.0).toInt()
-        EventEmitter.sharedInstance.dispatch("penthera", PentheraEvent.PROGRESS_UPDATED, it.assetId, progress.toString())
+
         if (forceUpdate || progress != lastProgress) {
           val assetStatus : String
           val value: String
@@ -90,29 +89,30 @@ class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso)
               assetStatus = "Downloading"
               value = "downloading"
             }
-            Common.AssetStatus.DOWNLOAD_DENIED_ASSET -> {
-              assetStatus = "Queued"
-              value = ""
+            Common.AssetStatus.DOWNLOAD_COMPLETE -> {
+              assetStatus = "complete"
+              value = "complete"
             }
-            Common.AssetStatus.DOWNLOAD_DENIED_MAX_DEVICE_DOWNLOADS -> {
-              assetStatus = "Queued"
-              value = PentheraErrors.DOWNLOAD_DENIED_ASSET
+            // Max simultaneous downloaded assets across account: 10
+            Common.AssetStatus.DOWNLOAD_DENIED_ACCOUNT -> {
+              assetStatus = "Error"
+              value = PentheraErrors.DOWNLOAD_DENIED_MAX_DEVICE_DOWNLOADS
             }
+            // Max simultaneous copies of an asset across account: 1
             Common.AssetStatus.DOWNLOAD_DENIED_COPIES -> {
-              assetStatus = "Queued"
+              assetStatus = "Error"
               value = PentheraErrors.DOWNLOAD_DENIED_COPIES
             }
-            Common.AssetStatus.DOWNLOAD_DENIED_ACCOUNT -> {
-              assetStatus = "Queued"
-              value = PentheraErrors.DOWNLOAD_DENIED_MAX_DEVICE_DOWNLOADS
-            }
-            Common.AssetStatus.DOWNLOAD_COMPLETE -> {
-              assetStatus = "complete"
-              value = "complete"
+            //Max simultaneous download-enabled devices per account: 5
+            Common.AssetStatus.DOWNLOAD_DENIED_ASSET -> {
+              assetStatus = "Error"
+              value = PentheraErrors.DOWNLOAD_DENIED_ASSET
             }
+
+
             else -> {
               if(allowableStorageRemaining == 0L) {
-                assetStatus = "Queued"
+                assetStatus = "Error"
                 value = "Insufficient storage for download"
               } else {
                 assetStatus = "Queued"
@@ -120,9 +120,11 @@ class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso)
               }
             }
           }
-          val hasError = assetStatus !== "Downloading" && assetStatus !== "complete"
+          val hasError = assetStatus == "Error"
           if(hasError){
             EventEmitter.sharedInstance.dispatch("penthera", PentheraEvent.ERROR_DOWNLOAD, it.assetId, value)
+          } else if(assetStatus == "Downloading") {
+              EventEmitter.sharedInstance.dispatch("penthera", PentheraEvent.PROGRESS_UPDATED, it.assetId, progress.toString())
           }
         }
       }

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

@@ -42,7 +42,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
   private lateinit var queueObserver: AssetQueueObserver
 
   var asset: IAsset? = null
-  var assetId: String = ""
+  var assetId: MutableList<String> = mutableListOf()
   private val gson = Gson()
 
   private val enginePauseObserver: Observers.IEngineObserver = object : EngineObserver() {
@@ -106,8 +106,8 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
   fun downloadAsset(newItem: String, activity: Activity) {
     val data = JSONObject(newItem)
     val item = data["item"] as JSONObject
+    assetId.add(item["id"].toString())
     val url = data["url"].toString()
-    assetId = item["id"].toString()
     val metadata = item.toString()
     val fileList: MutableList<AncillaryFile> = ArrayList()
     val static = item["static"] as JSONObject
@@ -147,7 +147,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     }
 
     val params = MPDAssetBuilder().apply {
-      assetId(assetId)
+      assetId(item["id"].toString())
       manifestUrl(URL(url))
       assetObserver(AssetParseObserver(context))
       addToQueue(true)
@@ -259,15 +259,17 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     val result = Arguments.createMap()
 
     for (i in 0 until assetIds.size()) {
-      val assetId = assetIds.getString(i)
-      val asset = assetManager.getByAssetId(assetId)
+      val idValue = assetIds.getString(i)
+      val asset = assetManager.getByAssetId(idValue)
         .firstOrNull() as? IAsset
 
       if (asset != null) {
         assetManager.delete(asset)
-        result.putBoolean(assetId, true)
+        result.putBoolean(idValue, true)
+        assetId.remove(idValue)
       } else {
-        result.putBoolean(assetId, false)
+        result.putBoolean(idValue, false)
+        assetId.remove(idValue)
       }
     }
 

package/android/src/main/java/com/takeoffmediareactnativepenthera/virtuoso/errors/ErrorsMapped.kt

@@ -1,7 +1,9 @@
 package com.takeoffmediareactnativepenthera.virtuoso.errors
 
 object PentheraErrors {
-  const val DOWNLOAD_DENIED_ASSET = "The asset has already been downloaded as many times as permitted.  To download this asset again, administrative action is required."
-  const val DOWNLOAD_DENIED_COPIES = "There are already as many downloaded copies of this asset as permitted on this account.  To continue downloading, the user must delete a copy of this asset from one of their devices."
   const val DOWNLOAD_DENIED_MAX_DEVICE_DOWNLOADS = "There are already as many downloads as permitted on this account.  To continue downloading, the user must delete downloaded assets from one of their devices."
+  const val DOWNLOAD_DENIED_COPIES = "There are already as many downloaded copies of this asset as permitted on this account.  To continue downloading, the user must delete a copy of this asset from one of their devices."
+  const val DOWNLOAD_DENIED_ASSET = "The asset has already been downloaded as many times as permitted.  To download this asset again, administrative action is required."
+
+
 }

package/package.json

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