From 262b359c3fb892499231101c7da687bb423972a2 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 16 Oct 2024 15:41:08 -0400
Subject: [PATCH] Inline the call links feature flag.

---
 .../securesms/WebRtcCallActivity.java           |  4 ----
 .../securesms/calls/log/CallLogFragment.kt      | 17 ++---------------
 .../calls/log/CallLogPagedDataSource.kt         |  3 +--
 .../thoughtcrime/securesms/util/RemoteConfig.kt | 11 -----------
 4 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
index 32898c6e31..9e4609ed66 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -412,10 +412,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   private void initializePendingParticipantFragmentListener() {
-    if (!RemoteConfig.adHocCalling()) {
-      return;
-    }
-
     getSupportFragmentManager().setFragmentResultListener(
         PendingParticipantsBottomSheet.REQUEST_KEY,
         this,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt
index aaaa90b57a..8e954c6b9a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt
@@ -63,7 +63,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTab
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.doAfterNextLayout
 import org.thoughtcrime.securesms.util.fragments.requireListener
@@ -259,13 +258,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
     val count = callLogActionMode.getCount()
     MaterialAlertDialogBuilder(requireContext())
       .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, count, count))
-      .setMessage(
-        if (RemoteConfig.adHocCalling) {
-          getString(R.string.CallLogFragment__call_links_youve_created)
-        } else {
-          null
-        }
-      )
+      .setMessage(getString(R.string.CallLogFragment__call_links_youve_created))
       .setPositiveButton(R.string.CallLogFragment__delete) { _, _ ->
         performDeletion(count, viewModel.stageSelectionDeletion())
         callLogActionMode.end()
@@ -416,13 +409,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
   override fun deleteCall(call: CallLogRow) {
     MaterialAlertDialogBuilder(requireContext())
       .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, 1, 1))
-      .setMessage(
-        if (RemoteConfig.adHocCalling) {
-          getString(R.string.CallLogFragment__call_links_youve_created)
-        } else {
-          null
-        }
-      )
+      .setMessage(getString(R.string.CallLogFragment__call_links_youve_created))
       .setPositiveButton(R.string.CallLogFragment__delete) { _, _ ->
         performDeletion(1, viewModel.stageCallDeletion(call))
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
index 635ce62046..8409cbe7ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.calls.log
 
 import org.signal.paging.PagedDataSource
-import org.thoughtcrime.securesms.util.RemoteConfig
 
 class CallLogPagedDataSource(
   private val query: String?,
@@ -10,7 +9,7 @@ class CallLogPagedDataSource(
 ) : PagedDataSource<CallLogRow.Id, CallLogRow> {
 
   private val hasFilter = filter == CallLogFilter.MISSED
-  private val hasCallLinkRow = RemoteConfig.adHocCalling && filter == CallLogFilter.ALL && query.isNullOrEmpty()
+  private val hasCallLinkRow = filter == CallLogFilter.ALL && query.isNullOrEmpty()
 
   private var callEventsCount = 0
   private var callLinksCount = 0
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 88cf8f9d1e..2bfc9f6442 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -846,17 +846,6 @@ object RemoteConfig {
     sticky = true
   )
 
-  /**
-   * Whether or not ad-hoc calling is enabled
-   */
-  @JvmStatic
-  @get:JvmName("adHocCalling")
-  val adHocCalling: Boolean by remoteBoolean(
-    key = "android.calling.ad.hoc.3",
-    defaultValue = false,
-    hotSwappable = false
-  )
-
   /** Maximum number of attachments allowed to be sent/received.  */
   val maxAttachmentCount: Int by remoteInt(
     key = "android.attachments.maxCount",