perf: highlight uninstalled apps in Apps

aistra0528 · Jul 21, 2024 · 17cae83 · 17cae83
1 parent c619809
commit 17cae83
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/app/src/main/kotlin/com/aistra/hail/app/AppInfo.kt b/app/src/main/kotlin/com/aistra/hail/app/AppInfo.kt
@@ -13,9 +13,9 @@ class AppInfo(
     val applicationInfo: ApplicationInfo? get() = HPackages.getApplicationInfoOrNull(packageName)
     val name get() = applicationInfo?.loadLabel(app.packageManager) ?: packageName
 
-    var state: Int = STATE_UNKNOWN
+    var state: Int = STATE_NOT_FOUND
     fun getCurrentState(): Int = when {
-        applicationInfo == null -> STATE_UNKNOWN
+        applicationInfo == null -> STATE_NOT_FOUND
         AppManager.isAppFrozen(packageName) -> STATE_FROZEN
         else -> STATE_UNFROZEN
     }
@@ -26,7 +26,7 @@ class AppInfo(
     override fun hashCode(): Int = packageName.hashCode()
 
     companion object {
-        const val STATE_UNKNOWN = 0
+        const val STATE_NOT_FOUND = 0
         const val STATE_UNFROZEN = 1
         const val STATE_FROZEN = 2
     }

diff --git a/app/src/main/kotlin/com/aistra/hail/ui/apps/AppsAdapter.kt b/app/src/main/kotlin/com/aistra/hail/ui/apps/AppsAdapter.kt
@@ -7,6 +7,7 @@ import android.widget.CompoundButton
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import com.aistra.hail.R
 import com.aistra.hail.app.AppManager
 import com.aistra.hail.app.HailData
 import com.aistra.hail.databinding.ItemAppsBinding
@@ -22,9 +23,8 @@ class AppsAdapter : ListAdapter<ApplicationInfo, AppsAdapter.ViewHolder>(DIFF) {
                 oldItem: ApplicationInfo, newItem: ApplicationInfo
             ): Boolean = oldItem.packageName == newItem.packageName
 
-            override fun areContentsTheSame(
-                oldItem: ApplicationInfo, newItem: ApplicationInfo
-            ): Boolean = areItemsTheSame(oldItem, newItem)
+            override fun areContentsTheSame(oldItem: ApplicationInfo, newItem: ApplicationInfo): Boolean =
+                oldItem.flags and ApplicationInfo.FLAG_INSTALLED == newItem.flags and ApplicationInfo.FLAG_INSTALLED
         }
     }
 
@@ -78,6 +78,8 @@ class AppsAdapter : ListAdapter<ApplicationInfo, AppsAdapter.ViewHolder>(DIFF) {
                 val name = info.loadLabel(context.packageManager)
                 text = if (!HailData.grayscaleIcon && frozen) "❄️$name" else name
                 isEnabled = !HailData.grayscaleIcon || !frozen
+                if (HPackages.isAppUninstalled(pkg)) setTextColor(context.getColorStateList(R.color.color_warn))
+                else setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodyMedium)
             }
             binding.appDesc.apply {
                 text = pkg

diff --git a/app/src/main/kotlin/com/aistra/hail/ui/apps/AppsFragment.kt b/app/src/main/kotlin/com/aistra/hail/ui/apps/AppsFragment.kt
@@ -155,7 +155,11 @@ class AppsFragment : MainFragment(), AppsAdapter.OnItemClickListener, AppsAdapte
 
             R.id.action_extract_apk -> extractApk(pkg)
             R.id.action_uninstall -> uninstallApp(name, pkg)
-            R.id.action_reinstall -> if (!AppManager.reinstallApp(pkg)) HUI.showToast(R.string.operation_failed, name)
+            R.id.action_reinstall -> {
+                if (AppManager.reinstallApp(pkg)) updateAppList()
+                else HUI.showToast(R.string.operation_failed, name)
+            }
+
             else -> return super.onContextItemSelected(item)
         }
         return true
@@ -168,9 +172,7 @@ class AppsFragment : MainFragment(), AppsAdapter.OnItemClickListener, AppsAdapte
 
     private fun uninstallApp(name: CharSequence, pkg: String) {
         when {
-            HPackages.getApplicationInfoOrNull(
-                pkg, 0
-            ) == null && !HPackages.isAppHidden(pkg) -> HUI.showToast(R.string.app_not_installed)
+            HPackages.isAppUninstalled(pkg) -> HUI.showToast(R.string.app_not_installed)
 
             pkg == app.packageName -> {
                 when {

diff --git a/app/src/main/kotlin/com/aistra/hail/ui/home/PagerAdapter.kt b/app/src/main/kotlin/com/aistra/hail/ui/home/PagerAdapter.kt
@@ -60,7 +60,7 @@ class PagerAdapter(private val selectedList: List<AppInfo>) :
                         MaterialColors.getColor(this, androidx.appcompat.R.attr.colorPrimary)
                     )
 
-                    info.state == AppInfo.STATE_UNKNOWN -> setTextColor(context.getColorStateList(R.color.color_warn))
+                    info.state == AppInfo.STATE_NOT_FOUND -> setTextColor(context.getColorStateList(R.color.color_warn))
                     else -> setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_BodyMedium)
                 }
                 setTextSize(TypedValue.COMPLEX_UNIT_SP, HailData.homeFontSize.toFloat())

diff --git a/app/src/main/kotlin/com/aistra/hail/utils/HPackages.kt b/app/src/main/kotlin/com/aistra/hail/utils/HPackages.kt
@@ -63,6 +63,10 @@ object HPackages {
         }
     } ?: false
 
+    fun isAppUninstalled(packageName: String): Boolean =
+        getApplicationInfoOrNull(packageName)?.run { flags and ApplicationInfo.FLAG_INSTALLED != ApplicationInfo.FLAG_INSTALLED }
+            ?: true
+
     fun isPrivilegedApp(packageName: String): Boolean = getApplicationInfoOrNull(packageName)?.let {
         (ApplicationInfo::class.java.getField("privateFlags").get(it) as Int) and 8 == 8
     } ?: false

diff --git a/app/src/main/kotlin/com/aistra/hail/utils/HShizuku.kt b/app/src/main/kotlin/com/aistra/hail/utils/HShizuku.kt
@@ -227,24 +227,14 @@ object HShizuku {
                 ).intentSender
             )
             true
-        } else if (HTarget.Q) {
-            val pm = asInterface("android.content.pm.IPackageManager", "package")
-            HiddenApiBypass.invoke(
-                pm::class.java, pm, "setSystemAppInstallState", packageName, false, HPackages.myUserId
-            ) as Boolean
         } else execute("pm uninstall --user current $packageName").first == 0
     }.getOrElse {
         HLog.e(it)
         false
     }
 
     fun reinstallApp(packageName: String): Boolean = runCatching {
-        if (HTarget.Q && !HPackages.canUninstallNormally(packageName)) {
-            val pm = asInterface("android.content.pm.IPackageManager", "package")
-            HiddenApiBypass.invoke(
-                pm::class.java, pm, "setSystemAppInstallState", packageName, true, HPackages.myUserId
-            ) as Boolean
-        } else execute("pm install-existing --user current $packageName").first == 0
+        execute("pm install-existing --user current $packageName").first == 0
     }.getOrElse {
         HLog.e(it)
         false