From dd565a11ea28213a759b30dcedf74bb7467576b5 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Mon, 8 Aug 2022 23:45:22 +0800 Subject: [PATCH] Fix outdated state --- app/src/main/java/com/topjohnwu/magisk/core/Info.kt | 5 +++-- .../main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt index 80b8e6d63..af1271c79 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt @@ -67,9 +67,10 @@ object Info { ) { val versionCode = when { code < Const.Version.MIN_VERCODE -> -1 - else -> if (isRooted) code else -1 + isRooted -> code + else -> -1 } val isUnsupported = code > 0 && code < Const.Version.MIN_VERCODE - val isActive = versionCode >= 0 + val isActive = versionCode > 0 } } diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt index 9dcb71f54..e20bf5f0f 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt @@ -43,6 +43,7 @@ class HomeViewModel( val magiskState get() = when { + Info.isRooted && Info.env.isUnsupported -> State.OUTDATED !Info.env.isActive -> State.INVALID Info.env.versionCode < BuildConfig.VERSION_CODE -> State.OUTDATED else -> State.UP_TO_DATE