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

Revert "Revert "fix reply text handling""

Browse source 
This reverts commit 705cc33347.
This commit is contained in:
kosyak 2024-05-21 21:25:45 +02:00
parent 705cc33347
commit 162b0bf928
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -841,7 +841,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
public SpannableStringBuilder getBodyForDisplaying() { public SpannableStringBuilder getBodyForDisplaying() {
if (replyMessage != null) { if (replyMessage != null) {
try { try {
return new SpannableStringBuilder(MessageUtils.filterLtrRtl(getReplyText(replyMessage) + "\n" + removeReplyFallback(this)).trim()); return new SpannableStringBuilder(MessageUtils.filterLtrRtl(getReplyText(replyMessage) + "\n" + removeReplyFallback(this, replyMessage)).trim());
} catch (IndexOutOfBoundsException e) { } catch (IndexOutOfBoundsException e) {
return new SpannableStringBuilder(MessageUtils.filterLtrRtl(this.body).trim()); return new SpannableStringBuilder(MessageUtils.filterLtrRtl(this.body).trim());
} }
@ -859,7 +859,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
} }
private StringBuilder getReplyText(Message message) { private StringBuilder getReplyText(Message message) {
StringBuilder reply = removeReplyFallback(message); StringBuilder reply = removeReplyFallback(message, message.replyMessage);
reply.insert(0, '>'); reply.insert(0, '>');
for (int i=0;i<reply.length();i++) { for (int i=0;i<reply.length();i++) {
char c = reply.charAt(i); char c = reply.charAt(i);
@ -872,22 +872,27 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
return reply; return reply;
} }
private StringBuilder removeReplyFallback(Message message) { private StringBuilder removeReplyFallback(Message message, Message replyMessage) {
StringBuilder sb = new StringBuilder(message.body); StringBuilder sb = new StringBuilder(message.body);
List<Element> replyFallback = message.getFallbacks("urn:xmpp:reply:0"); if (replyMessage != null && replyMessage.edits.isEmpty()) {
if (replyFallback.size() == 0) { sb.replace(0, replyMessage.body.codePointCount(0, replyMessage.body.length()) + 3, "");
return sb; } else {
List<Element> replyFallback = message.getFallbacks("urn:xmpp:reply:0");
if (replyFallback.isEmpty()) {
return sb;
}
Element bodyFallback = replyFallback.get(0).findChild("body");
int startCodePoint = Integer.parseInt(bodyFallback.getAttribute("start"));
int endCodePoint = Integer.parseInt(bodyFallback.getAttribute("end"));
if (startCodePoint < 0) return sb;
if (endCodePoint > sb.length()) return sb;
sb.replace(message.body.offsetByCodePoints(0, startCodePoint), message.body.offsetByCodePoints(0, endCodePoint), "");
} }
Element bodyFallback = replyFallback.get(0).findChild("body");
int startCodePoint = Integer.parseInt(bodyFallback.getAttribute("start"));
int endCodePoint = Integer.parseInt(bodyFallback.getAttribute("end"));
if (startCodePoint < 0) return sb;
if (endCodePoint > sb.length()) return sb;
sb.replace(message.body.offsetByCodePoints(0, startCodePoint), message.body.offsetByCodePoints(0, endCodePoint), "");
return sb; return sb;
} }