Fully Implement Silent Installation

Automated Code Formatting

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()
         }