Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-25 23:20:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Normalize search as fallback

Browse Source
This commit is contained in:
M66B
2019-01-22 09:19:49 +00:00
parent f355a0a2c8
commit 83b77ec24c
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/src/main/java/eu/faircode/email/ViewModelBrowse.java
View File

@@ -26,6 +26,7 @@ import com.sun.mail.imap.IMAPMessage;
import com.sun.mail.imap.IMAPStore;
import java.io.IOException;
import java.text.Normalizer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -173,25 +174,16 @@ public class ViewModelBrowse extends ViewModel {
if (state.search == null)
state.imessages = state.ifolder.getMessages();
else {
SearchTerm term = new OrTerm(
new OrTerm(
new FromStringTerm(state.search),
new RecipientStringTerm(Message.RecipientType.TO, state.search)
),
new OrTerm(
new SubjectTerm(state.search),
new BodyTerm(state.search)
)
);
if (folder.keywords.length > 0) {
Log.i("Boundary search for keywords");
term = new OrTerm(term, new FlagTerm(
new Flags(Helper.sanitizeKeyword(state.search)), true));
try {
state.imessages = state.ifolder.search(
getSearchTerm(state.search, folder.keywords.length > 0));
} catch (MessagingException ex) {
String search = Normalizer
.normalize(state.search, Normalizer.Form.NFD)
.replaceAll("[^\\p{ASCII}]", "");
state.imessages = state.ifolder.search(
getSearchTerm(search, folder.keywords.length > 0));
}
state.imessages = state.ifolder.search(term);
}
Log.i("Boundary found messages=" + state.imessages.length);
@@ -267,6 +259,25 @@ public class ViewModelBrowse extends ViewModel {
Log.i("Boundary done");
}
private SearchTerm getSearchTerm(String search, boolean keywords) {
SearchTerm term = new OrTerm(
new OrTerm(
new FromStringTerm(search),
new RecipientStringTerm(Message.RecipientType.TO, search)
),
new OrTerm(
new SubjectTerm(search),
new BodyTerm(search)
)
);
if (keywords)
term = new OrTerm(term, new FlagTerm(
new Flags(Helper.sanitizeKeyword(search)), true));
return term;
}
void clear() {
State state = currentState;
if (state == null)