Asset: Optimize resource download logic (#2957)

Author: DaVinci9196

vending-app/src/main/kotlin/com/google/android/finsky/assetmoduleservice/AssetModuleService.kt

@@ -76,6 +76,12 @@ class AssetModuleServiceImpl(
                 throw AssetPackException(AssetPackErrorCode.API_NOT_AVAILABLE)
             }
         }
+        if (packageDownloadData[packageName] != null && packageDownloadData[packageName]?.moduleNames?.all {
+                packageDownloadData[packageName]?.getModuleData(it)?.status == AssetPackStatus.COMPLETED
+            } == true && params.installedAssetModules.isEmpty()) {
+            Log.d(TAG, "startDownload: resetAllModuleStatus ")
+            packageDownloadData[packageName]?.resetAllModuleStatus()
+        }
         params.moduleNames.forEach {
             val moduleData = packageDownloadData[packageName]?.getModuleData(it)
             if (moduleData?.status != AssetPackStatus.DOWNLOADING && moduleData?.status != AssetPackStatus.COMPLETED) {
@@ -108,6 +114,15 @@ class AssetModuleServiceImpl(
     override suspend fun getSessionStates(params: GetSessionStatesParameters, packageName: String, callback: IAssetModuleServiceCallback?) {
         val listBundleData: MutableList<Bundle> = mutableListOf()
 
+        if (packageDownloadData[packageName] != null && packageDownloadData[packageName]?.moduleNames?.all {
+                packageDownloadData[packageName]?.getModuleData(it)?.status == AssetPackStatus.COMPLETED
+            } == true && params.installedAssetModules.isEmpty()) {
+            Log.d(TAG, "getSessionStates: resetAllModuleStatus: $listBundleData")
+            packageDownloadData[packageName]?.resetAllModuleStatus()
+            callback?.onGetSessionStates(listBundleData)
+            return
+        }
+
         packageDownloadData[packageName]?.moduleNames?.forEach { moduleName ->
             if (moduleName in params.installedAssetModules) return@forEach
 
@@ -198,6 +213,12 @@ class AssetModuleServiceImpl(
                 throw AssetPackException(AssetPackErrorCode.API_NOT_AVAILABLE)
             }
         }
+        if (packageDownloadData[packageName] != null && packageDownloadData[packageName]?.moduleNames?.all {
+                packageDownloadData[packageName]?.getModuleData(it)?.status == AssetPackStatus.COMPLETED
+            } == true && params.installedAssetModules.isEmpty()) {
+            Log.d(TAG, "requestDownloadInfo: resetAllModuleStatus ")
+            packageDownloadData[packageName]?.resetAllModuleStatus()
+        }
         params.moduleNames.forEach {
             val packData = packageDownloadData[packageName]?.getModuleData(it)
             if (packData?.status == AssetPackStatus.FAILED) {

vending-app/src/main/kotlin/com/google/android/finsky/assetmoduleservice/DownloadData.kt

@@ -6,7 +6,9 @@
 package com.google.android.finsky.assetmoduleservice
 
 import android.content.Context
+import android.util.Log
 import com.google.android.finsky.getChunkFile
+import com.google.android.play.core.assetpacks.model.AssetPackStatus
 import com.google.android.play.core.assetpacks.protocol.CompressionFormat
 import java.io.File
 import java.io.Serializable
@@ -34,6 +36,12 @@ data class DownloadData(
             status = statusCode
         }
     }
+
+    fun resetAllModuleStatus() {
+        // After the user clears the data, the completed module needs to be reset
+        status = AssetPackStatus.NOT_INSTALLED
+        moduleNames.forEach { getModuleData(it).resetStatus() }
+    }
 }
 
 fun DownloadData?.merge(data: DownloadData?): DownloadData? {
@@ -58,6 +66,10 @@ data class ModuleData(
     fun incrementBytesDownloaded(bytes: Long) {
         bytesDownloaded += bytes
     }
+    fun resetStatus() {
+        bytesDownloaded = 0
+        status = AssetPackStatus.NOT_INSTALLED
+    }
 }
 
 data class ChunkData(