From 1a4eabd074d2a95d54f0cc017b55b1d48631e7a8 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Wed, 12 Nov 2025 11:44:03 -0500
Subject: [PATCH] Enable sending of polls.

---
 .../main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt   | 2 +-
 .../signalservice/api/SignalServiceMessageSender.java           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
index a3069a9804..bc3fd5b69c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -1176,7 +1176,7 @@ object RemoteConfig {
   @JvmStatic
   @get:JvmName("polls")
   val polls: Boolean by remoteBoolean(
-    key = "android.polls",
+    key = "android.polls.2",
     defaultValue = false,
     hotSwappable = true
   )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
index 0bf2018b84..1fb1e05426 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
@@ -1259,6 +1259,7 @@ public class SignalServiceMessageSender {
                                                    .question(pollCreate.getQuestion())
                                                    .allowMultiple(pollCreate.getAllowMultiple())
                                                    .options(pollCreate.getOptions()).build());
+      builder.requiredProtocolVersion(Math.max(DataMessage.ProtocolVersion.POLLS.getValue(), builder.requiredProtocolVersion));
     }
 
     if (message.getPollVote().isPresent()) {