msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Fixed FTS condition search

Browse Source
pull/206/head
M66B 4 years ago
parent 6229a6fd45
commit 33b25689ba
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

28
app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
Unescape View File

@ -381,21 +381,21 @@ public class FragmentDialogSearch extends FragmentDialogBase {
criteria.query = null; criteria.query = null;
criteria.fts = cbSearchIndex.isChecked(); criteria.fts = cbSearchIndex.isChecked();
if (!criteria.fts) { criteria.in_senders = cbSenders.isChecked();
criteria.in_senders = cbSenders.isChecked(); criteria.in_recipients = cbRecipients.isChecked();
criteria.in_recipients = cbRecipients.isChecked(); criteria.in_subject = cbSubject.isChecked();
criteria.in_subject = cbSubject.isChecked(); criteria.in_keywords = cbKeywords.isChecked();
criteria.in_keywords = cbKeywords.isChecked(); criteria.in_message = cbMessage.isChecked();
criteria.in_message = cbMessage.isChecked(); criteria.in_notes = cbNotes.isChecked();
criteria.in_notes = cbNotes.isChecked(); criteria.in_headers = (!criteria.fts && cbHeaders.isChecked());
criteria.in_headers = cbHeaders.isChecked(); criteria.in_html = (!criteria.fts && cbHtml.isChecked());
criteria.in_html = cbHtml.isChecked(); criteria.with_unseen = cbUnseen.isChecked();
criteria.with_unseen = cbUnseen.isChecked(); criteria.with_flagged = cbFlagged.isChecked();
criteria.with_flagged = cbFlagged.isChecked(); criteria.with_hidden = cbHidden.isChecked();
criteria.with_hidden = cbHidden.isChecked(); criteria.with_encrypted = cbEncrypted.isChecked();
criteria.with_encrypted = cbEncrypted.isChecked(); criteria.with_attachments = (!criteria.fts && cbAttachments.isChecked());
criteria.with_attachments = cbAttachments.isChecked();
if (!criteria.fts) {
int pos = spMessageSize.getSelectedItemPosition(); int pos = spMessageSize.getSelectedItemPosition();
if (pos > 0) { if (pos > 0) {
int[] sizes = getResources().getIntArray(R.array.sizeValues); int[] sizes = getResources().getIntArray(R.array.sizeValues);

Write Preview
Loading…
Cancel
Save