mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Search on device for words

This commit is contained in:
M66B 2022-10-12 10:35:21 +02:00
parent 8c20cf7969
commit 0991ad8d69
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
View File

@ -854,7 +854,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
if (word.size() == 0)
return true;
Pattern pat = Pattern.compile(".*" + TextUtils.join("\\s+", word) + ".*", Pattern.DOTALL);
Pattern pat = Pattern.compile(".*?\\b(" + TextUtils.join("\\s+", word) + ")\\b.*?", Pattern.DOTALL);
return pat.matcher(text).matches();
}

17
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@ -2949,9 +2949,9 @@ public class HtmlHelper {
int flags = Pattern.DOTALL | Pattern.CASE_INSENSITIVE;
List<Pattern> pat = new ArrayList<>();
pat.add(Pattern.compile(".*(" + TextUtils.join("\\s+", word) + ").*", flags));
pat.add(Pattern.compile(".*?\\b(" + TextUtils.join("\\s+", word) + ")\\b.*?", flags));
for (String w : plus)
pat.add(Pattern.compile(".*(" + w + ").*", flags));
pat.add(Pattern.compile(".*?\\b(" + w + ")\\b.*?", flags));
for (Pattern p : pat)
NodeTraversor.traverse(new NodeVisitor() {
@ -2963,25 +2963,26 @@ public class HtmlHelper {
String text = tnode.getWholeText();
Matcher result = p.matcher(text);
if (!result.matches())
return;
int prev = 0;
Element holder = document.createElement("span");
for (int i = 1; i <= result.groupCount(); i++) {
holder.appendText(text.substring(prev, result.start(i)));
while (result.find()) {
holder.appendText(text.substring(prev, result.start(1)));
Element span = document.createElement("span");
span.attr("style", mergeStyles(
span.attr("style"),
"font-size:larger; background-color:" + encodeWebColor(color)
));
span.text(text.substring(result.start(i), result.end(i)));
span.text(text.substring(result.start(1), result.end(1)));
holder.appendChild(span);
prev = result.end(i);
prev = result.end(1);
}
if (prev == 0) // No matches
return;
if (prev < text.length())
holder.appendText(text.substring(prev));