Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix daily backups being incorrectly scheduled for multiple days away.

Browse Source
This commit is contained in:
Cody Henthorne
2025-09-09 14:58:40 -04:00
parent a05d5ff5e6
commit 3bb6a0a560
3 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,12 +6,14 @@
package org.thoughtcrime.securesms.service
import android.content.Context
import androidx.annotation.VisibleForTesting
import org.thoughtcrime.securesms.jobs.BackupMessagesJob
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.util.RemoteConfig
import org.thoughtcrime.securesms.util.toMillis
import java.time.LocalDateTime
import java.util.Random
import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.minutes
class MessageBackupListener : PersistentAlarmManagerListener() {
@@ -19,8 +21,14 @@ class MessageBackupListener : PersistentAlarmManagerListener() {
return true
}
override fun getNextScheduledExecutionTime(context: Context): Long {
return SignalStore.backup.nextBackupTime
@VisibleForTesting
public override fun getNextScheduledExecutionTime(context: Context): Long {
val nextTime = SignalStore.backup.nextBackupTime
return if (nextTime > (System.currentTimeMillis() + 2.days.inWholeMilliseconds)) {
setNextBackupTimeToIntervalFromNow()
} else {
nextTime
}
}
override fun onAlarm(context: Context, scheduledTime: Long): Long {
@@ -40,6 +48,7 @@ class MessageBackupListener : PersistentAlarmManagerListener() {
}
}
@VisibleForTesting
@JvmStatic
fun getNextDailyBackupTimeFromNowWithJitter(now: LocalDateTime, hour: Int, minute: Int, maxJitterSeconds: Int, randomSource: Random = Random()): LocalDateTime {
var next = now.withHour(hour).withMinute(minute).withSecond(0)