Remove Phase 1 in preparation for CFv2.

This commit is contained in:
Cody Henthorne
2023-07-14 13:51:30 -04:00
committed by GitHub
parent 7031bbae43
commit e5c3757629
9 changed files with 18 additions and 61 deletions

View File

@@ -232,24 +232,12 @@ public final class MiscellaneousValues extends SignalStoreValues {
putBoolean(PNI_INITIALIZED_DEVICES, value);
}
public void startSmsPhase1() {
if (!getStore().containsKey(SMS_PHASE_1_START_MS)) {
putLong(SMS_PHASE_1_START_MS, System.currentTimeMillis());
}
}
public @NonNull SmsExportPhase getSmsExportPhase() {
long now = System.currentTimeMillis();
long phase1StartMs = getLong(SMS_PHASE_1_START_MS, now);
return SmsExportPhase.getCurrentPhase(now - phase1StartMs);
}
public long getSmsPhase3Start() {
long now = System.currentTimeMillis();
long phase1StartMs = getLong(SMS_PHASE_1_START_MS, now);
return phase1StartMs + SmsExportPhase.PHASE_3.getDuration();
}
public void setHasLinkedDevices(boolean value) {
putBoolean(HAS_LINKED_DEVICES, value);
}

View File

@@ -5,8 +5,7 @@ import org.thoughtcrime.securesms.util.Util
import kotlin.time.Duration.Companion.days
enum class SmsExportPhase(val duration: Long) {
PHASE_1(0.days.inWholeMilliseconds),
PHASE_2(21.days.inWholeMilliseconds),
PHASE_2(0.days.inWholeMilliseconds),
PHASE_3(51.days.inWholeMilliseconds);
fun allowSmsFeatures(): Boolean {
@@ -17,10 +16,6 @@ enum class SmsExportPhase(val duration: Long) {
return this != PHASE_3
}
fun isFullscreen(): Boolean {
return this.ordinal > PHASE_1.ordinal
}
fun isBlockingUi(): Boolean {
return this == PHASE_3
}