mirror of https://github.com/M66B/FairEmail.git
Search for CC on server
This commit is contained in:
parent
458de65091
commit
8664a24fe9
|
@ -401,6 +401,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
|
||||||
}
|
}
|
||||||
arg.writeAtom("OR");
|
arg.writeAtom("OR");
|
||||||
arg.writeAtom("OR");
|
arg.writeAtom("OR");
|
||||||
|
arg.writeAtom("OR");
|
||||||
if (search_text)
|
if (search_text)
|
||||||
arg.writeAtom("OR");
|
arg.writeAtom("OR");
|
||||||
if (keywords)
|
if (keywords)
|
||||||
|
@ -409,6 +410,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
|
||||||
arg.writeBytes(query.getBytes());
|
arg.writeBytes(query.getBytes());
|
||||||
arg.writeAtom("TO");
|
arg.writeAtom("TO");
|
||||||
arg.writeBytes(query.getBytes());
|
arg.writeBytes(query.getBytes());
|
||||||
|
arg.writeAtom("CC");
|
||||||
|
arg.writeBytes(query.getBytes());
|
||||||
arg.writeAtom("SUBJECT");
|
arg.writeAtom("SUBJECT");
|
||||||
arg.writeBytes(query.getBytes());
|
arg.writeBytes(query.getBytes());
|
||||||
if (search_text) {
|
if (search_text) {
|
||||||
|
@ -445,17 +448,12 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
|
||||||
.replaceAll("[^\\p{ASCII}]", "");
|
.replaceAll("[^\\p{ASCII}]", "");
|
||||||
|
|
||||||
Log.i("Boundary ASCII search=" + search);
|
Log.i("Boundary ASCII search=" + search);
|
||||||
SearchTerm term = new OrTerm(
|
SearchTerm term = new FromStringTerm(search);
|
||||||
new OrTerm(
|
term = new OrTerm(term, new RecipientStringTerm(Message.RecipientType.TO, search));
|
||||||
new FromStringTerm(search),
|
term = new OrTerm(term, new RecipientStringTerm(Message.RecipientType.CC, search));
|
||||||
new RecipientStringTerm(Message.RecipientType.TO, search)
|
term = new OrTerm(term, new SubjectTerm(search));
|
||||||
),
|
if (search_text)
|
||||||
new OrTerm(
|
term = new OrTerm(term, new BodyTerm(search));
|
||||||
new SubjectTerm(search),
|
|
||||||
new BodyTerm(search)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
if (keywords)
|
if (keywords)
|
||||||
term = new OrTerm(term, new FlagTerm(
|
term = new OrTerm(term, new FlagTerm(
|
||||||
new Flags(MessageHelper.sanitizeKeyword(search)), true));
|
new Flags(MessageHelper.sanitizeKeyword(search)), true));
|
||||||
|
|
Loading…
Reference in New Issue