From d29609c1ff13da1907cdb3501e4c5e84fa451d8e Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 26 Aug 2024 14:47:51 -0500 Subject: [PATCH] Don't remove oob fallback if there is no oob Maybe it was removed by MUC or similar --- .../java/eu/siacs/conversations/entities/Message.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index a0e33acf9397b4865bd12fea0a32a91f3864e6ad..d7da48c895f181d52837d35ca909fde7c33b8a72 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -593,10 +593,11 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable public String getBody(final boolean removeQuoteFallbacks) { if (body == null) return ""; - Pair result = - removeQuoteFallbacks - ? bodyMinusFallbacks("http://jabber.org/protocol/address", Namespace.OOB, "urn:xmpp:reply:0") - : bodyMinusFallbacks("http://jabber.org/protocol/address", Namespace.OOB); + List fallbacksToRemove = new ArrayList<>(); + fallbacksToRemove.add("http://jabber.org/protocol/address"); + if (getOob() != null || isGeoUri()) fallbacksToRemove.add(Namespace.OOB); + if (removeQuoteFallbacks) fallbacksToRemove.add("urn:xmpp:reply:0"); + Pair result = bodyMinusFallbacks(fallbacksToRemove.toArray(new String[0])); StringBuilder body = result.first; final String aesgcm = MessageUtils.aesgcmDownloadable(body.toString());