2 files changed, 80 insertions, 85 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
index 739b26f99..181bd983a 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
@@ -34,7 +34,7 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
                when (val result = taskViewModel.result.value) {
                    is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG).show()
                    is MessageDialogFragment -> result.show(
-                        parentFragmentManager,
+                        requireActivity().supportFragmentManager,
                        MessageDialogFragment.TAG
                    )
                }
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
index 0721a5935..7d8e06ad8 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@@ -501,96 +501,91 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                var errorBaseGame = 0
                var errorExtension = 0
                var errorOther = 0
-                var errorTotal = 0
+                documents.forEach {
-                lifecycleScope.launch {
+                    when (NativeLibrary.installFileToNand(it.toString())) {
-                    documents.forEach {
+                        NativeLibrary.InstallFileToNandResult.Success -> {
-                        when (NativeLibrary.installFileToNand(it.toString())) {
+                            installSuccess += 1
-                            NativeLibrary.InstallFileToNandResult.Success -> {
-                                installSuccess += 1
-                            }
-                            NativeLibrary.InstallFileToNandResult.SuccessFileOverwritten -> {
-                                installOverwrite += 1
-                            }
-                            NativeLibrary.InstallFileToNandResult.ErrorBaseGame -> {
-                                errorBaseGame += 1
-                            }
-                            NativeLibrary.InstallFileToNandResult.ErrorFilenameExtension -> {
-                                errorExtension += 1
-                            }
-                            else -> {
-                                errorOther += 1
-                            }
                        }
-                    }
-                    withContext(Dispatchers.Main) {
+                        NativeLibrary.InstallFileToNandResult.SuccessFileOverwritten -> {
-                        val separator = System.getProperty("line.separator") ?: "\n"
+                            installOverwrite += 1
-                        val installResult = StringBuilder()
-                        if (installSuccess > 0) {
-                            installResult.append(
-                                getString(
-                                    R.string.install_game_content_success_install,
-                                    installSuccess
-                                )
-                            )
-                            installResult.append(separator)
                        }
-                        if (installOverwrite > 0) {
-                            installResult.append(
+                        NativeLibrary.InstallFileToNandResult.ErrorBaseGame -> {
-                                getString(
+                            errorBaseGame += 1
-                                    R.string.install_game_content_success_overwrite,
-                                    installOverwrite
-                                )
-                            )
-                            installResult.append(separator)
                        }
-                        errorTotal = errorBaseGame + errorExtension + errorOther
-                        if (errorTotal > 0) {
+                        NativeLibrary.InstallFileToNandResult.ErrorFilenameExtension -> {
-                            installResult.append(separator)
+                            errorExtension += 1
-                            installResult.append(
+                        }
-                                getString(
-                                    R.string.install_game_content_failed_count,
+                        else -> {
-                                    errorTotal
+                            errorOther += 1
-                                )
-                            )
-                            installResult.append(separator)
-                            if (errorBaseGame > 0) {
-                                installResult.append(separator)
-                                installResult.append(
-                                    getString(R.string.install_game_content_failure_base)
-                                )
-                                installResult.append(separator)
-                            }
-                            if (errorExtension > 0) {
-                                installResult.append(separator)
-                                installResult.append(
-                                    getString(R.string.install_game_content_failure_file_extension)
-                                )
-                                installResult.append(separator)
-                            }
-                            if (errorOther > 0) {
-                                installResult.append(
-                                    getString(R.string.install_game_content_failure_description)
-                                )
-                                installResult.append(separator)
-                            }
-                            MessageDialogFragment.newInstance(
-                                titleId = R.string.install_game_content_failure,
-                                descriptionString = installResult.toString().trim(),
-                                helpLinkId = R.string.install_game_content_help_link
-                            ).show(supportFragmentManager, MessageDialogFragment.TAG)
-                        } else {
-                            MessageDialogFragment.newInstance(
-                                titleId = R.string.install_game_content_success,
-                                descriptionString = installResult.toString().trim()
-                            ).show(supportFragmentManager, MessageDialogFragment.TAG)
                        }
                    }
                }
-                return@newInstance installSuccess + installOverwrite + errorTotal
+                val separator = System.getProperty("line.separator") ?: "\n"
+                val installResult = StringBuilder()
+                if (installSuccess > 0) {
+                    installResult.append(
+                        getString(
+                            R.string.install_game_content_success_install,
+                            installSuccess
+                        )
+                    )
+                    installResult.append(separator)
+                }
+                if (installOverwrite > 0) {
+                    installResult.append(
+                        getString(
+                            R.string.install_game_content_success_overwrite,
+                            installOverwrite
+                        )
+                    )
+                    installResult.append(separator)
+                }
+                val errorTotal: Int = errorBaseGame + errorExtension + errorOther
+                if (errorTotal > 0) {
+                    installResult.append(separator)
+                    installResult.append(
+                        getString(
+                            R.string.install_game_content_failed_count,
+                            errorTotal
+                        )
+                    )
+                    installResult.append(separator)
+                    if (errorBaseGame > 0) {
+                        installResult.append(separator)
+                        installResult.append(
+                            getString(R.string.install_game_content_failure_base)
+                        )
+                        installResult.append(separator)
+                    }
+                    if (errorExtension > 0) {
+                        installResult.append(separator)
+                        installResult.append(
+                            getString(R.string.install_game_content_failure_file_extension)
+                        )
+                        installResult.append(separator)
+                    }
+                    if (errorOther > 0) {
+                        installResult.append(
+                            getString(R.string.install_game_content_failure_description)
+                        )
+                        installResult.append(separator)
+                    }
+                    return@newInstance MessageDialogFragment.newInstance(
+                        titleId = R.string.install_game_content_failure,
+                        descriptionString = installResult.toString().trim(),
+                        helpLinkId = R.string.install_game_content_help_link
+                    )
+                } else {
+                    return@newInstance MessageDialogFragment.newInstance(
+                        titleId = R.string.install_game_content_success,
+                        descriptionString = installResult.toString().trim()
+                    )
+                }
            }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
        }
    }

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt index 739b26f99..181bd983a 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
@@ -34,7 +34,7 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
34	when (val result = taskViewModel.result.value) {	34	when (val result = taskViewModel.result.value) {
35	is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG).show()	35	is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG).show()
36	is MessageDialogFragment -> result.show(	36	is MessageDialogFragment -> result.show(
37	parentFragmentManager,	37	requireActivity().supportFragmentManager,
38	MessageDialogFragment.TAG	38	MessageDialogFragment.TAG
39	)	39	)
40	}	40	}


diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt index 0721a5935..7d8e06ad8 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@@ -501,96 +501,91 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
501	var errorBaseGame = 0	501	var errorBaseGame = 0
502	var errorExtension = 0	502	var errorExtension = 0
503	var errorOther = 0	503	var errorOther = 0
504	var errorTotal = 0	504	documents.forEach {
505	lifecycleScope.launch {	505	when (NativeLibrary.installFileToNand(it.toString())) {
506	documents.forEach {	506	NativeLibrary.InstallFileToNandResult.Success -> {
507	when (NativeLibrary.installFileToNand(it.toString())) {	507	installSuccess += 1
508	NativeLibrary.InstallFileToNandResult.Success -> {
509	installSuccess += 1
510	}
511
512	NativeLibrary.InstallFileToNandResult.SuccessFileOverwritten -> {
513	installOverwrite += 1
514	}
515
516	NativeLibrary.InstallFileToNandResult.ErrorBaseGame -> {
517	errorBaseGame += 1
518	}
519
520	NativeLibrary.InstallFileToNandResult.ErrorFilenameExtension -> {
521	errorExtension += 1
522	}
523
524	else -> {
525	errorOther += 1
526	}
527	}	508	}
528	}	509
529	withContext(Dispatchers.Main) {	510	NativeLibrary.InstallFileToNandResult.SuccessFileOverwritten -> {
530	val separator = System.getProperty("line.separator") ?: "\n"	511	installOverwrite += 1
531	val installResult = StringBuilder()
532	if (installSuccess > 0) {
533	installResult.append(
534	getString(
535	R.string.install_game_content_success_install,
536	installSuccess
537	)
538	)
539	installResult.append(separator)
540	}	512	}
541	if (installOverwrite > 0) {	513
542	installResult.append(	514	NativeLibrary.InstallFileToNandResult.ErrorBaseGame -> {
543	getString(	515	errorBaseGame += 1
544	R.string.install_game_content_success_overwrite,
545	installOverwrite
546	)
547	)
548	installResult.append(separator)
549	}	516	}
550	errorTotal = errorBaseGame + errorExtension + errorOther	517
551	if (errorTotal > 0) {	518	NativeLibrary.InstallFileToNandResult.ErrorFilenameExtension -> {
552	installResult.append(separator)	519	errorExtension += 1
553	installResult.append(	520	}
554	getString(	521
555	R.string.install_game_content_failed_count,	522	else -> {
556	errorTotal	523	errorOther += 1
557	)
558	)
559	installResult.append(separator)
560	if (errorBaseGame > 0) {
561	installResult.append(separator)
562	installResult.append(
563	getString(R.string.install_game_content_failure_base)
564	)
565	installResult.append(separator)
566	}
567	if (errorExtension > 0) {
568	installResult.append(separator)
569	installResult.append(
570	getString(R.string.install_game_content_failure_file_extension)
571	)
572	installResult.append(separator)
573	}
574	if (errorOther > 0) {
575	installResult.append(
576	getString(R.string.install_game_content_failure_description)
577	)
578	installResult.append(separator)
579	}
580	MessageDialogFragment.newInstance(
581	titleId = R.string.install_game_content_failure,
582	descriptionString = installResult.toString().trim(),
583	helpLinkId = R.string.install_game_content_help_link
584	).show(supportFragmentManager, MessageDialogFragment.TAG)
585	} else {
586	MessageDialogFragment.newInstance(
587	titleId = R.string.install_game_content_success,
588	descriptionString = installResult.toString().trim()
589	).show(supportFragmentManager, MessageDialogFragment.TAG)
590	}	524	}
591	}	525	}
592	}	526	}
593	return@newInstance installSuccess + installOverwrite + errorTotal	527
		528	val separator = System.getProperty("line.separator") ?: "\n"
		529	val installResult = StringBuilder()
		530	if (installSuccess > 0) {
		531	installResult.append(
		532	getString(
		533	R.string.install_game_content_success_install,
		534	installSuccess
		535	)
		536	)
		537	installResult.append(separator)
		538	}
		539	if (installOverwrite > 0) {
		540	installResult.append(
		541	getString(
		542	R.string.install_game_content_success_overwrite,
		543	installOverwrite
		544	)
		545	)
		546	installResult.append(separator)
		547	}
		548	val errorTotal: Int = errorBaseGame + errorExtension + errorOther
		549	if (errorTotal > 0) {
		550	installResult.append(separator)
		551	installResult.append(
		552	getString(
		553	R.string.install_game_content_failed_count,
		554	errorTotal
		555	)
		556	)
		557	installResult.append(separator)
		558	if (errorBaseGame > 0) {
		559	installResult.append(separator)
		560	installResult.append(
		561	getString(R.string.install_game_content_failure_base)
		562	)
		563	installResult.append(separator)
		564	}
		565	if (errorExtension > 0) {
		566	installResult.append(separator)
		567	installResult.append(
		568	getString(R.string.install_game_content_failure_file_extension)
		569	)
		570	installResult.append(separator)
		571	}
		572	if (errorOther > 0) {
		573	installResult.append(
		574	getString(R.string.install_game_content_failure_description)
		575	)
		576	installResult.append(separator)
		577	}
		578	return@newInstance MessageDialogFragment.newInstance(
		579	titleId = R.string.install_game_content_failure,
		580	descriptionString = installResult.toString().trim(),
		581	helpLinkId = R.string.install_game_content_help_link
		582	)
		583	} else {
		584	return@newInstance MessageDialogFragment.newInstance(
		585	titleId = R.string.install_game_content_success,
		586	descriptionString = installResult.toString().trim()
		587	)
		588	}
594	}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)	589	}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
595	}	590	}
596	}	591	}