Add ability to specify installer package name

zacharee · zacharee · commit 56de0c35fc52 · 2024-03-14T18:24:42.000-04:00
diff --git a/app/src/main/aidl/dev/zwander/installwithoptions/IOptionsApplier.aidl b/app/src/main/aidl/dev/zwander/installwithoptions/IOptionsApplier.aidl
@@ -0,0 +1,7 @@
+package dev.zwander.installwithoptions;
+
+import android.content.pm.PackageInstaller.SessionParams;
+
+interface IOptionsApplier {
+    SessionParams applyOptions(in SessionParams params) = 1;
+}
diff --git a/app/src/main/aidl/dev/zwander/installwithoptions/IShellInterface.aidl b/app/src/main/aidl/dev/zwander/installwithoptions/IShellInterface.aidl
@@ -1,10 +1,11 @@
 package dev.zwander.installwithoptions;
 
 import android.content.res.AssetFileDescriptor;
+import dev.zwander.installwithoptions.IOptionsApplier;
 import java.util.List;
 
 interface IShellInterface {
-    void install(in AssetFileDescriptor[] descriptors, in int[] options, boolean splits) = 1;
+    void install(in AssetFileDescriptor[] descriptors, in int[] options, boolean splits, IOptionsApplier optionsApplier) = 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
@@ -35,6 +35,7 @@ import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedCard
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -55,7 +56,9 @@ import dev.icerock.moko.mvvm.flow.compose.collectAsMutableState
 import dev.zwander.installwithoptions.components.Footer
 import dev.zwander.installwithoptions.data.DataModel
 import dev.zwander.installwithoptions.data.InstallOption
+import dev.zwander.installwithoptions.data.MutableOption
 import dev.zwander.installwithoptions.data.rememberInstallOptions
+import dev.zwander.installwithoptions.data.rememberMutableOptions
 import dev.zwander.installwithoptions.ui.theme.InstallWithOptionsTheme
 import dev.zwander.installwithoptions.util.ElevatedPermissionHandler
 import dev.zwander.installwithoptions.util.rememberPackageInstaller
@@ -110,7 +113,9 @@ fun MainContent(modifier: Modifier = Modifier) {
                 DocumentFile.fromSingleUri(context, uri)
             }
         }
-    val options = rememberInstallOptions()
+    val options = (rememberInstallOptions() + rememberMutableOptions()).sortedBy {
+        context.resources.getString(it.labelResource)
+    }
     val (install, isInstalling) = rememberPackageInstaller(selectedFiles)
 
     Box(
@@ -134,21 +139,34 @@ fun MainContent(modifier: Modifier = Modifier) {
                     contentPadding = PaddingValues(8.dp),
                 ) {
                     items(items = options, key = { it.labelResource }) { option ->
-                        OptionItem(
-                            option = option,
-                            isSelected = selectedOptions?.contains(option) == true,
-                            onSelectedChange = {
-                                selectedOptions = if (it) {
-                                    if (selectedOptions?.contains(option) == false) {
-                                        (selectedOptions ?: listOf()) + option
-                                    } else {
-                                        selectedOptions
+                        when (option) {
+                            is InstallOption -> {
+                                OptionItem(
+                                    option = option,
+                                    isSelected = selectedOptions?.contains(option) == true,
+                                    onSelectedChange = {
+                                        selectedOptions = if (it) {
+                                            if (selectedOptions?.contains(option) == false) {
+                                                (selectedOptions ?: listOf()) + option
+                                            } else {
+                                                selectedOptions
+                                            }
+                                        } else {
+                                            (selectedOptions ?: listOf()) - option
+                                        }
+                                    },
+                                )
+                            }
+                            is MutableOption<*> -> {
+                                when (option.value.value) {
+                                    is String? -> {
+                                        @Suppress("UNCHECKED_CAST")
+                                        TextOptionItem(option = option as MutableOption<String>)
                                     }
-                                } else {
-                                    (selectedOptions ?: listOf()) - option
                                 }
-                            },
-                        )
+                            }
+                            else -> {}
+                        }
                     }
                 }
 
@@ -289,3 +307,43 @@ fun OptionItem(
         }
     }
 }
+
+@Composable
+fun TextOptionItem(
+    option: MutableOption<String>,
+    modifier: Modifier = Modifier,
+) {
+    var state by option.value.collectAsMutableState()
+
+    OutlinedCard(
+        modifier = modifier,
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(8.dp),
+        ) {
+            Column(
+                modifier = Modifier.weight(1f),
+            ) {
+                Text(
+                    text = stringResource(id = option.labelResource),
+                    style = MaterialTheme.typography.titleMedium,
+                )
+
+                Text(
+                    text = stringResource(id = option.descResource),
+                    style = MaterialTheme.typography.bodySmall,
+                )
+
+                Spacer(modifier = Modifier.size(4.dp))
+
+                OutlinedTextField(
+                    value = state ?: "",
+                    onValueChange = { state = it },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/dev/zwander/installwithoptions/data/MutableOption.kt b/app/src/main/java/dev/zwander/installwithoptions/data/MutableOption.kt
@@ -0,0 +1,57 @@
+package dev.zwander.installwithoptions.data
+
+import android.content.pm.PackageInstaller.SessionParams
+import android.os.Build
+import androidx.annotation.Keep
+import androidx.annotation.StringRes
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import dev.zwander.installwithoptions.R
+import kotlinx.coroutines.flow.MutableStateFlow
+
+@Composable
+fun rememberMutableOptions(): List<MutableOption<*>> {
+    val context = LocalContext.current
+
+    return remember {
+        getMutableOptions().sortedBy { opt ->
+            context.resources.getString(opt.labelResource)
+        }
+    }
+}
+
+fun getMutableOptions() = MutableOption::class.sealedSubclasses
+    .mapNotNull { it.objectInstance }
+    .filter { Build.VERSION.SDK_INT >= it.minSdk && Build.VERSION.SDK_INT <= it.maxSdk }
+
+sealed class MutableOption<T>(
+    val settingsKey: SettingsKey<T>,
+    val operator: SessionParams.(value: T?) -> Unit,
+    override val minSdk: Int = Build.VERSION_CODES.BASE,
+    override val maxSdk: Int = Int.MAX_VALUE,
+    @StringRes override val labelResource: Int,
+    @StringRes override val descResource: Int,
+) : BaseOption<MutableStateFlow<T?>>() {
+    override val value = settingsKey.asMutableStateFlow()
+
+    fun apply(params: SessionParams) {
+        params.operator(value.value)
+    }
+
+    @Keep
+    data object InstallerPackage : MutableOption<String>(
+        settingsKey = SettingsKey.String(
+            key = "installer_package",
+            default = null,
+            settings = Settings.settings,
+        ),
+        operator = {
+            if (!it.isNullOrBlank()) {
+                setInstallerPackageName(it)
+            }
+        },
+        labelResource = R.string.installer_package,
+        descResource = R.string.installer_package_desc,
+    )
+}
diff --git a/app/src/main/java/dev/zwander/installwithoptions/data/Settings.kt b/app/src/main/java/dev/zwander/installwithoptions/data/Settings.kt
@@ -209,7 +209,7 @@ sealed class SettingsKey<Type> {
         override val settings: SharedPreferences,
     ) : SettingsKey<kotlin.String>() {
         override fun getValue(): kotlin.String? {
-            return default?.let { settings.getString(key, default) }
+            return settings.getString(key, default)
         }
 
         override fun setValue(value: kotlin.String?) {
diff --git a/app/src/main/java/dev/zwander/installwithoptions/util/Installer.kt b/app/src/main/java/dev/zwander/installwithoptions/util/Installer.kt
@@ -33,10 +33,12 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.IntentCompat
 import androidx.documentfile.provider.DocumentFile
 import dev.zwander.installwithoptions.BuildConfig
+import dev.zwander.installwithoptions.IOptionsApplier
 import dev.zwander.installwithoptions.R
 import dev.zwander.installwithoptions.data.DataModel
 import dev.zwander.installwithoptions.data.InstallOption
 import dev.zwander.installwithoptions.data.Settings
+import dev.zwander.installwithoptions.data.getMutableOptions
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -73,6 +75,15 @@ fun rememberPackageInstaller(files: List<DocumentFile>): Installer {
     }
     val shellInterface = rootAdapter.rememberShellInterface()
 
+    val applier = remember {
+        object : IOptionsApplier.Stub() {
+            override fun applyOptions(params: PackageInstaller.SessionParams): PackageInstaller.SessionParams {
+                getMutableOptions().forEach { it.apply(params) }
+                return params.copy()
+            }
+        }
+    }
+
     val receiver = remember {
         object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
@@ -122,6 +133,7 @@ fun rememberPackageInstaller(files: List<DocumentFile>): Installer {
                 }.toTypedArray(),
                 options.map { it.value }.toIntArray(),
                 split,
+                applier,
             )
         }
     }
diff --git a/app/src/main/java/dev/zwander/installwithoptions/util/InternalInstaller.kt b/app/src/main/java/dev/zwander/installwithoptions/util/InternalInstaller.kt
@@ -16,6 +16,7 @@ import android.os.ServiceManager
 import android.os.UserHandle
 import android.util.Log
 import dev.zwander.installwithoptions.BuildConfig
+import dev.zwander.installwithoptions.IOptionsApplier
 import kotlin.random.Random
 
 class InternalInstaller(private val context: Context) {
@@ -26,13 +27,14 @@ class InternalInstaller(private val context: Context) {
     fun installPackage(
         fileDescriptors: Array<AssetFileDescriptor>,
         options: IntArray,
-        splits: Boolean
+        splits: Boolean,
+        applier: IOptionsApplier,
     ) {
         if (splits) {
-            installPackagesInSession(fileDescriptors, options)
+            installPackagesInSession(fileDescriptors, options, applier)
         } else {
             fileDescriptors.forEach { fd ->
-                installPackagesInSession(arrayOf(fd), options)
+                installPackagesInSession(arrayOf(fd), options, applier)
             }
         }
     }
@@ -41,14 +43,16 @@ class InternalInstaller(private val context: Context) {
     private fun installPackagesInSession(
         fileDescriptors: Array<AssetFileDescriptor>,
         options: IntArray,
+        applier: IOptionsApplier,
     ) {
         var session: IPackageInstallerSession? = null
 
         try {
             val params = PackageInstaller.SessionParams(
                 PackageInstaller.SessionParams.MODE_FULL_INSTALL,
-            ).apply {
+            ).run {
                 options.reduceOrNull { acc, i -> acc or i }?.let { flags -> installFlags = flags }
+                applier.applyOptions(this)
             }
             val sessionId =
                 packageInstaller.createSession(params, "system", "system", UserHandle.myUserId())
diff --git a/app/src/main/java/dev/zwander/installwithoptions/util/ShellInterface.kt b/app/src/main/java/dev/zwander/installwithoptions/util/ShellInterface.kt
@@ -7,6 +7,7 @@ import android.os.Looper
 import androidx.annotation.Keep
 import androidx.core.os.UserHandleCompat
 import dev.zwander.installwithoptions.BuildConfig
+import dev.zwander.installwithoptions.IOptionsApplier
 import dev.zwander.installwithoptions.IShellInterface
 import rikka.shizuku.Shizuku
 import kotlin.system.exitProcess
@@ -32,12 +33,13 @@ class ShellInterface(context: Context) : IShellInterface.Stub() {
         fileDescriptors: Array<AssetFileDescriptor>,
         options: IntArray,
         splits: Boolean,
+        applier: IOptionsApplier,
     ) {
         if (Looper.myLooper() == null) {
             Looper.prepare()
         }
 
-        installer.installPackage(fileDescriptors, options, splits)
+        installer.installPackage(fileDescriptors, options, splits, applier)
     }
 
     override fun destroy() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -112,4 +112,7 @@
 
     <string name="ignore_dexopt_profile">Ignore Dexopt Profile</string>
     <string name="ignore_dexopt_profile_desc">Ignore dexopt profiles for this package during installation.</string>
+
+    <string name="installer_package">Installer Package</string>
+    <string name="installer_package_desc">Specify the package name of the app that Android should report this APK was installed by (e.g., com.android.vending).</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ sealed class SettingsKey<Type> {`
`209`	`209`	`override val settings: SharedPreferences,`
`210`	`210`	`) : SettingsKey<kotlin.String>() {`
`211`	`211`	`override fun getValue(): kotlin.String? {`
`212`		`- return default?.let { settings.getString(key, default) }`
	`212`	`+ return settings.getString(key, default)`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`override fun setValue(value: kotlin.String?) {`