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 @@
Couldn\'t end poll
Check your connection and try again.
+
+ End poll?
+
+ Group members will no longer be able to vote in this poll.
New poll