From 1aebce8d6eff330898098086fb56b001579fef7a Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 14 Jun 2019 17:46:40 -0400
Subject: [PATCH] Fix self-sync timestamp inconsistency

---
 .../signalservice/api/SignalServiceMessageSender.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/java/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
index b12586c..636fa4e 100644
--- a/java/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
+++ b/java/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
@@ -296,7 +296,10 @@ public class SignalServiceMessageSender {
       throw new IOException("Unsupported sync message!");
     }
 
-    sendMessage(localAddress, Optional.<UnidentifiedAccess>absent(), System.currentTimeMillis(), content, false);
+    long timestamp = message.getSent().isPresent() ? message.getSent().get().getTimestamp()
+                                                   : System.currentTimeMillis();
+
+    sendMessage(localAddress, Optional.<UnidentifiedAccess>absent(), timestamp, content, false);
   }
 
   public void setSoTimeoutMillis(long soTimeoutMillis) {