From 3f81f9371f96e76f22796d550f24ee51f9f89b2e Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Tue, 1 Dec 2020 01:17:10 +0800 Subject: [PATCH] Disable installation while downloading metadata --- .../topjohnwu/magisk/ui/home/HomeViewModel.kt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 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 eb68ee22a..6fe01794a 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 @@ -125,14 +125,18 @@ class HomeViewModel( fun onDeletePressed() = UninstallDialog().publish() - fun onManagerPressed() = - if (isConnected.get()) ManagerInstallDialog().publish() - else SnackbarEvent(R.string.no_connection).publish() + fun onManagerPressed() = when (state) { + State.LOADED -> ManagerInstallDialog().publish() + State.LOADING -> SnackbarEvent(R.string.loading).publish() + else -> SnackbarEvent(R.string.no_connection).publish() + } - fun onMagiskPressed() = if (isConnected.get()) withExternalRW { - HomeFragmentDirections.actionHomeFragmentToInstallFragment().publish() - } else { - SnackbarEvent(R.string.no_connection).publish() + fun onMagiskPressed() = when (state) { + State.LOADED -> withExternalRW { + HomeFragmentDirections.actionHomeFragmentToInstallFragment().publish() + } + State.LOADING -> SnackbarEvent(R.string.loading).publish() + else -> SnackbarEvent(R.string.no_connection).publish() } fun onSafetyNetPressed() =