From e45a4476d3d11d5be546c16c8606d76408fafb97 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Wed, 8 Jul 2026 12:19:44 -0400
Subject: [PATCH] Turn on group search membership and disappearing calls.

---
 .../ConversationSettingsFragment.kt           | 20 ++++++++-----------
 .../securesms/database/MessageTable.kt        |  4 ++--
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
index 636131224f..e9adaa7aac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
@@ -851,18 +851,14 @@ class ConversationSettingsFragment :
             resources.getQuantityString(R.plurals.ContactSelectionListFragment_d_members, memberCount, memberCount)
           }
 
-          if (RemoteConfig.internalUser) {
-            sectionHeaderPref(
-              title = DSLSettingsText.from(memberHeaderText),
-              iconEnd = DSLSettingsIcon.from(CoreUiR.drawable.symbol_search_24),
-              onClick = {
-                val action = ConversationSettingsFragmentDirections.actionConversationSettingsFragmentToMemberSearchFragment(groupState.groupId, canAdd, groupState.groupLinkEnabled)
-                navController.safeNavigate(action)
-              }
-            )
-          } else {
-            sectionHeaderPref(DSLSettingsText.from(memberHeaderText))
-          }
+          sectionHeaderPref(
+            title = DSLSettingsText.from(memberHeaderText),
+            iconEnd = DSLSettingsIcon.from(CoreUiR.drawable.symbol_search_24),
+            onClick = {
+              val action = ConversationSettingsFragmentDirections.actionConversationSettingsFragmentToMemberSearchFragment(groupState.groupId, canAdd, groupState.groupLinkEnabled)
+              navController.safeNavigate(action)
+            }
+          )
         }
 
         if (canAdd) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
index 6138d8a717..c57d652eaa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -914,7 +914,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     val threadIdResult = threads.getOrCreateThreadIdResultFor(recipient.id, recipient.isGroup)
     val threadId = threadIdResult.threadId
     val dateReceived = System.currentTimeMillis()
-    val expiresIn = if (RemoteConfig.disappearMore) threads.getExpiresIn(threadId) else 0
+    val expiresIn = threads.getExpiresIn(threadId)
     val missed = MessageTypes.isMissedAudioCall(type) || MessageTypes.isMissedVideoCall(type)
 
     val values = contentValuesOf(
@@ -995,7 +995,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
   ): MessageId {
     val recipient = Recipient.resolved(groupRecipientId)
     val threadId = threads.getOrCreateThreadIdFor(recipient)
-    val expiresIn = if (RemoteConfig.disappearMore) recipient.expiresInSeconds.seconds.inWholeMilliseconds else 0
+    val expiresIn = recipient.expiresInSeconds.seconds.inWholeMilliseconds
     val messageId: MessageId = writableDatabase.withinTransaction { db ->
       val self = Recipient.self()
       val selfCreated = self.id == sender