From 86b065203fdff832980d02a8f8d8609ec0604d62 Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Mon, 23 Jan 2023 15:43:43 +1100
Subject: [PATCH] fix: prevent very old messages (15 minutes ago) being
 processed to prevent endless crashes in some cases

---
 .../securesms/webrtc/CallMessageProcessor.kt         | 12 ++++++++++++
 .../java/org/session/libsession/snode/SnodeAPI.kt    |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt
index f007ace976..bace754843 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallMessageProcessor.kt
@@ -12,6 +12,7 @@ import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.calls.CallMessageType
 import org.session.libsession.messaging.messages.control.CallMessage
 import org.session.libsession.messaging.utilities.WebRtcUtils
+import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.recipients.Recipient
@@ -29,6 +30,10 @@ import org.webrtc.IceCandidate
 
 class CallMessageProcessor(private val context: Context, private val textSecurePreferences: TextSecurePreferences, lifecycle: Lifecycle, private val storage: StorageProtocol) {
 
+    companion object {
+        private const val VERY_EXPIRED_TIME = 15 * 60 * 1000L
+    }
+
     init {
         lifecycle.coroutineScope.launch(IO) {
             while (isActive) {
@@ -53,6 +58,13 @@ class CallMessageProcessor(private val context: Context, private val textSecureP
                     }
                     continue
                 }
+
+                val isVeryExpired = (nextMessage.sentTimestamp?:0) + VERY_EXPIRED_TIME < SnodeAPI.nowWithOffset
+                if (isVeryExpired) {
+                    Log.e("Loki", "Dropping very expired call message")
+                    continue
+                }
+
                 when (nextMessage.type) {
                     OFFER -> incomingCall(nextMessage)
                     ANSWER -> incomingAnswer(nextMessage)
diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
index 9a17958952..8077594643 100644
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
@@ -56,6 +56,10 @@ object SnodeAPI {
      * user's clock is incorrect.
      */
     internal var clockOffset = 0L
+
+    val nowWithOffset
+        get() = System.currentTimeMillis() + clockOffset
+
     internal var forkInfo by observable(database.getForkInfo()) { _, oldValue, newValue ->
         if (newValue > oldValue) {
             Log.d("Loki", "Setting new fork info new: $newValue, old: $oldValue")