Fully Implement Silent Installation

Automated Code Formatting

src/main/kotlin/com/looker/droidify/MainApplication.kt

@@ -5,21 +5,17 @@ import android.app.Application
 import android.app.job.JobInfo
 import android.app.job.JobScheduler
 import android.content.*
-import android.content.pm.PackageInfo
 import com.looker.droidify.content.Cache
 import com.looker.droidify.content.Preferences
 import com.looker.droidify.content.ProductPreferences
 import com.looker.droidify.database.Database
-import com.looker.droidify.entity.InstalledItem
 import com.looker.droidify.index.RepositoryUpdater
 import com.looker.droidify.network.Downloader
 import com.looker.droidify.network.PicassoDownloader
 import com.looker.droidify.service.Connection
 import com.looker.droidify.service.SyncService
-import com.looker.droidify.utility.Utils
+import com.looker.droidify.utility.Utils.toInstalledItem
 import com.looker.droidify.utility.extension.android.Android
-import com.looker.droidify.utility.extension.android.singleSignature
-import com.looker.droidify.utility.extension.android.versionCodeCompat
 import com.squareup.picasso.OkHttp3Downloader
 import com.squareup.picasso.Picasso
 import java.net.InetSocketAddress
@@ -27,10 +23,6 @@ import java.net.Proxy
 
 @Suppress("unused")
 class MainApplication : Application() {
-    private fun PackageInfo.toInstalledItem(): InstalledItem {
-        val signatureString = singleSignature?.let(Utils::calculateHash).orEmpty()
-        return InstalledItem(packageName, versionName.orEmpty(), versionCodeCompat, signatureString)
-    }
 
     override fun onCreate() {
         super.onCreate()

src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt

@@ -26,6 +26,8 @@ import com.looker.droidify.service.Connection
 import com.looker.droidify.service.DownloadService
 import com.looker.droidify.utility.RxUtils
 import com.looker.droidify.utility.Utils
+import com.looker.droidify.utility.Utils.startPackageInstaller
+import com.looker.droidify.utility.Utils.startUpdate
 import com.looker.droidify.utility.extension.android.*
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
@@ -134,7 +136,6 @@ class ProductFragment() : ScreenFragment(), ProductAdapter.Callbacks {
             }
             addOnScrollListener(scrollListener)
             addItemDecoration(adapter.gridItemDecoration)
-//      addItemDecoration(DividerItemDecoration(context, adapter::configureDivider))
             savedInstanceState?.getParcelable<ProductAdapter.SavedState>(STATE_ADAPTER)
                 ?.let(adapter::restoreState)
             layoutManagerState = savedInstanceState?.getParcelable(STATE_LAYOUT_MANAGER)
@@ -385,27 +386,7 @@ class ProductFragment() : ScreenFragment(), ProductAdapter.Callbacks {
             ProductAdapter.Action.INSTALL,
             ProductAdapter.Action.UPDATE -> {
                 val installedItem = installed?.installedItem
-                val productRepository = Product.findSuggested(products, installedItem) { it.first }
-                val compatibleReleases = productRepository?.first?.selectedReleases.orEmpty()
-                    .filter { installedItem == null || installedItem.signature == it.signature }
-                val release = if (compatibleReleases.size >= 2) {
-                    compatibleReleases
-                        .filter { it.platforms.contains(Android.primaryPlatform) }
-                        .minByOrNull { it.platforms.size }
-                        ?: compatibleReleases.minByOrNull { it.platforms.size }
-                        ?: compatibleReleases.firstOrNull()
-                } else {
-                    compatibleReleases.firstOrNull()
-                }
-                val binder = downloadConnection.binder
-                if (productRepository != null && release != null && binder != null) {
-                    binder.enqueue(
-                        packageName,
-                        productRepository.first.name,
-                        productRepository.second,
-                        release
-                    )
-                } else Unit
+                startUpdate(packageName, installedItem, products, downloadConnection)
             }
             ProductAdapter.Action.LAUNCH -> {
                 val launcherActivities = installed?.launcherActivities.orEmpty()

src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt

@@ -1,7 +1,6 @@
 package com.looker.droidify.screen
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.os.Parcel
 import android.view.ViewGroup
@@ -11,15 +10,12 @@ import android.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.looker.droidify.R
-import com.looker.droidify.content.Cache
 import com.looker.droidify.content.Preferences
 import com.looker.droidify.database.CursorOwner
 import com.looker.droidify.utility.KParcelable
-import com.looker.droidify.utility.extension.android.Android
+import com.looker.droidify.utility.Utils.startPackageInstaller
 import com.looker.droidify.utility.extension.resources.getDrawableFromAttr
 import com.looker.droidify.utility.extension.text.nullIfEmpty
-import com.topjohnwu.superuser.Shell
-import java.io.File
 
 abstract class ScreenActivity : FragmentActivity() {
     companion object {
@@ -219,11 +215,7 @@ abstract class ScreenActivity : FragmentActivity() {
             is SpecialIntent.Install -> {
                 val packageName = specialIntent.packageName
                 if (!packageName.isNullOrEmpty()) {
-                    val fragment = currentFragment
-                    if (fragment !is ProductFragment || fragment.packageName != packageName) {
-                        pushFragment(ProductFragment(packageName))
-                    }
-                    specialIntent.cacheFileName?.let(::startPackageInstaller)
+                    specialIntent.cacheFileName?.let { startPackageInstaller(it) }
                 }
                 Unit
             }
@@ -244,37 +236,6 @@ abstract class ScreenActivity : FragmentActivity() {
         }
     }
 
-    internal fun startPackageInstaller(cacheFileName: String) {
-        val file = Cache.getReleaseFile(this, cacheFileName)
-        if (Preferences[Preferences.Key.RootPermission]) {
-            val commandBuilder = StringBuilder()
-            commandBuilder.append("settings put global verifier_verify_adb_installs 0 ; ")
-            commandBuilder.append(
-                getPackageInstallCommand(file)
-            )
-            commandBuilder.append(" ; settings put global verifier_verify_adb_installs 1")
-            Shell.su(commandBuilder.toString()).exec()
-        } else {
-            val (uri, flags) = if (Android.sdk(24)) {
-                Pair(
-                    Cache.getReleaseUri(this, cacheFileName),
-                    Intent.FLAG_GRANT_READ_URI_PERMISSION
-                )
-            } else {
-                Pair(Uri.fromFile(file), 0)
-            }
-            // TODO Handle deprecation
-            @Suppress("DEPRECATION")
-            startActivity(
-                Intent(Intent.ACTION_INSTALL_PACKAGE)
-                    .setDataAndType(uri, "application/vnd.android.package-archive").setFlags(flags)
-            )
-        }
-    }
-
-    private fun getPackageInstallCommand(cacheFile: File): String =
-        "cat \"${cacheFile.absolutePath}\" | pm install -t -r -S ${cacheFile.length()}"
-
     internal fun navigateProduct(packageName: String) = pushFragment(ProductFragment(packageName))
     internal fun navigateRepositories() = pushFragment(RepositoriesFragment())
     internal fun navigatePreferences() = pushFragment(SettingsFragment())

src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt

@@ -182,7 +182,9 @@ class SettingsFragment : ScreenFragment() {
             preferences[Preferences.Key.ProxyHost]?.setEnabled(enabled)
             preferences[Preferences.Key.ProxyPort]?.setEnabled(enabled)
         }
-        preferences[Preferences.Key.RootPermission]?.setEnabled(Shell.getShell().isRoot)
+        preferences[Preferences.Key.RootPermission]?.setEnabled(
+            Shell.getCachedShell()?.isRoot ?: Shell.getShell().isRoot
+        )
         if (key == Preferences.Key.Theme) {
             requireActivity().recreate()
         }

src/main/kotlin/com/looker/droidify/service/DownloadService.kt

@@ -14,6 +14,7 @@ import com.looker.droidify.Common
 import com.looker.droidify.MainActivity
 import com.looker.droidify.R
 import com.looker.droidify.content.Cache
+import com.looker.droidify.content.Preferences
 import com.looker.droidify.entity.Release
 import com.looker.droidify.entity.Repository
 import com.looker.droidify.network.Downloader
@@ -300,9 +301,17 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
         stateSubject.onNext(State.Success(task.packageName, task.name, task.release) {
             consumed = true
         })
-        if (!consumed) {
-            showNotificationInstall(task)
-        }
+        if (consumed || (Preferences[Preferences.Key.RootPermission])) {
+            PendingIntent.getBroadcast(
+                this,
+                0,
+                Intent(this, Receiver::class.java)
+                    .setAction("$ACTION_INSTALL.${task.packageName}")
+                    .putExtra(EXTRA_CACHE_FILE_NAME, task.release.cacheFileName),
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+                .send()
+        } else showNotificationInstall(task)
     }
 
     private fun validatePackage(task: Task, file: File): ValidationError? {
@@ -436,7 +445,7 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe { result, throwable ->
                         currentTask = null
-                        throwable?.printStackTrace()
+                        throwable.printStackTrace()
                         if (result == null || !result.success) {
                             showNotificationError(
                                 task,

src/main/kotlin/com/looker/droidify/utility/Utils.kt

@@ -1,15 +1,31 @@
 package com.looker.droidify.utility
 
 import android.animation.ValueAnimator
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInfo
 import android.content.pm.Signature
 import android.graphics.drawable.Drawable
+import android.net.Uri
 import android.provider.Settings
+import android.util.Log
 import com.looker.droidify.R
+import com.looker.droidify.content.Cache
+import com.looker.droidify.content.Preferences
+import com.looker.droidify.entity.InstalledItem
+import com.looker.droidify.entity.Product
+import com.looker.droidify.entity.Repository
+import com.looker.droidify.service.Connection
+import com.looker.droidify.service.DownloadService
 import com.looker.droidify.utility.extension.android.Android
+import com.looker.droidify.utility.extension.android.singleSignature
+import com.looker.droidify.utility.extension.android.versionCodeCompat
 import com.looker.droidify.utility.extension.resources.getColorFromAttr
 import com.looker.droidify.utility.extension.resources.getDrawableCompat
 import com.looker.droidify.utility.extension.text.hex
+import com.topjohnwu.superuser.Shell
+import java.io.File
 import java.security.MessageDigest
 import java.security.cert.Certificate
 import java.security.cert.CertificateEncodingException
@@ -21,6 +37,11 @@ object Utils {
             .apply { setTintList(context.getColorFromAttr(tintAttrResId)) }
     }
 
+    fun PackageInfo.toInstalledItem(): InstalledItem {
+        val signatureString = singleSignature?.let(Utils::calculateHash).orEmpty()
+        return InstalledItem(packageName, versionName.orEmpty(), versionCodeCompat, signatureString)
+    }
+
     fun getDefaultApplicationIcons(context: Context): Pair<Drawable, Drawable> {
         val progressIcon: Drawable =
             createDefaultApplicationIcon(context, android.R.attr.textColorSecondary)
@@ -78,4 +99,92 @@ object Utils {
             ) != 0f
         }
     }
+
+    internal fun Activity.startPackageInstaller(cacheFileName: String) {
+        val file = Cache.getReleaseFile(this, cacheFileName)
+        if (Preferences[Preferences.Key.RootPermission]) {
+            val commandBuilder = StringBuilder()
+            val verifyState = getVerifyState()
+            if (verifyState == "1") commandBuilder.append("settings put global verifier_verify_adb_installs 0 ; ")
+            commandBuilder.append(getPackageInstallCommand(file))
+            commandBuilder.append(" ; settings put global verifier_verify_adb_installs $verifyState")
+            val result = Shell.su(commandBuilder.toString()).exec()
+            if (result.isSuccess) Shell.su("${getUtilBoxPath()} rm ${quote(file.absolutePath)}")
+        } else {
+            val (uri, flags) = if (Android.sdk(24)) {
+                Pair(
+                    Cache.getReleaseUri(this, cacheFileName),
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION
+                )
+            } else {
+                Pair(Uri.fromFile(file), 0)
+            }
+            // TODO Handle deprecation
+            @Suppress("DEPRECATION")
+            startActivity(
+                Intent(Intent.ACTION_INSTALL_PACKAGE)
+                    .setDataAndType(uri, "application/vnd.android.package-archive").setFlags(flags)
+            )
+        }
+    }
+
+    fun startUpdate(
+        packageName: String,
+        installedItem: InstalledItem?,
+        products: List<Pair<Product, Repository>>,
+        downloadConnection: Connection<DownloadService.Binder, DownloadService>
+    ) {
+        val productRepository = Product.findSuggested(products, installedItem) { it.first }
+        val compatibleReleases = productRepository?.first?.selectedReleases.orEmpty()
+            .filter { installedItem == null || installedItem.signature == it.signature }
+        val release = if (compatibleReleases.size >= 2) {
+            compatibleReleases
+                .filter { it.platforms.contains(Android.primaryPlatform) }
+                .minByOrNull { it.platforms.size }
+                ?: compatibleReleases.minByOrNull { it.platforms.size }
+                ?: compatibleReleases.firstOrNull()
+        } else {
+            compatibleReleases.firstOrNull()
+        }
+        val binder = downloadConnection.binder
+        if (productRepository != null && release != null && binder != null) {
+            binder.enqueue(
+                packageName,
+                productRepository.first.name,
+                productRepository.second,
+                release
+            )
+        } else Unit
+    }
+
+    private fun getPackageInstallCommand(cacheFile: File): String =
+        "cat \"${cacheFile.absolutePath}\" | pm install -t -r -S ${cacheFile.length()}"
+
+    private fun getVerifyState(): String =
+        Shell.sh("settings get global verifier_verify_adb_installs").exec().out[0]
+
+    private fun quote(string: String) =
+        "\"${string.replace(Regex("""[\\$"`]""")) { c -> "\\${c.value}" }}\""
+
+    private fun getUtilBoxPath(): String {
+        listOf("toybox", "busybox").forEach {
+            var shellResult = Shell.su("which $it").exec()
+            if (shellResult.out.isNotEmpty()) {
+                val utilBoxPath = shellResult.out.joinToString("")
+                if (utilBoxPath.isNotEmpty()) {
+                    val utilBoxQuoted = quote(utilBoxPath)
+                    shellResult = Shell.su("$utilBoxQuoted --version").exec()
+                    if (shellResult.out.isNotEmpty()) {
+                        val utilBoxVersion = shellResult.out.joinToString("")
+                        Log.i(
+                            this.javaClass.canonicalName,
+                            "Using Utilbox $it : $utilBoxQuoted $utilBoxVersion"
+                        )
+                    }
+                    return utilBoxQuoted
+                }
+            }
+        }
+        return ""
+    }
 }