From 28874921bffd0520063239e78c616fc0fba9bf5e Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Mon, 26 Aug 2024 14:28:18 -0500
Subject: [PATCH] When MUC strips image, show body

---
 src/main/java/eu/siacs/conversations/entities/Message.java   | 5 +++++
 .../eu/siacs/conversations/http/HttpDownloadConnection.java  | 2 +-
 .../siacs/conversations/services/XmppConnectionService.java  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 014e13765346fcbf0c21b931681fae4e07633a1c..a0e33acf9397b4865bd12fea0a32a91f3864e6ad 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -1388,7 +1388,12 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public synchronized void resetFileParams() {
+        this.oob = false;
         this.fileParams = null;
+        this.transferable = null;
+        this.payloads.removeAll(getSims());
+        clearFallbacks(Namespace.OOB);
+        setType(isPrivateMessage() ? TYPE_PRIVATE : TYPE_TEXT);
     }
 
     public synchronized void setFileParams(FileParams fileParams) {
diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 6fb7fa9d1eb6c6e12005f99c00b210e8f0c3f0c5..325a8c1e6d27531df458937b295edd7665777d04 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -319,7 +319,7 @@ public class HttpDownloadConnection implements Transferable {
             FileBackend.updateFileParams(message, fileParams.url, size);
             mXmppConnectionService.databaseBackend.updateMessage(message, true);
             file.setExpectedSize(size);
-            message.resetFileParams();
+            message.setFileParams(null);
             if (mHttpConnectionManager.hasStoragePermission()
                     && size <= mHttpConnectionManager.getAutoAcceptFileSize()
                     && mXmppConnectionService.isDataSaverDisabled()) {
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index e15da198a66b0165f36ffbd441542d295adc9695..f9427c566e59ef11f504f6577fe9a21658334dda 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -5002,8 +5002,8 @@ public class XmppConnectionService extends Service {
                     message.setSubject(subject);
                     message.setThread(thread);
                     if (attachments != null && attachments.isEmpty()) {
-                        message.setFileParams(null);
                         message.setRelativeFilePath(null);
+                        message.resetFileParams();
                     }
                     markMessage(message, status, null, true);
                 } else {