narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

don't show quoted text in message preview

Browse source
This commit is contained in:
Daniel Gultsch 2016-12-20 16:35:08 +01:00
parent e5fff42b10
commit b011d46ff2
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View file

@ -180,10 +180,7 @@ public class UIHelper {
return new Pair<>(getFileDescriptionString(context,message),true); return new Pair<>(getFileDescriptionString(context,message),true);
} }
} else { } else {
String body = message.getBody(); final String body = message.getBody();
if (body.length() > 256) {
body = body.substring(0,256);
}
if (body.startsWith(Message.ME_COMMAND)) { if (body.startsWith(Message.ME_COMMAND)) {
return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND, return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND,
UIHelper.getMessageDisplayName(message) + " "), false); UIHelper.getMessageDisplayName(message) + " "), false);
@ -196,8 +193,29 @@ public class UIHelper {
} else if (message.treatAsDownloadable() == Message.Decision.MUST) { } else if (message.treatAsDownloadable() == Message.Decision.MUST) {
return new Pair<>(context.getString(R.string.x_file_offered_for_download, return new Pair<>(context.getString(R.string.x_file_offered_for_download,
getFileDescriptionString(context,message)),true); getFileDescriptionString(context,message)),true);
} else{ } else {
return new Pair<>(body.trim(), false); String[] lines = body.split("\n");
StringBuilder builder = new StringBuilder();
for(String l : lines) {
if (l.length() > 0) {
char first = l.charAt(0);
if (first != '>' && first != '\u00bb') {
String line = l.trim();
char last = line.charAt(line.length()-1);
if (builder.length() != 0) {
builder.append(' ');
}
builder.append(line);
if (last != '.' && last != '!' && last != '?' && last != ',') {
break;
}
}
}
}
if (builder.length() == 0) {
builder.append(body.trim());
}
return new Pair<>(builder.length() > 256 ? builder.substring(0,256) : builder.toString(), false);
} }
} }
} }