From bf5a21d5b2a262b9cbabfdedd697d5bf7d084fbf Mon Sep 17 00:00:00 2001
From: Olivier Lemasle <o.lemasle@gmail.com>
Date: Thu, 11 Jan 2024 03:30:32 +0100
Subject: [PATCH] fix(dialog): On Android, do not add a `Cancel` button to
 message dialogs (#873)

---
 .changes/dialog-message-android.md             |  5 +++++
 examples/api/src/views/Dialog.svelte           | 18 +++++++++++++++++-
 .../android/src/main/java/DialogPlugin.kt      | 12 ++++++------
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 .changes/dialog-message-android.md

diff --git a/.changes/dialog-message-android.md b/.changes/dialog-message-android.md
new file mode 100644
index 000000000..920d7a4c4
--- /dev/null
+++ b/.changes/dialog-message-android.md
@@ -0,0 +1,5 @@
+---
+"dialog": "patch"
+---
+
+On Android, do not add a `Cancel` button to message dialogs.
diff --git a/examples/api/src/views/Dialog.svelte b/examples/api/src/views/Dialog.svelte
index 40df54031..3e594c90b 100644
--- a/examples/api/src/views/Dialog.svelte
+++ b/examples/api/src/views/Dialog.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { open, save, confirm } from "@tauri-apps/plugin-dialog";
+  import { open, save, confirm, message } from "@tauri-apps/plugin-dialog";
   import { readFile } from "@tauri-apps/plugin-fs";
 
   export let onMessage;
@@ -22,6 +22,16 @@
   }
 
   async function prompt() {
+    confirm("Do you want to do something?")
+      .then((res) =>
+        onMessage(
+          res ? "Yes" : "No"
+        )
+      )
+      .catch(onMessage);
+  }
+
+  async function promptCustom() {
     confirm("Is Tauri awesome?", {
       okLabel: "Absolutely",
       cancelLabel: "Totally",
@@ -34,6 +44,10 @@
       .catch(onMessage);
   }
 
+  async function msg() {
+    await message("Tauri is awesome!");
+  }
+
   function openDialog() {
     open({
       title: "My wonderful open dialog",
@@ -130,3 +144,5 @@
   >Open save dialog</button
 >
 <button class="btn" id="prompt-dialog" on:click={prompt}>Prompt</button>
+<button class="btn" id="custom-prompt-dialog" on:click={promptCustom}>Prompt (custom)</button>
+<button class="btn" id="message-dialog" on:click={msg}>Message</button>
diff --git a/plugins/dialog/android/src/main/java/DialogPlugin.kt b/plugins/dialog/android/src/main/java/DialogPlugin.kt
index c4dfdcfba..462e22bb3 100644
--- a/plugins/dialog/android/src/main/java/DialogPlugin.kt
+++ b/plugins/dialog/android/src/main/java/DialogPlugin.kt
@@ -190,16 +190,16 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
             dialog.dismiss()
             handler(false, true)
           }
-          .setNegativeButton(
-            args.cancelButtonLabel ?: "Cancel"
-          ) { dialog, _ ->
-            dialog.dismiss()
-            handler(false, false)
-          }
           .setOnCancelListener { dialog ->
             dialog.dismiss()
             handler(true, false)
           }
+        if (args.cancelButtonLabel != null) {
+          builder.setNegativeButton( args.cancelButtonLabel) { dialog, _ ->
+            dialog.dismiss()
+            handler(false, false)
+          }
+        }
         val dialog = builder.create()
         dialog.show()
       }