ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13326 from nlebeck/taskviewmodel-mustrestartapp 

Eliminate TaskViewModel's `mustRestartApp` field
This commit is contained in:
Jordan Woyak 2025-02-20 21:58:18 -06:00 committed by GitHub
parent af064c57de 56fd1f39d8
commit 01099d67cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.kt
View File

@ -31,6 +31,7 @@ import java.io.IOException
import java.util.zip.ZipEntry
import java.util.zip.ZipInputStream
import java.util.zip.ZipOutputStream
import kotlin.system.exitProcess
class UserDataActivity : AppCompatActivity() {
private lateinit var taskViewModel: TaskViewModel
@ -180,7 +181,10 @@ class UserDataActivity : AppCompatActivity() {
if (!isDolphinUserDataBackup(source))
return R.string.user_data_import_invalid_file
taskViewModel.mustRestartApp = true
taskViewModel.onResultDismiss = {
// Restart the app to apply the imported user data.
exitProcess(0)
}
contentResolver.openInputStream(source).use { `is` ->
ZipInputStream(`is`).use { zis ->

7
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/UserDataImportWarningDialog.kt
View File

@ -12,7 +12,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
import org.dolphinemu.dolphinemu.R
import org.dolphinemu.dolphinemu.activities.UserDataActivity
import org.dolphinemu.dolphinemu.model.TaskViewModel
import kotlin.system.exitProcess
class UserDataImportWarningDialog : DialogFragment() {
private lateinit var taskViewModel: TaskViewModel
@ -37,12 +36,6 @@ class UserDataImportWarningDialog : DialogFragment() {
)
}
taskViewModel.onResultDismiss = {
if (taskViewModel.mustRestartApp) {
exitProcess(0)
}
}
val taskDialog = TaskDialog()
taskDialog.arguments = taskArguments
taskDialog.show(requireActivity().supportFragmentManager, TaskDialog.TAG)

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TaskViewModel.kt
View File

@ -38,7 +38,6 @@ class TaskViewModel : ViewModel() {
}
var cancelled = false
var mustRestartApp = false
private val state = MutableLiveData<State>(NotStartedState())
@ -57,7 +56,6 @@ class TaskViewModel : ViewModel() {
fun clear() {
state.value = NotStartedState()
cancelled = false
mustRestartApp = false
onResultDismiss = null
}