Use current time + offset in snode message timestamps (#904)

* fix: use current time in message sender's snode message timestamps to prevent 406 from repeat failed message sends * build: update build number
oxen-io · Jun 15, 2022 · daca3e2 · daca3e2
1 parent c677431
commit daca3e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -159,8 +159,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.4'
 }
 
-def canonicalVersionCode = 283
-def canonicalVersionName = "1.13.4"
+def canonicalVersionCode = 285
+def canonicalVersionName = "1.13.5"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
@@ -79,6 +79,9 @@ object MessageSender {
         if (message.sentTimestamp == null) {
             message.sentTimestamp = System.currentTimeMillis() // Visible messages will already have their sent timestamp set
         }
+
+        val messageSendTime = System.currentTimeMillis()
+
         message.sender = userPublicKey
         val isSelfSend = (message.recipient == userPublicKey)
         // Set the failure handler (need it here already for precondition failure handling)
@@ -159,14 +162,14 @@ object MessageSender {
             val wrappedMessage = MessageWrapper.wrap(kind, message.sentTimestamp!!, senderPublicKey, ciphertext)
             // Send the result
             if (destination is Destination.Contact && message is VisibleMessage && !isSelfSend) {
-                SnodeModule.shared.broadcaster.broadcast("calculatingPoW", message.sentTimestamp!!)
+                SnodeModule.shared.broadcaster.broadcast("calculatingPoW", messageSendTime)
             }
             val base64EncodedData = Base64.encodeBytes(wrappedMessage)
             // Send the result
-            val timestamp = message.sentTimestamp!! + SnodeAPI.clockOffset
+            val timestamp = messageSendTime + SnodeAPI.clockOffset
             val snodeMessage = SnodeMessage(message.recipient!!, base64EncodedData, message.ttl, timestamp)
             if (destination is Destination.Contact && message is VisibleMessage && !isSelfSend) {
-                SnodeModule.shared.broadcaster.broadcast("sendingMessage", message.sentTimestamp!!)
+                SnodeModule.shared.broadcaster.broadcast("sendingMessage", messageSendTime)
             }
             namespaces.map { namespace -> SnodeAPI.sendMessage(snodeMessage, requiresAuth = false, namespace = namespace) }.let { promises ->
                 var isSuccess = false
@@ -177,7 +180,7 @@ object MessageSender {
                         if (isSuccess) { return@success } // Succeed as soon as the first promise succeeds
                         isSuccess = true
                         if (destination is Destination.Contact && message is VisibleMessage && !isSelfSend) {
-                            SnodeModule.shared.broadcaster.broadcast("messageSent", message.sentTimestamp!!)
+                            SnodeModule.shared.broadcaster.broadcast("messageSent", messageSendTime)
                         }
                         val hash = it["hash"] as? String
                         message.serverHash = hash