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

Search for CC on server

This commit is contained in:
M66B 2020-04-09 09:09:01 +02:00
parent 458de65091
commit 8664a24fe9
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,6 +401,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
}
arg.writeAtom("OR");
arg.writeAtom("OR");
arg.writeAtom("OR");
if (search_text)
arg.writeAtom("OR");
if (keywords)
@ -409,6 +410,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
arg.writeBytes(query.getBytes());
arg.writeAtom("TO");
arg.writeBytes(query.getBytes());
arg.writeAtom("CC");
arg.writeBytes(query.getBytes());
arg.writeAtom("SUBJECT");
arg.writeBytes(query.getBytes());
if (search_text) {
@ -445,17 +448,12 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
.replaceAll("[^\\p{ASCII}]", "");
Log.i("Boundary ASCII search=" + search);
SearchTerm term = new OrTerm(
new OrTerm(
new FromStringTerm(search),
new RecipientStringTerm(Message.RecipientType.TO, search)
),
new OrTerm(
new SubjectTerm(search),
new BodyTerm(search)
)
);
SearchTerm term = new FromStringTerm(search);
term = new OrTerm(term, new RecipientStringTerm(Message.RecipientType.TO, search));
term = new OrTerm(term, new RecipientStringTerm(Message.RecipientType.CC, search));
term = new OrTerm(term, new SubjectTerm(search));
if (search_text)
term = new OrTerm(term, new BodyTerm(search));
if (keywords)
term = new OrTerm(term, new FlagTerm(
new Flags(MessageHelper.sanitizeKeyword(search)), true));