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

Move differentiation between XEP-0393 quotes and French quotes to QuoteHelper.

This commit is contained in:
Millesimus 2021-08-22 08:55:46 +02:00 committed by Daniel Gultsch
parent a0bca08997
commit 2db2ca95ce
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,9 +371,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
if (lineStart == -1) { if (lineStart == -1) {
if (previous == '\n') { if (previous == '\n') {
if ( if (
(QuoteHelper.isPositionQuoteStart(body, i) QuoteHelper.isPositionQuoteStart(body, i)
|| (current == '\u00bb' && !UIHelper.isPositionFollowedByQuote(body, i) ) {
))) {
// Line start with quote // Line start with quote
lineStart = i; lineStart = i;
if (quoteStart == -1) quoteStart = i; if (quoteStart == -1) quoteStart = i;

3
src/main/java/eu/siacs/conversations/utils/MessageUtils.java
View File

@ -70,8 +70,7 @@ public class MessageUtils {
continue; continue;
} }
final char c = line.charAt(0); final char c = line.charAt(0);
if (QuoteHelper.isNestedTooDeeply(line) if (QuoteHelper.isNestedTooDeeply(line)) {
|| (c == '\u00bb' && !UIHelper.isPositionFollowedByQuote(line, 0))) {
continue; continue;
} }
if (builder.length() != 0) { if (builder.length() != 0) {