From 1565ecdcea298463fbbe0ff6b788004b96ddfa76 Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Fri, 31 May 2024 10:17:37 -0400
Subject: [PATCH] Fix multiple scheduled backups due to jitter.

---
 .../securesms/service/LocalBackupListener.java             | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
index d6fa92b6a4..4bc7758f2b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
@@ -49,14 +49,13 @@ public class LocalBackupListener extends PersistentAlarmManagerListener {
     int           minute = SignalStore.settings().getBackupMinute();
     LocalDateTime next   = now.withHour(hour).withMinute(minute).withSecond(0);
 
-    int jitter = (new Random().nextInt(BACKUP_JITTER_WINDOW_SECONDS)) - (BACKUP_JITTER_WINDOW_SECONDS / 2);
-
-    next = next.plusSeconds(jitter);
-
     if (now.isAfter(next)) {
       next = next.plusDays(1);
     }
 
+    int jitter = (new Random().nextInt(BACKUP_JITTER_WINDOW_SECONDS)) - (BACKUP_JITTER_WINDOW_SECONDS / 2);
+    next = next.plusSeconds(jitter);
+
     long nextTime = JavaTimeExtensionsKt.toMillis(next);
 
     TextSecurePreferences.setNextBackupTime(context, nextTime);