From 7e0073924024415673e34634be493e1c7bcabef2 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 13 May 2025 12:30:17 -0400
Subject: [PATCH] Remove MMS related encryption error messaging.

---
 .../securesms/database/model/MmsMessageRecord.java            | 4 ++--
 app/src/main/res/values/strings.xml                           | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
index 7090987a3b..84ed84220f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
@@ -217,11 +217,11 @@ public class MmsMessageRecord extends MessageRecord {
   @WorkerThread
   public SpannableString getDisplayBody(@NonNull Context context) {
     if (MessageTypes.isChatSessionRefresh(type)) {
-      return emphasisAdded(context.getString(R.string.MmsMessageRecord_bad_encrypted_mms_message));
+      return emphasisAdded(context.getString(R.string.MessageRecord_chat_session_refreshed));
     } else if (MessageTypes.isDuplicateMessageType(type)) {
       return emphasisAdded(context.getString(R.string.SmsMessageRecord_duplicate_message));
     } else if (MessageTypes.isNoRemoteSessionType(type)) {
-      return emphasisAdded(context.getString(R.string.MmsMessageRecord_mms_message_encrypted_for_non_existing_session));
+      return emphasisAdded(context.getString(R.string.MessageDisplayHelper_message_encrypted_for_non_existing_session));
     } else if (isLegacyMessage()) {
       return emphasisAdded(context.getString(R.string.MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported));
     } else if (isPaymentNotification() && payment != null) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fbdf8575ad..3643d4c613 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3071,10 +3071,6 @@
     <!-- MessageDisplayHelper -->
     <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Message encrypted for non-existing session</string>
 
-    <!-- MmsMessageRecord -->
-    <string name="MmsMessageRecord_bad_encrypted_mms_message">Bad encrypted MMS message</string>
-    <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS message encrypted for non-existing session</string>
-
     <!-- MuteDialog -->
     <string name="MuteDialog_mute_notifications">Mute notifications</string>