diff options
author | steckbrief <steckbrief@chefmail.de> | 2019-07-07 22:42:06 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2019-07-07 22:42:06 +0200 |
commit | 811f3b092608b7c17982823b28c950489d0345e0 (patch) | |
tree | aac22cd7b960082752aa1b6a01fe793bf5dfb695 /src/main/java/de/pixart/messenger/entities | |
parent | abde267e5c1abc02ef1130f5ffd058199582926d (diff) |
implements FS#277: Remove 'Message merge'
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 5 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Message.java | 49 |
2 files changed, 0 insertions, 54 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index b3e92fba2..77cf2dea8 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -418,11 +418,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl messages.clear(); messages.addAll(this.messages); } - for (Iterator<Message> iterator = messages.iterator(); iterator.hasNext(); ) { - if (iterator.next().wasMergedIntoPrevious()) { - iterator.remove(); - } - } } @Override diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index e280d2527..bef1920d5 100644 --- a/src/main/java/de/pixart/messenger/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -640,59 +640,10 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable } } - public static class MergeSeparator { - } - - public SpannableStringBuilder getMergedBody() { - SpannableStringBuilder body = new SpannableStringBuilder(MessageUtils.filterLtrRtl(this.body).trim()); - Message current = this; - while (current.mergeable(current.next())) { - current = current.next(); - if (current == null) { - break; - } - body.append("\n\n"); - body.setSpan(new MergeSeparator(), body.length() - 2, body.length(), SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE); - body.append(MessageUtils.filterLtrRtl(current.getBody()).trim()); - } - return body; - } - public boolean hasMeCommand() { return this.body.trim().startsWith(ME_COMMAND); } - public int getMergedStatus() { - int status = this.status; - Message current = this; - while (current.mergeable(current.next())) { - current = current.next(); - if (current == null) { - break; - } - status = current.status; - } - return status; - } - - public long getMergedTimeSent() { - long time = this.timeSent; - Message current = this; - while (current.mergeable(current.next())) { - current = current.next(); - if (current == null) { - break; - } - time = current.timeSent; - } - return time; - } - - public boolean wasMergedIntoPrevious() { - Message prev = this.prev(); - return prev != null && prev.mergeable(this); - } - public boolean trusted() { Contact contact = this.getContact(); return status > STATUS_RECEIVED || (contact != null && (contact.showInContactList() || contact.isSelf())); |