From 86fc1e5b3230621f82a0a0c4813c6da1e537e036 Mon Sep 17 00:00:00 2001
From: t895 <clombardo169@gmail.com>
Date: Tue, 13 Feb 2024 13:44:35 -0500
Subject: [PATCH 1/3] android: Swap ok and close default strings for
 MessageDialogFragment

---
 .../org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
index 685df0d59b..c370964e11 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
@@ -42,9 +42,9 @@ class MessageDialogFragment : DialogFragment() {
         } else if (positiveButtonString.isNotEmpty()) {
             positiveButtonString
         } else if (messageDialogViewModel.positiveAction != null) {
-            getString(R.string.close)
-        } else {
             getString(android.R.string.ok)
+        } else {
+            getString(R.string.close)
         }
 
         val negativeButtonId = requireArguments().getInt(NEGATIVE_BUTTON_TITLE_ID)
@@ -131,7 +131,7 @@ class MessageDialogFragment : DialogFragment() {
          * @param positiveButtonTitleId String resource ID that will be used for the positive button.
          * [positiveButtonTitleString] used if 0.
          * @param positiveButtonTitleString String that will be used for the positive button.
-         * android.R.string.ok used if empty. android.R.string.close will be used if [positiveAction]
+         * android.R.string.close used if empty. android.R.string.ok will be used if [positiveAction]
          * is not null.
          * @param positiveAction Lambda to run when the positive button is clicked.
          * @param showNegativeButton Normally the negative button isn't shown if there is no

From 10ba318807c673fd3b0e624015c184d770cdc966 Mon Sep 17 00:00:00 2001
From: t895 <clombardo169@gmail.com>
Date: Tue, 13 Feb 2024 13:45:17 -0500
Subject: [PATCH 2/3] android: Show cancel option for delete addons dialog

---
 .../main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
index f5647fa955..ae09d50060 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
@@ -119,7 +119,8 @@ class AddonsFragment : Fragment() {
                                 requireActivity(),
                                 titleId = R.string.confirm_uninstall,
                                 descriptionId = R.string.confirm_uninstall_description,
-                                positiveAction = { addonViewModel.onDeleteAddon(it) }
+                                positiveAction = { addonViewModel.onDeleteAddon(it) },
+                                negativeAction = {}
                             ).show(parentFragmentManager, MessageDialogFragment.TAG)
                             addonViewModel.setAddonToDelete(null)
                         }

From f813dc78b2ada097444380fc05195907cc91bdfa Mon Sep 17 00:00:00 2001
From: t895 <clombardo169@gmail.com>
Date: Tue, 13 Feb 2024 13:46:14 -0500
Subject: [PATCH 3/3] android: Prevent user from dismissing mod/cheat notice

Makes sure that a user can't miss this dialog by touching outside the window. They must press "OK" or "Close" to continue.
---
 .../main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
index ae09d50060..872553ac43 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
@@ -104,7 +104,10 @@ class AddonsFragment : Fragment() {
                                 requireActivity(),
                                 titleId = R.string.addon_notice,
                                 descriptionId = R.string.addon_notice_description,
-                                positiveAction = { addonViewModel.showModInstallPicker(true) }
+                                dismissible = false,
+                                positiveAction = { addonViewModel.showModInstallPicker(true) },
+                                negativeAction = {},
+                                negativeButtonTitleId = R.string.close
                             ).show(parentFragmentManager, MessageDialogFragment.TAG)
                             addonViewModel.showModNoticeDialog(false)
                         }