Automatically group split and separate APKs

zacharee · zacharee · commit acc86b442796 · 2024-05-12T13:37:10.000-04:00
diff --git a/app/src/main/aidl/dev/zwander/installwithoptions/IShellInterface.aidl b/app/src/main/aidl/dev/zwander/installwithoptions/IShellInterface.aidl
@@ -1,11 +1,11 @@
 package dev.zwander.installwithoptions;
 
-import android.content.res.AssetFileDescriptor;
 import dev.zwander.installwithoptions.IOptionsApplier;
 import java.util.List;
+import java.util.Map;
 
 interface IShellInterface {
-    void install(in AssetFileDescriptor[] descriptors, in int[] options, boolean splits, IOptionsApplier optionsApplier, String installerPackageName) = 1;
+    void install(in Map descriptors, in int[] options, IOptionsApplier optionsApplier, String installerPackageName) = 1;
 
     void destroy() = 16777114;
 }
diff --git a/app/src/main/java/dev/zwander/installwithoptions/MainActivity.kt b/app/src/main/java/dev/zwander/installwithoptions/MainActivity.kt
@@ -1,8 +1,10 @@
 package dev.zwander.installwithoptions
 
 import android.content.Intent
+import android.content.pm.PackageParser
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
@@ -65,6 +67,8 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.documentfile.provider.DocumentFile
 import dev.icerock.moko.mvvm.flow.compose.collectAsMutableState
@@ -79,6 +83,7 @@ import dev.zwander.installwithoptions.util.ElevatedPermissionHandler
 import dev.zwander.installwithoptions.util.plus
 import dev.zwander.installwithoptions.util.rememberPackageInstaller
 
+@Suppress("DEPRECATION")
 class MainActivity : AppCompatActivity() {
     private val permissionHandler by lazy {
         ElevatedPermissionHandler(
@@ -125,10 +130,19 @@ class MainActivity : AppCompatActivity() {
 
     private fun checkIntentForPackage(intent: Intent) {
         if (intent.type == "application/vnd.android.package-archive") {
+            val selected = DataModel.selectedFiles.value.toMutableMap()
             val apkUri = intent.data ?: return
             val file = DocumentFile.fromSingleUri(this, apkUri) ?: return
 
-            DataModel.selectedFiles.value += file
+            val fd = contentResolver.openAssetFileDescriptor(apkUri, "r") ?: return
+            val apkFile = PackageParser.parseApkLite(fd.fileDescriptor, file.name, 0)
+
+            val packageList = selected[apkFile.packageName] ?: listOf()
+
+            selected[apkFile.packageName] = packageList + file
+            fd.close()
+
+            DataModel.selectedFiles.value = selected
         }
     }
 }
@@ -144,9 +158,20 @@ fun MainContent(modifier: Modifier = Modifier) {
     val context = LocalContext.current
     val fileSelector =
         rememberLauncherForActivityResult(contract = ActivityResultContracts.OpenMultipleDocuments()) { uris ->
-            selectedFiles = uris.mapNotNull { uri ->
-                DocumentFile.fromSingleUri(context, uri)
+            val selected = selectedFiles.toMutableMap()
+
+            uris.forEach { uri ->
+                val file = DocumentFile.fromSingleUri(context, uri) ?: return@forEach
+                val fd = context.contentResolver.openAssetFileDescriptor(uri, "r") ?: return@forEach
+                val apkFile = PackageParser.parseApkLite(fd.fileDescriptor, file.name, 0)
+
+                val packageList = selected[apkFile.packageName] ?: listOf()
+
+                selected[apkFile.packageName] = packageList + file
+                fd.close()
             }
+
+            selectedFiles = selected
         }
     val options = (rememberInstallOptions() + rememberMutableOptions()).sortedBy {
         context.resources.getString(it.labelResource)
@@ -204,7 +229,7 @@ fun MainContent(modifier: Modifier = Modifier) {
                                             ),
                                         contentAlignment = Alignment.Center,
                                     ) {
-                                        Text(text = selectedFiles.size.toString())
+                                        Text(text = selectedFiles.flatMap { it.value }.size.toString())
                                     }
 
                                     Spacer(modifier = Modifier.size(8.dp))
@@ -333,10 +358,23 @@ fun MainContent(modifier: Modifier = Modifier) {
             text = {
                 LazyColumn(
                     modifier = Modifier.fillMaxWidth(),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
                 ) {
-                    items(items = selectedFiles) {
-                        Text(text = it.name ?: it.uri.toString())
+                    items(items = selectedFiles.entries.flatMap { listOf(it.key) + it.value }) {
+                        if (it is String) {
+                            Text(
+                                text = it,
+                                fontWeight = FontWeight.Bold,
+                                textDecoration = TextDecoration.Underline,
+                                modifier = Modifier.padding(top = 8.dp, bottom = 0.dp),
+                            )
+                        }
+
+                        if (it is DocumentFile) {
+                            Text(
+                                text = it.name ?: it.uri.toString(),
+                                modifier = Modifier.padding(top = 0.dp, bottom = 4.dp),
+                            )
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/dev/zwander/installwithoptions/data/DataModel.kt b/app/src/main/java/dev/zwander/installwithoptions/data/DataModel.kt
@@ -7,5 +7,5 @@ object DataModel {
     val shizukuAvailable = MutableStateFlow(false)
     val rootGranted = MutableStateFlow(false)
     val selectedOptions = Settings.Keys.selectedOptions.asMutableStateFlow()
-    val selectedFiles = MutableStateFlow(listOf<DocumentFile>())
+    val selectedFiles = MutableStateFlow(mapOf<String, List<DocumentFile>>())
 }
diff --git a/app/src/main/java/dev/zwander/installwithoptions/util/Installer.kt b/app/src/main/java/dev/zwander/installwithoptions/util/Installer.kt
@@ -59,7 +59,7 @@ data class Installer(
 )
 
 @Composable
-fun rememberPackageInstaller(files: List<DocumentFile>): Installer {
+fun rememberPackageInstaller(files: Map<String, List<DocumentFile>>): Installer {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
     val permissionStarter =
@@ -76,9 +76,9 @@ fun rememberPackageInstaller(files: List<DocumentFile>): Installer {
 
     val options by DataModel.selectedOptions.collectAsState()
 
-    var showingConfirmation by remember {
-        mutableStateOf(false)
-    }
+//    var showingConfirmation by remember {
+//        mutableStateOf(false)
+//    }
     val rootAdapter = remember {
         ShizukuRootAdapter(context)
     }
@@ -149,32 +149,35 @@ fun rememberPackageInstaller(files: List<DocumentFile>): Installer {
         }
     }
 
-    fun installPackage(files: List<DocumentFile>, options: List<InstallOption>, split: Boolean) {
+    fun installPackage(files: Map<String, List<DocumentFile>>, options: List<InstallOption>) {
         if (shellInterface != null) {
             isInstalling = true
         }
 
         scope.launch(Dispatchers.IO) {
             try {
                 shellInterface?.install(
-                    files.map {
-                        context.contentResolver.openAssetFileDescriptor(
-                            it.uri,
-                            "r",
-                        )
-                    }.toTypedArray(),
+                    files.map { (k, v) ->
+                        k to v.map {
+                            context.contentResolver.openAssetFileDescriptor(
+                                it.uri,
+                                "r",
+                            )
+                        }
+                    }.toMap(),
                     options.map { it.value }.toIntArray(),
-                    split,
                     applier,
                     MutableOption.InstallerPackage.settingsKey.getValue(),
                 )
             } catch (e: Exception) {
-                statuses = files.map {
-                    InstallResult(
-                        status = InstallStatus.FAILURE,
-                        packageName = it.name ?: it.uri.toString(),
-                        message = e.localizedMessage ?: e.message ?: e.toString(),
-                    )
+                statuses = files.flatMap { (_, v) ->
+                    v.map {
+                        InstallResult(
+                            status = InstallStatus.FAILURE,
+                            packageName = it.name ?: it.uri.toString(),
+                            message = e.localizedMessage ?: e.message ?: e.toString(),
+                        )
+                    }
                 }
             }
         }
@@ -199,37 +202,37 @@ fun rememberPackageInstaller(files: List<DocumentFile>): Installer {
         }
     }
 
-    if (showingConfirmation) {
-        AlertDialog(
-            onDismissRequest = { showingConfirmation = false },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        installPackage(files, options ?: listOf(), true)
-                        showingConfirmation = false
-                    },
-                ) {
-                    Text(text = stringResource(id = R.string.split_app))
-                }
-            },
-            dismissButton = {
-                TextButton(
-                    onClick = {
-                        installPackage(files, options ?: listOf(), false)
-                        showingConfirmation = false
-                    },
-                ) {
-                    Text(text = stringResource(id = R.string.separate_apps))
-                }
-            },
-            title = {
-                Text(text = stringResource(id = R.string.install_question))
-            },
-            text = {
-                Text(text = stringResource(id = R.string.install_question_desc))
-            },
-        )
-    }
+//    if (showingConfirmation) {
+//        AlertDialog(
+//            onDismissRequest = { showingConfirmation = false },
+//            confirmButton = {
+//                TextButton(
+//                    onClick = {
+//                        installPackage(files, options ?: listOf(), true)
+//                        showingConfirmation = false
+//                    },
+//                ) {
+//                    Text(text = stringResource(id = R.string.split_app))
+//                }
+//            },
+//            dismissButton = {
+//                TextButton(
+//                    onClick = {
+//                        installPackage(files, options ?: listOf(), false)
+//                        showingConfirmation = false
+//                    },
+//                ) {
+//                    Text(text = stringResource(id = R.string.separate_apps))
+//                }
+//            },
+//            title = {
+//                Text(text = stringResource(id = R.string.install_question))
+//            },
+//            text = {
+//                Text(text = stringResource(id = R.string.install_question_desc))
+//            },
+//        )
+//    }
 
     statuses.takeIf { it.isNotEmpty() && it.size == files.size }?.let { s ->
         AlertDialog(
@@ -284,11 +287,7 @@ fun rememberPackageInstaller(files: List<DocumentFile>): Installer {
     return Installer(
         install = remember(files.hashCode(), options.hashCode()) {
             {
-                if (files.size > 1) {
-                    showingConfirmation = true
-                } else {
-                    installPackage(files, options ?: listOf(), false)
-                }
+                installPackage(files, options ?: listOf())
             }
         },
         isInstalling = isInstalling,
diff --git a/app/src/main/java/dev/zwander/installwithoptions/util/InternalInstaller.kt b/app/src/main/java/dev/zwander/installwithoptions/util/InternalInstaller.kt
@@ -26,18 +26,13 @@ class InternalInstaller(private val context: Context) {
             .packageInstaller
 
     fun installPackage(
-        fileDescriptors: Array<AssetFileDescriptor>,
+        fileDescriptors: Map<String, List<AssetFileDescriptor>>,
         options: IntArray,
-        splits: Boolean,
         applier: IOptionsApplier,
         installerPackageName: String,
     ) {
-        if (splits) {
-            installPackagesInSession(fileDescriptors, options, applier, installerPackageName)
-        } else {
-            fileDescriptors.forEach { fd ->
-                installPackagesInSession(arrayOf(fd), options, applier, installerPackageName)
-            }
+        fileDescriptors.forEach { (_, fds) ->
+            installPackagesInSession(fds.toTypedArray(), options, applier, installerPackageName)
         }
     }
 
diff --git a/app/src/main/java/dev/zwander/installwithoptions/util/ShellInterface.kt b/app/src/main/java/dev/zwander/installwithoptions/util/ShellInterface.kt
@@ -30,9 +30,8 @@ class ShellInterface(context: Context) : IShellInterface.Stub() {
     })
 
     override fun install(
-        fileDescriptors: Array<AssetFileDescriptor>,
+        fileDescriptors: Map<*, *>,
         options: IntArray,
-        splits: Boolean,
         applier: IOptionsApplier,
         installerPackageName: String?,
     ) {
@@ -41,9 +40,8 @@ class ShellInterface(context: Context) : IShellInterface.Stub() {
         }
 
         installer.installPackage(
-            fileDescriptors,
+            fileDescriptors as Map<String, List<AssetFileDescriptor>>,
             options,
-            splits,
             applier,
             installerPackageName.takeIf { !it.isNullOrBlank() } ?: "shell",
         )
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -30,11 +30,6 @@
     <string name="shizuku_not_running">Shizuku not Running</string>
     <string name="shizuku_not_running_desc">Shizuku needs to be running for this app to function. Follow the directions in the Shizuku app to start it.</string>
 
-    <string name="install_question">Bulk or Split?</string>
-    <string name="install_question_desc">You have multiple files selected for installation. Are these separate apps or split files for one app?</string>
-    <string name="separate_apps">Separate Apps</string>
-    <string name="split_app">Split App</string>
-
     <string name="replace_existing">Replace Existing</string>
     <string name="replace_existing_desc">If the package being installed already exists, replace/upgrade it.</string>
     

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ object DataModel {`
`7`	`7`	`val shizukuAvailable = MutableStateFlow(false)`
`8`	`8`	`val rootGranted = MutableStateFlow(false)`
`9`	`9`	`val selectedOptions = Settings.Keys.selectedOptions.asMutableStateFlow()`
`10`		`- val selectedFiles = MutableStateFlow(listOf<DocumentFile>())`
	`10`	`+ val selectedFiles = MutableStateFlow(mapOf<String, List<DocumentFile>>())`
`11`	`11`	`}`