shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: try fix #120

Browse Source
This commit is contained in:
WhiteChi 2023-12-02 23:55:48 +08:00
parent 6201d12f5f
commit 41dd1de8f8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/CardSvc.kt
View File

@ -109,7 +109,7 @@ internal object CardSvc: BaseSvc() {
val dataService = app val dataService = app
.getRuntimeService(IProfileDataService::class.java, "all") .getRuntimeService(IProfileDataService::class.java, "all")
val card = refreshCardLock.withLock { val card = refreshCardLock.withLock {
suspendCancellableCoroutine<Card?> { suspendCancellableCoroutine {
app.addObserver(object: ProfileCardObserver() { app.addObserver(object: ProfileCardObserver() {
override fun onGetProfileCard(success: Boolean, obj: Any) { override fun onGetProfileCard(success: Boolean, obj: Any) {
app.removeObserver(this) app.removeObserver(this)

11
xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/AntiDetection.kt
View File

@ -66,6 +66,8 @@ class AntiDetection: IAction {
} }
private fun antiFindPackage(context: Context) { private fun antiFindPackage(context: Context) {
if (isAntiFindPackage) return
val packageManager = context.packageManager val packageManager = context.packageManager
val applicationInfo = packageManager.getApplicationInfo("moe.fuqiuluo.shamrock", 0) val applicationInfo = packageManager.getApplicationInfo("moe.fuqiuluo.shamrock", 0)
val packageInfo = packageManager.getPackageInfo("moe.fuqiuluo.shamrock", 0) val packageInfo = packageManager.getPackageInfo("moe.fuqiuluo.shamrock", 0)
@ -74,7 +76,7 @@ class AntiDetection: IAction {
val packageName = it.args[0] as String val packageName = it.args[0] as String
if(packageName == "moe.fuqiuluo.shamrock") { if(packageName == "moe.fuqiuluo.shamrock") {
LogCenter.log("AntiDetection: 检测到对Shamrock的检测，欺骗PackageManager(GA)", Level.WARN) LogCenter.log("AntiDetection: 检测到对Shamrock的检测，欺骗PackageManager(GA)", Level.WARN)
it.throwable = PackageManager.NameNotFoundException() it.throwable = PackageManager.NameNotFoundException("Hided")
} else if (packageName == "moe.fuqiuluo.shamrock.hided") { } else if (packageName == "moe.fuqiuluo.shamrock.hided") {
it.result = applicationInfo it.result = applicationInfo
} }
@ -100,6 +102,8 @@ class AntiDetection: IAction {
} }
} }
} }
isAntiFindPackage = true
} }
private fun antiMemoryWalking() { private fun antiMemoryWalking() {
@ -205,4 +209,9 @@ class AntiDetection: IAction {
}.toTypedArray() }.toTypedArray()
} }
} }
companion object {
@JvmStatic
var isAntiFindPackage = false
}
} }