From 47c78e3d8a54fca94a61453f412debeeaf6cb0bb Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 16 Feb 2022 11:06:34 -0500 Subject: [PATCH] Disable Valentines Day megaphone. --- .../securesms/megaphone/Megaphones.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java index ebd3428bd..32eb7310a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -107,7 +107,7 @@ public final class Megaphones { put(Event.NOTIFICATIONS, shouldShowNotificationsMegaphone(context) ? RecurringSchedule.every(TimeUnit.DAYS.toMillis(30)) : NEVER); put(Event.ONBOARDING, shouldShowOnboardingMegaphone(context) ? ALWAYS : NEVER); put(Event.BECOME_A_SUSTAINER, shouldShowDonateMegaphone(context, records) ? ShowForDurationSchedule.showForDays(7) : NEVER); - put(Event.VALENTINES_DONATIONS_2022, shouldShowValentinesDonationsMegaphone(context, records) ? ShowForDurationSchedule.showForDays(1) : NEVER); + put(Event.VALENTINES_DONATIONS_2022, NEVER); put(Event.PIN_REMINDER, new SignalPinReminderSchedule()); // Feature-introduction megaphones should *probably* be added below this divider @@ -327,24 +327,6 @@ public final class Megaphones { .noneMatch(badge -> badge.getCategory() == Badge.Category.Donor); } - private static boolean shouldShowValentinesDonationsMegaphone(@NonNull Context context, @NonNull Map records) { - LocalDateTime now = LocalDateTime.now(); - long timeSinceLastDonatePrompt = timeSinceLastDonatePrompt(records); - - return timeSinceLastDonatePrompt > MIN_TIME_BETWEEN_DONATE_MEGAPHONES && - VersionTracker.getDaysSinceFirstInstalled(context) >= 7 && - LocaleFeatureFlags.isInValentinesDonateMegaphone() && - now.getMonth() == Month.FEBRUARY && - now.getDayOfMonth() == 14 && - now.getYear() == 2022 && - PlayServicesUtil.getPlayServicesStatus(context) == PlayServicesUtil.PlayServicesStatus.SUCCESS && - Recipient.self() - .getBadges() - .stream() - .filter(Objects::nonNull) - .noneMatch(badge -> badge.getCategory() == Badge.Category.Donor); - } - private static boolean shouldShowOnboardingMegaphone(@NonNull Context context) { return SignalStore.onboarding().hasOnboarding(context); }