diff --git a/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java b/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java index ac5529c0..588ed99c 100644 --- a/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java +++ b/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java @@ -12,6 +12,7 @@ import org.autojs.autojs.network.VersionService; import org.autojs.autojs.network.entity.VersionInfo; import org.autojs.autojs.tool.SimpleObserver; +import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.functions.Consumer; /** @@ -39,6 +40,7 @@ public class VersionGuard { private void checkForUpdatesIfNeeded() { mVersionService.checkForUpdatesIfNeededAndUsingWifi(mActivity) + .observeOn(AndroidSchedulers.mainThread()) .subscribe(new SimpleObserver() { @Override @@ -76,23 +78,15 @@ public class VersionGuard { .negativeText(R.string.text_exit) .cancelable(false) .autoDismiss(false) - .onAny(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { - if (which == DialogAction.POSITIVE) { - new UpdateCheckDialog(mActivity) - .show(); - } else { - mActivity.finish(); - } - } - }) - .dismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - mDeprecatedDialog = null; + .onAny((dialog, which) -> { + if (which == DialogAction.POSITIVE) { + new UpdateCheckDialog(mActivity) + .show(); + } else { + mActivity.finish(); } }) + .dismissListener(dialog -> mDeprecatedDialog = null) .show(); } }