Stop showing dialog when update available

This commit is contained in:
topjohnwu 2018-12-27 18:11:03 +08:00
parent 1d0b87246a
commit 58ba0b0b4e

View File

@ -111,8 +111,6 @@ public class MagiskFragment extends BaseFragment
@OnClick(R.id.install_button) @OnClick(R.id.install_button)
void install() { void install() {
shownDialog = true;
// Show Manager update first // Show Manager update first
if (Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) { if (Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
new ManagerInstallDialog((BaseActivity) requireActivity()).show(); new ManagerInstallDialog((BaseActivity) requireActivity()).show();
@ -267,15 +265,11 @@ public class MagiskFragment extends BaseFragment
magiskUpdateProgress.setVisibility(View.GONE); magiskUpdateProgress.setVisibility(View.GONE);
mSwipeRefreshLayout.setRefreshing(false); mSwipeRefreshLayout.setRefreshing(false);
if (!shownDialog) { if (!shownDialog && !ShellUtils.fastCmdResult("env_check")) {
if (Data.remoteMagiskVersionCode > Data.magiskVersionCode shownDialog = true;
|| Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
install();
} else if (!ShellUtils.fastCmdResult("env_check")) {
new EnvFixDialog(requireActivity()).show(); new EnvFixDialog(requireActivity()).show();
} }
} }
}
private void updateSafetyNetUI(int response) { private void updateSafetyNetUI(int response) {
safetyNetProgress.setVisibility(View.GONE); safetyNetProgress.setVisibility(View.GONE);