avoid using paragraph style breaks by accident

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java          | 4 
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 7 
2 files changed, 7 insertions(+), 4 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -17,6 +17,8 @@ public class Message extends AbstractEntity {
 
 	public static final String TABLENAME = "messages";
 
+	public static final String MERGE_SEPARATOR = "\u2029\n\n";
+
 	public static final int STATUS_RECEIVED = 0;
 	public static final int STATUS_UNSEND = 1;
 	public static final int STATUS_SEND = 2;
@@ -396,7 +398,7 @@ public class Message extends AbstractEntity {
 	public String getMergedBody() {
 		final Message next = this.next();
 		if (this.mergeable(next)) {
-			return getBody().trim() + "\n\n" + next.getMergedBody();
+			return getBody().trim() + MERGE_SEPARATOR + next.getMergedBody();
 		}
 		return getBody().trim();
 	}

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -234,10 +234,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			final String nick = UIHelper.getMessageDisplayName(message);
 			final String body = message.getMergedBody().replaceAll("^" + Message.ME_COMMAND,nick + " ");
 			final SpannableString formattedBody = new SpannableString(body);
-			int i = body.indexOf("\n\n");
+			int i = body.indexOf(Message.MERGE_SEPARATOR);
 			while(i >= 0) {
-				formattedBody.setSpan(new RelativeSizeSpan(0.3f),i,i+2,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-				i = body.indexOf("\n\n",i+2);
+				final int end = i + Message.MERGE_SEPARATOR.length();
+				formattedBody.setSpan(new RelativeSizeSpan(0.3f),i,end,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+				i = body.indexOf(Message.MERGE_SEPARATOR,end);
 			}
 			if (message.getType() != Message.TYPE_PRIVATE) {
 				if (message.hasMeCommand()) {