implements FS#277: Remove 'Message merge'

1 files changed, 0 insertions, 49 deletions

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()));