From 374347da044746f3a6f72cea43d1bfd5440ae1a5 Mon Sep 17 00:00:00 2001
From: jeffrey-signal <jeffrey@signal.org>
Date: Mon, 9 Mar 2026 15:58:19 -0400
Subject: [PATCH] Inline the receive member labels feaure flag.

---
 .../groups/memberlabel/MemberLabelRepository.kt      | 12 ------------
 .../org/thoughtcrime/securesms/util/RemoteConfig.kt  |  9 ---------
 2 files changed, 21 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelRepository.kt
index 2715f9006b..74c6662586 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelRepository.kt
@@ -55,10 +55,6 @@ class MemberLabelRepository private constructor(
    */
   @WorkerThread
   fun getLabelSync(groupId: GroupId.V2, recipient: Recipient): MemberLabel? {
-    if (!RemoteConfig.receiveMemberLabels) {
-      return null
-    }
-
     val aci = recipient.serviceId.orNull() as? ServiceId.ACI ?: return null
     val groupRecord = groupsTable.getGroup(groupId).orNull() ?: return null
 
@@ -70,10 +66,6 @@ class MemberLabelRepository private constructor(
    */
   @WorkerThread
   fun getLabelsSync(groupId: GroupId.V2, recipients: Collection<Recipient>): Map<RecipientId, MemberLabel> {
-    if (!RemoteConfig.receiveMemberLabels) {
-      return emptyMap()
-    }
-
     val groupRecord = groupsTable.getGroup(groupId).orNull() ?: return emptyMap()
     val labelsByAci = groupRecord.requireV2GroupProperties().memberLabelsByAci()
 
@@ -131,10 +123,6 @@ class MemberLabelRepository private constructor(
    * Returns all group members who have labels set for the given group.
    */
   suspend fun getMembersWithLabels(groupId: GroupId.V2): List<GroupMemberWithLabel> = withContext(Dispatchers.IO) {
-    if (!RemoteConfig.receiveMemberLabels) {
-      return@withContext emptyList()
-    }
-
     val groupRecord = groupsTable.getGroup(groupId).orNull() ?: return@withContext emptyList()
     val groupProperties = groupRecord.requireV2GroupProperties()
 
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 22da18fc72..dbcec8f3a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -1278,15 +1278,6 @@ object RemoteConfig {
     hotSwappable = true
   )
 
-  /**
-   * Whether to receive and display group member labels.
-   */
-  val receiveMemberLabels: Boolean by remoteBoolean(
-    key = "android.receiveMemberLabels.2",
-    defaultValue = false,
-    hotSwappable = true
-  )
-
   /**
    * Whether to enable modifying group member labels.
    */