From c50daa5c9e1201fcdaf20f50f8522760cc638a90 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Tue, 1 Dec 2020 00:58:09 +0800 Subject: [PATCH] Allow restore boot when no network --- .../java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 b244f5a44..13430ca65 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 @@ -68,8 +68,7 @@ class HomeViewModel( set(value) = set(value, field, { field = it }, BR.stateManagerProgress) @get:Bindable - val showUninstall get() = - Info.env.magiskVersionCode > 0 && stateMagisk != MagiskState.LOADING && isConnected.get() + val showUninstall get() = Info.env.isActive && state != State.LOADING @get:Bindable val showSafetyNet get() = Info.hasGMS && isConnected.get() @@ -82,8 +81,6 @@ class HomeViewModel( override fun refresh() = viewModelScope.launch { state = State.LOADING - notifyPropertyChanged(BR.showUninstall) - notifyPropertyChanged(BR.showSafetyNet) svc.fetchUpdate()?.apply { state = State.LOADED stateMagisk = when { @@ -107,6 +104,8 @@ class HomeViewModel( ensureEnv() } } ?: apply { state = State.LOADING_FAILED } + notifyPropertyChanged(BR.showUninstall) + notifyPropertyChanged(BR.showSafetyNet) } val showTest = false