From 010c45da946c31e2a951c5fbb5825a655389be82 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 12 Dec 2024 11:27:11 -0500
Subject: [PATCH] Inline some paypal remote configs.

---
 .../components/settings/app/subscription/InAppDonations.kt | 7 ++++---
 .../java/org/thoughtcrime/securesms/util/RemoteConfig.kt   | 7 -------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppDonations.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppDonations.kt
index 464ac72985..41ae8c65eb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppDonations.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppDonations.kt
@@ -46,8 +46,9 @@ object InAppDonations {
   private fun isPayPalAvailableForDonateToSignalType(inAppPaymentType: InAppPaymentType): Boolean {
     return when (inAppPaymentType) {
       InAppPaymentType.UNKNOWN -> error("Unsupported type UNKNOWN")
-      InAppPaymentType.ONE_TIME_DONATION, InAppPaymentType.ONE_TIME_GIFT -> RemoteConfig.paypalOneTimeDonations
-      InAppPaymentType.RECURRING_DONATION -> RemoteConfig.paypalRecurringDonations
+      InAppPaymentType.ONE_TIME_DONATION -> true
+      InAppPaymentType.ONE_TIME_GIFT -> true
+      InAppPaymentType.RECURRING_DONATION -> true
       InAppPaymentType.RECURRING_BACKUP -> false
     } && !LocaleRemoteConfig.isPayPalDisabled()
   }
@@ -63,7 +64,7 @@ object InAppDonations {
    * Whether the user is in a region that supports PayPal, based off local phone number.
    */
   fun isPayPalAvailable(): Boolean {
-    return (RemoteConfig.paypalOneTimeDonations || RemoteConfig.paypalRecurringDonations) && !LocaleRemoteConfig.isPayPalDisabled()
+    return !LocaleRemoteConfig.isPayPalDisabled()
   }
 
   /**
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 be5b9685cf..4f6ee53b43 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -992,13 +992,6 @@ object RemoteConfig {
     hotSwappable = true
   )
 
-  /** Make CDSI lookups via libsignal-net instead of native websocket.  */
-  val useLibsignalNetForCdsiLookup: Boolean by remoteBoolean(
-    key = "android.cds.libsignal.4",
-    defaultValue = false,
-    hotSwappable = true
-  )
-
   /** The lifespan of a linked device (i.e. the time it can be inactive for before it expires), in milliseconds.  */
   @JvmStatic
   val linkedDeviceLifespan: Long by remoteValue(