diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java index 6df4c1dea..9173d924b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.java @@ -192,9 +192,9 @@ public final class MiscellaneousValues extends SignalStoreValues { } public void startSmsPhase1() { - if (!getStore().containsKey(SMS_PHASE_1_START_MS)) { - putLong(SMS_PHASE_1_START_MS, System.currentTimeMillis()); - } +// if (!getStore().containsKey(SMS_PHASE_1_START_MS)) { +// putLong(SMS_PHASE_1_START_MS, System.currentTimeMillis()); +// } } public long getStoriesFeatureAvailableTimestamp() { @@ -206,11 +206,6 @@ public final class MiscellaneousValues extends SignalStoreValues { } public @NonNull SmsExportPhase getSmsExportPhase() { - if (getLong(SMS_PHASE_1_START_MS, 0) == 0) { - return SmsExportPhase.PHASE_0; - } - - long now = System.currentTimeMillis(); - return SmsExportPhase.getCurrentPhase(now - getLong(SMS_PHASE_1_START_MS, now)); + return SmsExportPhase.PHASE_0; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SmsExportPhase.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SmsExportPhase.kt index 84fd5971d..ca3323885 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SmsExportPhase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SmsExportPhase.kt @@ -11,29 +11,29 @@ enum class SmsExportPhase(val duration: Long) { PHASE_3(105.days.inWholeMilliseconds); fun allowSmsFeatures(): Boolean { - return this == PHASE_0 || (Util.isDefaultSmsProvider(ApplicationDependencies.getApplication()) && SignalStore.misc().smsExportPhase.isSmsSupported()) + return Util.isDefaultSmsProvider(ApplicationDependencies.getApplication()) } fun isSmsSupported(): Boolean { - return this != PHASE_3 + return true } fun isFullscreen(): Boolean { - return this.ordinal > PHASE_1.ordinal + return false } fun isBlockingUi(): Boolean { - return this == PHASE_3 + return false } fun isAtLeastPhase1(): Boolean { - return this.ordinal >= PHASE_1.ordinal + return false } companion object { @JvmStatic fun getCurrentPhase(duration: Long): SmsExportPhase { - return values().findLast { duration >= it.duration }!! + return PHASE_0 } } }