Use ProgressDialog when restoring images

Close #3287
This commit is contained in:
topjohnwu 2020-10-08 00:27:07 -07:00
parent 317052604b
commit 6509e3d4f5

View File

@ -1,5 +1,6 @@
package com.topjohnwu.magisk.events.dialog package com.topjohnwu.magisk.events.dialog
import android.app.ProgressDialog
import android.widget.Toast import android.widget.Toast
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.Info import com.topjohnwu.magisk.core.Info
@ -17,8 +18,7 @@ class UninstallDialog : DialogEvent() {
.applyMessage(R.string.uninstall_magisk_msg) .applyMessage(R.string.uninstall_magisk_msg)
.applyButton(MagiskDialog.ButtonType.POSITIVE) { .applyButton(MagiskDialog.ButtonType.POSITIVE) {
titleRes = R.string.restore_img titleRes = R.string.restore_img
preventDismiss = true onClick { restore() }
onClick { restore(dialog) }
} }
if (Info.remote.uninstaller.link.isNotEmpty()) { if (Info.remote.uninstaller.link.isNotEmpty()) {
dialog.applyButton(MagiskDialog.ButtonType.NEGATIVE) { dialog.applyButton(MagiskDialog.ButtonType.NEGATIVE) {
@ -28,13 +28,12 @@ class UninstallDialog : DialogEvent() {
} }
} }
private fun restore(dialog: MagiskDialog) { @Suppress("DEPRECATION")
dialog.applyTitle(R.string.restore_img) private fun restore() {
.applyMessage(R.string.restore_img_msg) val dialog = ProgressDialog(dialog.context).apply {
.applyButton(MagiskDialog.ButtonType.POSITIVE) { setMessage(dialog.context.getString(R.string.restore_img_msg))
title = "" show()
} }
.cancellable(false)
Shell.su("restore_imgs").submit { result -> Shell.su("restore_imgs").submit { result ->
dialog.dismiss() dialog.dismiss()