diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt index 95e10c644..7d0a9f10d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt @@ -27,7 +27,6 @@ import org.thoughtcrime.securesms.help.HelpFragment import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.subscription.Subscription -import org.thoughtcrime.securesms.util.FeatureFlags import org.thoughtcrime.securesms.util.Material3OnScrollHelper import org.thoughtcrime.securesms.util.SpanUtil import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter @@ -245,7 +244,7 @@ class ManageDonationsFragment : sectionHeaderPref(R.string.ManageDonationsFragment__other_ways_to_give) - if (FeatureFlags.giftBadgeSendSupport() && Recipient.self().giftBadgesCapability == Recipient.Capability.SUPPORTED) { + if (Recipient.self().giftBadgesCapability == Recipient.Capability.SUPPORTED) { clickPref( title = DSLSettingsText.from(R.string.ManageDonationsFragment__donate_for_a_friend), icon = DSLSettingsIcon.from(R.drawable.symbol_gift_24), diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java index f7ab63e3a..6b23bb696 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -89,7 +89,6 @@ public final class FeatureFlags { private static final String PHONE_NUMBER_PRIVACY = "android.pnp"; private static final String USE_FCM_FOREGROUND_SERVICE = "android.useFcmForegroundService.3"; private static final String STORIES_AUTO_DOWNLOAD_MAXIMUM = "android.stories.autoDownloadMaximum"; - private static final String GIFT_BADGE_SEND_SUPPORT = "android.giftBadges.sending.3"; private static final String TELECOM_MANUFACTURER_ALLOWLIST = "android.calling.telecomAllowList"; private static final String TELECOM_MODEL_BLOCKLIST = "android.calling.telecomModelBlockList"; private static final String CAMERAX_MODEL_BLOCKLIST = "android.cameraXModelBlockList"; @@ -146,7 +145,6 @@ public final class FeatureFlags { PAYMENTS_COUNTRY_BLOCKLIST, USE_FCM_FOREGROUND_SERVICE, STORIES_AUTO_DOWNLOAD_MAXIMUM, - GIFT_BADGE_SEND_SUPPORT, TELECOM_MANUFACTURER_ALLOWLIST, TELECOM_MODEL_BLOCKLIST, CAMERAX_MODEL_BLOCKLIST, @@ -497,13 +495,6 @@ public final class FeatureFlags { return getInteger(STORIES_AUTO_DOWNLOAD_MAXIMUM, 2); } - /** - * Whether or not sending Gifting Badges should be available on this client. - */ - public static boolean giftBadgeSendSupport() { - return getBoolean(GIFT_BADGE_SEND_SUPPORT, Environment.IS_STAGING); - } - /** * Whether or not we should enable the SMS exporter *