Revert "java: config: Limit clear keystore workaround for few affected apps"

This reverts commit 2185237267.

Signed-off-by: Dakkshesh <beakthoven@gmail.com>
This commit is contained in:
Dakkshesh
2025-09-03 10:37:53 +05:30
parent 2185237267
commit 77323fad91
2 changed files with 6 additions and 14 deletions
@@ -41,7 +41,7 @@ private fun initializeInterceptors() {
} }
private fun clearKeyStore() { private fun clearKeyStore() {
val targetUIDs = PkgConfig.getKSClearPackageUids() val targetUIDs = PkgConfig.getTargetPackageUids()
Logger.i("Clearing keystore for ${targetUIDs.size} target packages") Logger.i("Clearing keystore for ${targetUIDs.size} target packages")
targetUIDs.forEach { uid -> targetUIDs.forEach { uid ->
@@ -180,25 +180,17 @@ object PkgConfig {
return (hackPackages + generatePackages + packageModes.keys).toSet() return (hackPackages + generatePackages + packageModes.keys).toSet()
} }
fun getKSClearPackageUids(): Set<Int> { fun getTargetPackageUids(): Set<Int> {
val uids = mutableSetOf<Int>() val result = mutableSetOf<Int>()
val pm = getPm() ?: return emptySet() val pm = getPm() ?: return emptySet()
val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) 0L else 0 val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) 0L else 0
val userId = Process.myUid() / 100000 val userId = Process.myUid() / 100000
val detectorPackages = setOf( getTargetPackages().forEach { pkg ->
"io.github.vvb2060.keyattestation",
"io.github.vvb2060.mahoshojo",
"io.github.qwq233.keyattestation"
)
val KeyStoreClearPackages = getTargetPackages().intersect(detectorPackages)
KeyStoreClearPackages.forEach { pkg ->
kotlin.runCatching { kotlin.runCatching {
val appInfo = pm.getApplicationInfo(pkg, flags, userId) val appInfo = pm.getApplicationInfo(pkg, flags, userId)
if (appInfo != null) { if (appInfo != null) {
uids.add(appInfo.uid) result.add(appInfo.uid)
Logger.d("Got UID ${appInfo.uid} for package: $pkg") Logger.d("Got UID ${appInfo.uid} for package: $pkg")
} else { } else {
Logger.e("ApplicationInfo is null for package: $pkg") Logger.e("ApplicationInfo is null for package: $pkg")
@@ -208,7 +200,7 @@ object PkgConfig {
} }
} }
return uids return result
} }
@Volatile @Volatile