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

Added fail-safe

Browse Source
pull/217/head
M66B 6 months ago
parent 3d16a1f4b0
commit ba2499ca77
1 changed files with 103 additions and 99 deletions
Show Stats Download Patch File Download Diff File

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

@ -456,116 +456,120 @@ public class FragmentDialogSearch extends FragmentDialogBase {
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
BoundaryCallbackMessages.SearchCriteria criteria = new BoundaryCallbackMessages.SearchCriteria(); try {
BoundaryCallbackMessages.SearchCriteria criteria = new BoundaryCallbackMessages.SearchCriteria();
criteria.query = etQuery.getText().toString().trim();
if (TextUtils.isEmpty(criteria.query)) criteria.query = etQuery.getText().toString().trim();
criteria.query = null; if (TextUtils.isEmpty(criteria.query))
criteria.query = null;
criteria.fts = (cbSearchIndex.isChecked() && cbSearchIndex.isEnabled());
criteria.in_senders = cbSenders.isChecked(); criteria.fts = (cbSearchIndex.isChecked() && cbSearchIndex.isEnabled());
criteria.in_recipients = cbRecipients.isChecked(); criteria.in_senders = cbSenders.isChecked();
criteria.in_subject = cbSubject.isChecked(); criteria.in_recipients = cbRecipients.isChecked();
criteria.in_keywords = cbKeywords.isChecked(); criteria.in_subject = cbSubject.isChecked();
criteria.in_message = cbMessage.isChecked(); criteria.in_keywords = cbKeywords.isChecked();
criteria.in_notes = cbNotes.isChecked(); criteria.in_message = cbMessage.isChecked();
criteria.in_filenames = cbFileNames.isChecked(); criteria.in_notes = cbNotes.isChecked();
criteria.in_headers = cbHeaders.isChecked(); criteria.in_filenames = cbFileNames.isChecked();
criteria.in_html = cbHtml.isChecked(); criteria.in_headers = cbHeaders.isChecked();
criteria.with_unseen = cbUnseen.isChecked(); criteria.in_html = cbHtml.isChecked();
criteria.with_flagged = cbFlagged.isChecked(); criteria.with_unseen = cbUnseen.isChecked();
criteria.with_hidden = cbHidden.isChecked(); criteria.with_flagged = cbFlagged.isChecked();
criteria.with_encrypted = cbEncrypted.isChecked(); criteria.with_hidden = cbHidden.isChecked();
criteria.with_attachments = cbAttachments.isChecked(); criteria.with_encrypted = cbEncrypted.isChecked();
criteria.with_attachments = cbAttachments.isChecked();
if (!criteria.fts) {
int pos = spMessageSize.getSelectedItemPosition(); if (!criteria.fts) {
if (pos > 0) { int pos = spMessageSize.getSelectedItemPosition();
int[] sizes = getResources().getIntArray(R.array.sizeValues); if (pos > 0) {
criteria.with_size = sizes[pos]; int[] sizes = getResources().getIntArray(R.array.sizeValues);
criteria.with_size = sizes[pos];
}
} }
}
criteria.in_trash = cbSearchTrash.isChecked();
criteria.in_junk = cbSearchJunk.isChecked();
Object after = tvAfter.getTag(); criteria.in_trash = cbSearchTrash.isChecked();
Object before = tvBefore.getTag(); criteria.in_junk = cbSearchJunk.isChecked();
if (after != null) Object after = tvAfter.getTag();
criteria.after = ((Calendar) after).getTimeInMillis(); Object before = tvBefore.getTag();
if (before != null)
criteria.before = ((Calendar) before).getTimeInMillis();
boolean device = (cbSearchDevice.isChecked() || !cbSearchDevice.isEnabled()); if (after != null)
criteria.after = ((Calendar) after).getTimeInMillis();
if (before != null)
criteria.before = ((Calendar) before).getTimeInMillis();
if (criteria.query != null) { boolean device = (cbSearchDevice.isChecked() || !cbSearchDevice.isEnabled());
List<String> searches = new ArrayList<>();
for (int i = 1; i <= 3; i++)
if (prefs.contains("last_search" + i)) {
String search = prefs.getString("last_search" + i, null);
searches.add(search);
}
searches.remove(criteria.query);
searches.add(0, criteria.query);
SharedPreferences.Editor editor = prefs.edit(); if (criteria.query != null) {
for (int i = 1; i <= Math.min(3, searches.size()); i++) List<String> searches = new ArrayList<>();
editor.putString("last_search" + i, searches.get(i - 1)); for (int i = 1; i <= 3; i++)
editor.apply(); if (prefs.contains("last_search" + i)) {
} String search = prefs.getString("last_search" + i, null);
searches.add(search);
}
Helper.hideKeyboard(etQuery); searches.remove(criteria.query);
searches.add(0, criteria.query);
if (criteria.query != null && criteria.query.startsWith("raw:")) SharedPreferences.Editor editor = prefs.edit();
new SimpleTask<EntityFolder>() { for (int i = 1; i <= Math.min(3, searches.size()); i++)
@Override editor.putString("last_search" + i, searches.get(i - 1));
protected EntityFolder onExecute(Context context, Bundle args) { editor.apply();
long aid = args.getLong("account", -1); }
DB db = DB.getInstance(context); Helper.hideKeyboard(etQuery);
EntityAccount account = null;
if (aid < 0) { if (criteria.query != null && criteria.query.startsWith("raw:"))
List<EntityAccount> accounts = db.account().getSynchronizingAccounts(EntityAccount.TYPE_IMAP); new SimpleTask<EntityFolder>() {
if (accounts == null) @Override
protected EntityFolder onExecute(Context context, Bundle args) {
long aid = args.getLong("account", -1);
DB db = DB.getInstance(context);
EntityAccount account = null;
if (aid < 0) {
List<EntityAccount> accounts = db.account().getSynchronizingAccounts(EntityAccount.TYPE_IMAP);
if (accounts == null)
return null;
for (EntityAccount a : accounts)
if (a.isGmail())
if (account == null)
account = a;
else
return null;
} else
account = db.account().getAccount(aid);
if (account == null || !account.isGmail())
return null; return null;
for (EntityAccount a : accounts)
if (a.isGmail())
if (account == null)
account = a;
else
return null;
} else
account = db.account().getAccount(aid);
if (account == null || !account.isGmail())
return null;
return db.folder().getFolderByType(account.id, EntityFolder.ARCHIVE);
}
@Override
protected void onExecuted(Bundle args, EntityFolder archive) {
FragmentMessages.search(
context, getViewLifecycleOwner(), getParentFragmentManager(),
account,
archive == null ? folder : archive.id,
archive != null || !device,
criteria);
}
@Override return db.folder().getFolderByType(account.id, EntityFolder.ARCHIVE);
protected void onException(Bundle args, Throwable ex) { }
Log.e(ex);
} @Override
}.execute(context, getViewLifecycleOwner(), getArguments(), "search:raw"); protected void onExecuted(Bundle args, EntityFolder archive) {
else FragmentMessages.search(
FragmentMessages.search( context, getViewLifecycleOwner(), getParentFragmentManager(),
context, getViewLifecycleOwner(), getParentFragmentManager(), account,
account, folder, archive == null ? folder : archive.id,
!device, archive != null || !device,
criteria); criteria);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.e(ex);
}
}.execute(context, getViewLifecycleOwner(), getArguments(), "search:raw");
else
FragmentMessages.search(
context, getViewLifecycleOwner(), getParentFragmentManager(),
account, folder,
!device,
criteria);
} catch (Throwable ex) {
Log.e(ex);
}
} }
}) })
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {

Write Preview
Loading…
Cancel
Save