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/utils | |
parent | abde267e5c1abc02ef1130f5ffd058199582926d (diff) |
implements FS#277: Remove 'Message merge'
Diffstat (limited to 'src/main/java/de/pixart/messenger/utils')
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/MessageUtils.java | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/StylingHelper.java | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/MessageUtils.java b/src/main/java/de/pixart/messenger/utils/MessageUtils.java index 4ad0e84a5..dad01fdf3 100644 --- a/src/main/java/de/pixart/messenger/utils/MessageUtils.java +++ b/src/main/java/de/pixart/messenger/utils/MessageUtils.java @@ -43,7 +43,7 @@ public class MessageUtils { private static final String EMPTY_STRING = ""; public static String prepareQuote(Message message) { final StringBuilder builder = new StringBuilder(); - final String body = message.getMergedBody().toString(); + final String body = message.getBody(); for (String line : body.split("\n")) { if (line.length() <= 0) { continue; diff --git a/src/main/java/de/pixart/messenger/utils/StylingHelper.java b/src/main/java/de/pixart/messenger/utils/StylingHelper.java index be430e584..a906b734f 100644 --- a/src/main/java/de/pixart/messenger/utils/StylingHelper.java +++ b/src/main/java/de/pixart/messenger/utils/StylingHelper.java @@ -85,11 +85,6 @@ public class StylingHelper { public static void format(final Editable editable, @ColorInt int textColor) { int end = 0; - Message.MergeSeparator[] spans = editable.getSpans(0, editable.length() - 1, Message.MergeSeparator.class); - for (Message.MergeSeparator span : spans) { - format(editable, end, editable.getSpanStart(span), textColor); - end = editable.getSpanEnd(span); - } format(editable, end, editable.length() - 1, textColor); } |