From 800155e5a68ffc1cbac502bbe0f8031e24d331f1 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Tue, 4 Nov 2025 16:58:28 -0500
Subject: [PATCH] Add confirmation check before ending a poll.

---
 .../conversation/v2/ConversationFragment.kt   | 31 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  4 +++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 8b49988b92..dc4ece4ba0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -2663,19 +2663,26 @@ class ConversationFragment :
       return
     }
 
-    val endPoll = viewModel.endPoll(pollId)
+    MaterialAlertDialogBuilder(requireContext())
+      .setTitle(getString(R.string.Poll__end_poll_title))
+      .setMessage(getString(R.string.Poll__end_poll_body))
+      .setPositiveButton(R.string.Poll__end_poll) { _, _ ->
+        val endPoll = viewModel.endPoll(pollId)
 
-    disposables += endPoll
-      .subscribeBy(
-        onError = {
-          Log.w(TAG, "Error received during poll end!", it)
-          MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.Poll__couldnt_end_poll)
-            .setMessage(getString(R.string.Poll__check_connection))
-            .setPositiveButton(android.R.string.ok) { dialog: DialogInterface?, which: Int -> dialog!!.dismiss() }
-            .show()
-        }
-      )
+        disposables += endPoll
+          .subscribeBy(
+            onError = {
+              Log.w(TAG, "Error received during poll end!", it)
+              MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.Poll__couldnt_end_poll)
+                .setMessage(getString(R.string.Poll__check_connection))
+                .setPositiveButton(android.R.string.ok) { dialog: DialogInterface?, which: Int -> dialog!!.dismiss() }
+                .show()
+            }
+          )
+      }
+      .setNegativeButton(android.R.string.cancel) { _, _ -> }
+      .show()
   }
 
   private inner class SwipeAvailabilityProvider : ConversationItemSwipeCallback.SwipeAvailabilityProvider {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e917e872e4..e309b822cd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8869,6 +8869,10 @@
     <string name="Poll__couldnt_end_poll">Couldn\'t end poll</string>
     <!-- Dialog body when a poll fails to end and to try again -->
     <string name="Poll__check_connection">Check your connection and try again.</string>
+    <!-- Dialog title when you go to end a poll -->
+    <string name="Poll__end_poll_title">End poll?</string>
+    <!-- Dialog body when you go to end a poll -->
+    <string name="Poll__end_poll_body">Group members will no longer be able to vote in this poll.</string>
     <!-- Header when creating a new poll -->
     <string name="CreatePollFragment__new_poll">New poll</string>
     <!-- Section text to enter in a question for a poll  -->