Install packages directly to improve performance

* reduces temporary storage usage
* speeds up installation by a little bit

vending-app/src/main/java/org/microg/vending/billing/core/HttpClient.kt

@@ -26,6 +26,7 @@ import org.microg.gms.utils.singleInstanceOf
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
+import java.io.OutputStream
 
 private const val POST_TIMEOUT = 8000L
 
@@ -41,18 +42,24 @@ class HttpClient {
         url: String,
         downloadFile: File,
         params: Map<String, String> = emptyMap()
-    ): File {
+    ): File = downloadFile.also { toFile ->
+        val parentDir = downloadFile.getParentFile()
+        if (parentDir != null && !parentDir.exists() && !parentDir.mkdirs()) {
+            throw IOException("Failed to create directories: ${parentDir.absolutePath}")
+        }
+
+        FileOutputStream(toFile).use { download(url, it, params) }
+    }
+
+    suspend fun download(
+        url: String,
+        downloadTo: OutputStream,
+        params: Map<String, String> = emptyMap()
+    ) {
         client.prepareGet(url.asUrl(params)).execute { response ->
-            val parentDir = downloadFile.getParentFile()
-            if (parentDir != null && !parentDir.exists() && !parentDir.mkdirs()) {
-                throw IOException("Failed to create directories: ${parentDir.absolutePath}")
-            }
             val body: ByteReadChannel = response.body()
-            FileOutputStream(downloadFile).use { out ->
-                body.copyTo(out = out)
-            }
+            body.copyTo(out = downloadTo)
         }
-        return downloadFile
     }
 
     suspend fun <O> get(

vending-app/src/main/java/org/microg/vending/ui/VendingActivity.kt

@@ -21,7 +21,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import com.android.vending.buildRequestHeaders
-import com.android.vending.installer.installPackages
+import com.android.vending.installer.installPackagesFromNetwork
 import com.android.vending.installer.uninstallPackage
 import kotlinx.coroutines.runBlocking
 import org.microg.gms.common.DeviceConfiguration
@@ -39,7 +39,6 @@ import org.microg.vending.billing.core.GooglePlayApi.Companion.URL_ITEM_DETAILS
 import org.microg.vending.billing.core.HttpClient
 import org.microg.vending.billing.createDeviceEnvInfo
 import org.microg.vending.billing.proto.GoogleApiResponse
-import org.microg.vending.delivery.downloadPackageComponents
 import org.microg.vending.enterprise.EnterpriseApp
 import org.microg.vending.delivery.requestDownloadUrls
 import org.microg.vending.enterprise.AppState
@@ -104,22 +103,17 @@ class VendingActivity : ComponentActivity() {
                         return@runBlocking
                     }
 
-                    val packageFiles = client.downloadPackageComponents(this@VendingActivity, downloadUrls.getOrThrow(), Unit)
-                    if (packageFiles.values.any { it == null }) {
-                        Log.w(TAG, "Cannot proceed to installation as not all files were downloaded")
-                        apps[app] = previousState
-                        return@runBlocking
-                    }
-
                     runCatching {
-                        installPackages(
-                            app.packageName,
-                            packageFiles.values.filterNotNull(),
-                            isUpdate
+                        installPackagesFromNetwork(
+                            packageName = app.packageName,
+                            components = downloadUrls.getOrThrow(),
+                            httpClient = client,
+                            isUpdate = isUpdate
                         )
                     }.onSuccess {
                         apps[app] = AppState.INSTALLED
                     }.onFailure {
+                        Log.w(TAG, "Installation from network unsuccessful.")
                         apps[app] = previousState
                     }
                 }

vending-app/src/main/kotlin/com/android/vending/installer/Install.kt

@@ -10,30 +10,65 @@ import android.content.pm.PackageInstaller.SessionParams
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
+import com.google.android.finsky.splitinstallservice.PackageComponent
 import kotlinx.coroutines.CompletableDeferred
+import org.microg.vending.billing.core.HttpClient
 import java.io.File
 import java.io.FileInputStream
 import java.io.IOException
+import java.io.OutputStream
 
 @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
 internal suspend fun Context.installPackages(
-    callingPackage: String,
+    packageName: String,
     componentFiles: List<File>,
     isUpdate: Boolean = false
+) = installPackagesInternal(
+    packageName = packageName,
+    componentNames = componentFiles.map { it.name },
+    isUpdate = isUpdate
+) { fileName, to ->
+    val component = componentFiles.find { it.name == fileName }!!
+    FileInputStream(component).use { it.copyTo(to) }
+    component.delete()
+}
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+internal suspend fun Context.installPackagesFromNetwork(
+    packageName: String,
+    components: List<PackageComponent>,
+    httpClient: HttpClient = HttpClient(),
+    isUpdate: Boolean = false
+) = installPackagesInternal(
+    packageName = packageName,
+    componentNames = components.map { it.componentName },
+    isUpdate = isUpdate
+) { fileName, to ->
+    val component = components.find { it.componentName == fileName }!!
+    Log.v(TAG, "installing $fileName for $packageName from network")
+    httpClient.download(component.url, to)
+}
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+private suspend fun Context.installPackagesInternal(
+    packageName: String,
+    componentNames: List<String>,
+    isUpdate: Boolean = false,
+    writeComponent: suspend (componentName: String, to: OutputStream) -> Unit
 ) {
     Log.v(TAG, "installPackages start")
 
     val packageInstaller = packageManager.packageInstaller
     val installed = packageManager.getInstalledPackages(0).any {
-        it.applicationInfo.packageName == callingPackage
+        it.applicationInfo.packageName == packageName
     }
     // Contrary to docs, MODE_INHERIT_EXISTING cannot be used if package is not yet installed.
     val params = SessionParams(
         if (!installed || isUpdate) SessionParams.MODE_FULL_INSTALL
         else SessionParams.MODE_INHERIT_EXISTING
     )
-    params.setAppPackageName(callingPackage)
-    params.setAppLabel(callingPackage + "Subcontracting")
+    params.setAppPackageName(packageName)
+    params.setAppLabel(packageName + "Subcontracting")
     params.setInstallLocation(PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY)
     try {
         @SuppressLint("PrivateApi") val method = SessionParams::class.java.getDeclaredMethod(
@@ -45,17 +80,14 @@ internal suspend fun Context.installPackages(
     }
     val sessionId: Int
     var session: PackageInstaller.Session? = null
-    var totalDownloaded = 0L
     try {
         sessionId = packageInstaller.createSession(params)
         session = packageInstaller.openSession(sessionId)
-        componentFiles.forEach { file ->
-            session.openWrite(file.name, 0, -1).use { outputStream ->
-                FileInputStream(file).use { inputStream -> inputStream.copyTo(outputStream) }
+        componentNames.forEach { component ->
+            session.openWrite(component, 0, -1).use { outputStream ->
+                writeComponent(component, outputStream)
                 session.fsync(outputStream)
             }
-            totalDownloaded += file.length()
-            file.delete()
         }
         val deferred = CompletableDeferred<Unit>()
 

vending-app/src/main/kotlin/com/google/android/finsky/splitinstallservice/SplitInstallManager.kt

@@ -18,13 +18,12 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.pm.PackageInfoCompat
 import com.android.vending.R
 import com.android.vending.installer.KEY_BYTES_DOWNLOADED
-import com.android.vending.installer.installPackages
+import com.android.vending.installer.installPackagesFromNetwork
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.microg.vending.billing.AuthManager
 import org.microg.vending.billing.core.HttpClient
-import org.microg.vending.delivery.downloadPackageComponents
 import org.microg.vending.delivery.requestDownloadUrls
 import org.microg.vending.splitinstall.SPLIT_LANGUAGE_TAG
 
@@ -92,29 +91,22 @@ class SplitInstallManager(val context: Context) {
             splitInstallRecord[it] = DownloadStatus.PENDING
         }
 
-        val packageFiles = httpClient.downloadPackageComponents(context, components, SPLIT_LANGUAGE_TAG)
-
-        packageFiles.forEach { (component, downloadFile) ->
-            splitInstallRecord[component] = if (downloadFile != null) DownloadStatus.COMPLETE else DownloadStatus.FAILED
-        }
-
-        val installFiles = packageFiles.map {
-            if (it.value == null) {
-                Log.w(TAG, "splitInstallFlow download failed, as ${it.key} was not downloaded")
-                throw RuntimeException("installSplitPackage downloadSplitPackage has error")
-            } else it.value!!
-        }
-        Log.v(TAG, "splitInstallFlow downloaded success, downloaded ${installFiles.size} files")
-
         val success = runCatching {
-            context.installPackages(callingPackage, installFiles, false)
+            context.installPackagesFromNetwork(
+                packageName = callingPackage,
+                components = components,
+                httpClient = httpClient,
+                isUpdate = false
+            )
         }.isSuccess
 
         NotificationManagerCompat.from(context).cancel(SPLIT_INSTALL_NOTIFY_ID)
         return if (success) {
             sendCompleteBroad(context, callingPackage, components.sumOf { it.size.toLong() })
+            components.forEach { splitInstallRecord[it] = DownloadStatus.COMPLETE }
             true
         } else {
+            components.forEach { splitInstallRecord[it] = DownloadStatus.FAILED }
             false
         }
     }