mirror of
https://github.com/topjohnwu/Magisk.git
synced 2025-04-24 13:31:43 +00:00
Show confirmation dialog before restore app
This commit is contained in:
parent
47545b45b8
commit
454e5dfc5d
app/src/main
java/com/topjohnwu/magisk
res
@ -136,6 +136,7 @@ object HideAPK {
|
|||||||
val dialog = android.app.ProgressDialog(activity).apply {
|
val dialog = android.app.ProgressDialog(activity).apply {
|
||||||
setTitle(activity.getString(R.string.hide_app_title))
|
setTitle(activity.getString(R.string.hide_app_title))
|
||||||
isIndeterminate = true
|
isIndeterminate = true
|
||||||
|
setCancelable(false)
|
||||||
show()
|
show()
|
||||||
}
|
}
|
||||||
val result = withContext(Dispatchers.IO) {
|
val result = withContext(Dispatchers.IO) {
|
||||||
@ -152,6 +153,7 @@ object HideAPK {
|
|||||||
val dialog = android.app.ProgressDialog(activity).apply {
|
val dialog = android.app.ProgressDialog(activity).apply {
|
||||||
setTitle(activity.getString(R.string.restore_img_msg))
|
setTitle(activity.getString(R.string.restore_img_msg))
|
||||||
isIndeterminate = true
|
isIndeterminate = true
|
||||||
|
setCancelable(false)
|
||||||
show()
|
show()
|
||||||
}
|
}
|
||||||
val apk = DynAPK.current(activity)
|
val apk = DynAPK.current(activity)
|
||||||
|
@ -0,0 +1,22 @@
|
|||||||
|
package com.topjohnwu.magisk.events.dialog
|
||||||
|
|
||||||
|
import com.topjohnwu.magisk.R
|
||||||
|
import com.topjohnwu.magisk.core.tasks.HideAPK
|
||||||
|
import com.topjohnwu.magisk.view.MagiskDialog
|
||||||
|
|
||||||
|
class RestoreAppDialog : DialogEvent() {
|
||||||
|
override fun build(dialog: MagiskDialog) {
|
||||||
|
dialog.apply {
|
||||||
|
setTitle(R.string.settings_restore_app_title)
|
||||||
|
setMessage(R.string.restore_app_confirmation)
|
||||||
|
setButton(MagiskDialog.ButtonType.POSITIVE) {
|
||||||
|
text = R.string.yes
|
||||||
|
onClick { HideAPK.restore(dialog.ownerActivity!!) }
|
||||||
|
}
|
||||||
|
setButton(MagiskDialog.ButtonType.NEGATIVE) {
|
||||||
|
text = R.string.no
|
||||||
|
}
|
||||||
|
setCancelable(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -20,6 +20,7 @@ import com.topjohnwu.magisk.events.AddHomeIconEvent
|
|||||||
import com.topjohnwu.magisk.events.RecreateEvent
|
import com.topjohnwu.magisk.events.RecreateEvent
|
||||||
import com.topjohnwu.magisk.events.SnackbarEvent
|
import com.topjohnwu.magisk.events.SnackbarEvent
|
||||||
import com.topjohnwu.magisk.events.dialog.BiometricEvent
|
import com.topjohnwu.magisk.events.dialog.BiometricEvent
|
||||||
|
import com.topjohnwu.magisk.events.dialog.RestoreAppDialog
|
||||||
import com.topjohnwu.magisk.ktx.activity
|
import com.topjohnwu.magisk.ktx.activity
|
||||||
import com.topjohnwu.magisk.utils.Utils
|
import com.topjohnwu.magisk.utils.Utils
|
||||||
import com.topjohnwu.superuser.Shell
|
import com.topjohnwu.superuser.Shell
|
||||||
@ -104,7 +105,7 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Callback {
|
|||||||
is DenyListConfig ->
|
is DenyListConfig ->
|
||||||
SettingsFragmentDirections.actionSettingsFragmentToDenyFragment().navigate()
|
SettingsFragmentDirections.actionSettingsFragmentToDenyFragment().navigate()
|
||||||
is SystemlessHosts -> createHosts()
|
is SystemlessHosts -> createHosts()
|
||||||
is Restore -> HideAPK.restore(view.activity)
|
is Restore -> RestoreAppDialog().publish()
|
||||||
is AddShortcut -> AddHomeIconEvent().publish()
|
is AddShortcut -> AddHomeIconEvent().publish()
|
||||||
else -> callback()
|
else -> callback()
|
||||||
}
|
}
|
||||||
|
@ -229,5 +229,6 @@
|
|||||||
<string name="add_shortcut_msg">隐藏后应用的名字和图标可能难以识别。需要在桌面上添加具有原始名称和图标的快捷方式吗?</string>
|
<string name="add_shortcut_msg">隐藏后应用的名字和图标可能难以识别。需要在桌面上添加具有原始名称和图标的快捷方式吗?</string>
|
||||||
<string name="app_not_found">找不到可处理此操作的应用</string>
|
<string name="app_not_found">找不到可处理此操作的应用</string>
|
||||||
<string name="reboot_apply_change">重启后生效</string>
|
<string name="reboot_apply_change">重启后生效</string>
|
||||||
|
<string name="restore_app_confirmation">即将把隐藏的 Magisk 应用恢复回原始应用,是否继续?</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -229,5 +229,6 @@
|
|||||||
<string name="add_shortcut_msg">After hiding this app, its name and icon might become difficult to recognize. Do you want to add a pretty shortcut to the home screen?</string>
|
<string name="add_shortcut_msg">After hiding this app, its name and icon might become difficult to recognize. Do you want to add a pretty shortcut to the home screen?</string>
|
||||||
<string name="app_not_found">No app found to handle this action</string>
|
<string name="app_not_found">No app found to handle this action</string>
|
||||||
<string name="reboot_apply_change">Reboot to apply changes</string>
|
<string name="reboot_apply_change">Reboot to apply changes</string>
|
||||||
|
<string name="restore_app_confirmation">This will restore the hidden app back to the original app. Do you really want to do this?</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user