narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fix replies without callback handling

Browse source
This commit is contained in:
kosyak 2024-05-21 21:26:36 +02:00
parent 162b0bf928
commit ead327d30a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -875,14 +875,14 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
private StringBuilder removeReplyFallback(Message message, Message replyMessage) { private StringBuilder removeReplyFallback(Message message, Message replyMessage) {
StringBuilder sb = new StringBuilder(message.body); StringBuilder sb = new StringBuilder(message.body);
if (replyMessage != null && replyMessage.edits.isEmpty()) {
sb.replace(0, replyMessage.body.codePointCount(0, replyMessage.body.length()) + 3, "");
} else {
List<Element> replyFallback = message.getFallbacks("urn:xmpp:reply:0"); List<Element> replyFallback = message.getFallbacks("urn:xmpp:reply:0");
if (replyFallback.isEmpty()) { if (replyFallback.isEmpty()) {
return sb; return sb;
} }
if (replyMessage != null && replyMessage.edits.isEmpty()) {
sb.replace(0, replyMessage.body.codePointCount(0, replyMessage.body.length()) + 3, "");
} else {
Element bodyFallback = replyFallback.get(0).findChild("body"); Element bodyFallback = replyFallback.get(0).findChild("body");
int startCodePoint = Integer.parseInt(bodyFallback.getAttribute("start")); int startCodePoint = Integer.parseInt(bodyFallback.getAttribute("start"));
int endCodePoint = Integer.parseInt(bodyFallback.getAttribute("end")); int endCodePoint = Integer.parseInt(bodyFallback.getAttribute("end"));