From 77323fad91ea3d76d7a29d70a7e12bd8351d51a7 Mon Sep 17 00:00:00 2001
From: Dakkshesh <beakthoven@gmail.com>
Date: Wed, 3 Sep 2025 10:37:53 +0530
Subject: [PATCH] Revert "java: config: Limit clear keystore workaround for few
 affected apps"

This reverts commit 218523726769dd1e0c7dc20d7b17a79d4b4bc725.

Signed-off-by: Dakkshesh <beakthoven@gmail.com>
---
 .../github/beakthoven/TrickyStoreOSS/Main.kt   |  2 +-
 .../beakthoven/TrickyStoreOSS/config/Config.kt | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/Main.kt b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/Main.kt
index dbde2ec..ba4c5c6 100644
--- a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/Main.kt
+++ b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/Main.kt
@@ -41,7 +41,7 @@ private fun initializeInterceptors() {
 }
 
 private fun clearKeyStore() {
-    val targetUIDs = PkgConfig.getKSClearPackageUids()
+    val targetUIDs = PkgConfig.getTargetPackageUids()
     Logger.i("Clearing keystore for ${targetUIDs.size} target packages")
 
     targetUIDs.forEach { uid ->
diff --git a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/config/Config.kt b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/config/Config.kt
index 7b68095..127359e 100644
--- a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/config/Config.kt
+++ b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/config/Config.kt
@@ -180,25 +180,17 @@ object PkgConfig {
         return (hackPackages + generatePackages + packageModes.keys).toSet()
     }
 
-    fun getKSClearPackageUids(): Set<Int> {
-        val uids = mutableSetOf<Int>()
+    fun getTargetPackageUids(): Set<Int> {
+        val result = mutableSetOf<Int>()
         val pm = getPm() ?: return emptySet()
         val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) 0L else 0
         val userId = Process.myUid() / 100000
 
-        val detectorPackages = setOf(
-            "io.github.vvb2060.keyattestation",
-            "io.github.vvb2060.mahoshojo",
-            "io.github.qwq233.keyattestation"
-        )
-
-        val KeyStoreClearPackages = getTargetPackages().intersect(detectorPackages)
-
-        KeyStoreClearPackages.forEach { pkg ->
+        getTargetPackages().forEach { pkg ->
             kotlin.runCatching {
                 val appInfo = pm.getApplicationInfo(pkg, flags, userId)
                 if (appInfo != null) {
-                    uids.add(appInfo.uid)
+                    result.add(appInfo.uid)
                     Logger.d("Got UID ${appInfo.uid} for package: $pkg")
                 } else {
                     Logger.e("ApplicationInfo is null for package: $pkg")
@@ -208,7 +200,7 @@ object PkgConfig {
             }
         }
 
-        return uids
+        return result
     }
 
     @Volatile