sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid using paragraph style breaks by accident

This commit is contained in:
Daniel Gultsch 2015-05-11 14:18:30 +02:00
parent 9156665add
commit b6f85ba0dd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/entities/Message.java
View File

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

7
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View File

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