From f96fb72eb19831c4738f6b76f1868ca3fcaf8e12 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 25 May 2020 13:14:38 -0400 Subject: [PATCH] Don't show PIN reminders if you're not registered. Fixes #9657 --- .../securesms/megaphone/SignalPinReminderSchedule.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java index 6da7d66819..f2db2f32ab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java @@ -1,7 +1,9 @@ package org.thoughtcrime.securesms.megaphone; +import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.util.FeatureFlags; +import org.thoughtcrime.securesms.util.TextSecurePreferences; final class SignalPinReminderSchedule implements MegaphoneSchedule { @@ -19,6 +21,10 @@ final class SignalPinReminderSchedule implements MegaphoneSchedule { return false; } + if (!TextSecurePreferences.isPushRegistered(ApplicationDependencies.getApplication())) { + return false; + } + long lastSuccessTime = SignalStore.pinValues().getLastSuccessfulEntryTime(); long interval = SignalStore.pinValues().getCurrentInterval();