Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 12:44:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent backups from being scheduled twice within the jitter window.

Browse Source 
Fixes #13559.
This commit is contained in:
Nicholas Tinsley
2024-07-01 17:01:02 -04:00
committed by Cody Henthorne
parent b113eec940
commit aec0a9951a
4 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
View File

@@ -47,7 +47,7 @@ public class LocalBackupListener extends PersistentAlarmManagerListener {
LocalDateTime now = LocalDateTime.now();
int hour = SignalStore.settings().getBackupHour();
int minute = SignalStore.settings().getBackupMinute();
LocalDateTime next = MessageBackupListener.getNextDailyBackupTimeFromNowWithJitter(now, hour, minute, BACKUP_JITTER_WINDOW_SECONDS);
LocalDateTime next = MessageBackupListener.getNextDailyBackupTimeFromNowWithJitter(now, hour, minute, BACKUP_JITTER_WINDOW_SECONDS, new Random());
long nextTime = JavaTimeExtensionsKt.toMillis(next);

18
app/src/main/java/org/thoughtcrime/securesms/service/MessageBackupListener.kt
View File

@@ -13,7 +13,8 @@ import org.thoughtcrime.securesms.util.RemoteConfig
import org.thoughtcrime.securesms.util.toMillis
import java.time.LocalDateTime
import java.util.Random
import java.util.concurrent.TimeUnit
import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.minutes
class MessageBackupListener : PersistentAlarmManagerListener() {
override fun shouldScheduleExact(): Boolean {
@@ -33,8 +34,8 @@ class MessageBackupListener : PersistentAlarmManagerListener() {
}
companion object {
private val BACKUP_JITTER_WINDOW_SECONDS = Math.toIntExact(TimeUnit.MINUTES.toSeconds(10))
private val BACKUP_MEDIA_SYNC_INTERVAL = TimeUnit.DAYS.toMillis(7)
private val BACKUP_JITTER_WINDOW_SECONDS = 10.minutes.inWholeSeconds.toInt()
private val BACKUP_MEDIA_SYNC_INTERVAL = 7.days.inWholeMilliseconds
@JvmStatic
fun schedule(context: Context?) {
@@ -44,22 +45,23 @@ class MessageBackupListener : PersistentAlarmManagerListener() {
}
@JvmStatic
fun getNextDailyBackupTimeFromNowWithJitter(now: LocalDateTime, hour: Int, minute: Int, maxJitterSeconds: Int): LocalDateTime {
fun getNextDailyBackupTimeFromNowWithJitter(now: LocalDateTime, hour: Int, minute: Int, maxJitterSeconds: Int, randomSource: Random = Random()): LocalDateTime {
var next = now.withHour(hour).withMinute(minute).withSecond(0)
if (!now.plusSeconds(maxJitterSeconds.toLong() / 2).isBefore(next)) {
val endOfJitterWindowForNow = now.plusSeconds(maxJitterSeconds.toLong() / 2)
while (!endOfJitterWindowForNow.isBefore(next)) {
next = next.plusDays(1)
}
val jitter = Random().nextInt(BACKUP_JITTER_WINDOW_SECONDS) - BACKUP_JITTER_WINDOW_SECONDS / 2
val jitter = randomSource.nextInt(maxJitterSeconds) - maxJitterSeconds / 2
return next.plusSeconds(jitter.toLong())
}
fun setNextBackupTimeToIntervalFromNow(): Long {
fun setNextBackupTimeToIntervalFromNow(maxJitterSeconds: Int = BACKUP_JITTER_WINDOW_SECONDS): Long {
val now = LocalDateTime.now()
val hour = SignalStore.settings.backupHour
val minute = SignalStore.settings.backupMinute
var next = getNextDailyBackupTimeFromNowWithJitter(now, hour, minute, BACKUP_JITTER_WINDOW_SECONDS)
var next = getNextDailyBackupTimeFromNowWithJitter(now, hour, minute, maxJitterSeconds)
next = when (SignalStore.backup.backupFrequency) {
BackupFrequency.MANUAL -> next.plusDays(364)
BackupFrequency.MONTHLY -> next.plusDays(29)