From 0b4a14313eb4e6a7cd17ddc72ce7f45d4f9986ec Mon Sep 17 00:00:00 2001
From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com>
Date: Wed, 19 Mar 2025 09:48:57 +1100
Subject: [PATCH] Fixprod crashes (#1028)

---
 .../securesms/notifications/MarkReadReceiver.kt           | 8 ++++++--
 .../messaging/sending_receiving/MessageSender.kt          | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt
index 98fe235456..58f184bfe9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt
@@ -79,8 +79,12 @@ class MarkReadReceiver : BroadcastReceiver() {
 
             hashToDisappearAfterReadMessage(context, markedReadMessages)?.let { hashToMessages ->
                 GlobalScope.launch {
-                    fetchUpdatedExpiriesAndScheduleDeletion(context, hashToMessages)
-                    shortenExpiryOfDisappearingAfterRead(hashToMessages)
+                    try {
+                        fetchUpdatedExpiriesAndScheduleDeletion(context, hashToMessages)
+                        shortenExpiryOfDisappearingAfterRead(hashToMessages)
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Failed to fetch updated expiries and schedule deletion", e)
+                    }
                 }
             }
         }
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
index 98a9c12b26..0184ce237e 100644
--- 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
@@ -45,6 +45,7 @@ import org.session.libsignal.protos.SignalServiceProtos
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.IdPrefix
+import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.Namespace
 import org.session.libsignal.utilities.defaultRequiresAuth
 import org.session.libsignal.utilities.hasNamespaces
@@ -511,7 +512,11 @@ object MessageSender {
 
             storage.markAsSyncing(timestamp, userPublicKey)
             GlobalScope.launch {
-                sendToSnodeDestination(Destination.Contact(userPublicKey), message, true)
+                try {
+                    sendToSnodeDestination(Destination.Contact(userPublicKey), message, true)
+                } catch (ec: Exception) {
+                    Log.e("MessageSender", "Unable to send sync message", ec)
+                }
             }
         }
     }