empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Inline some paypal remote configs.

Browse source
This commit is contained in:
Greyson Parrelli 2024-12-12 11:27:11 -05:00
parent a93c1bc942
commit 010c45da94
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppDonations.kt
View file

@ -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()
}
/**

7
app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
View file

@ -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(