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

Allow server search in other account/folder

This commit is contained in:
M66B 2022-11-15 15:21:51 +01:00
parent f8431041d3
commit b901fde5f2
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -1584,15 +1584,15 @@ public class FragmentMessages extends FragmentBase
fabSearch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (folder > 0) {
if (folder > 0 && !server) {
search(getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
account, folder, true, criteria);
return;
}
Bundle args = new Bundle();
args.putLong("account", account);
args.putLong("folder", folder);
args.putLong("account", server ? -1L : account);
args.putLong("folder", server ? -1L : folder);
new SimpleTask<List<EntityAccount>>() {
@Override
@ -1610,7 +1610,7 @@ public class FragmentMessages extends FragmentBase
result.add(account);
}
if (folder > 0) {
if (fid > 0) {
EntityFolder folder = db.folder().getFolder(fid);
if (folder != null)
args.putString("folderName", folder.getDisplayName(context));
@ -1626,7 +1626,7 @@ public class FragmentMessages extends FragmentBase
protected void onExecuted(Bundle args, List<EntityAccount> accounts) {
if (accounts.size() == 1) {
EntityAccount account = accounts.get(0);
if (account.isGmail())
if (account.isGmail() && !server)
searchArchive(account.id);
else
searchAccount(account.id);
@ -1656,7 +1656,7 @@ public class FragmentMessages extends FragmentBase
long account = intent.getLongExtra("account", -1);
boolean gmail = intent.getBooleanExtra("gmail", false);
if (gmail)
if (gmail && !server)
searchArchive(account);
else
searchAccount(account);
@ -1776,8 +1776,9 @@ public class FragmentMessages extends FragmentBase
else
fabCompose.hide();
if (viewType == AdapterMessage.ViewType.SEARCH && criteria != null && !server) {
if (criteria.with_hidden ||
if (viewType != AdapterMessage.ViewType.SEARCH ||
criteria == null ||
criteria.with_hidden ||
criteria.with_encrypted ||
criteria.with_attachments ||
criteria.with_notes ||
@ -1786,14 +1787,18 @@ public class FragmentMessages extends FragmentBase
if (animator != null && animator.isStarted())
animator.end();
} else {
fabSearch.setBackgroundTintList(ColorStateList.valueOf(
Helper.resolveColor(getContext(), server
? R.attr.colorSeparator
: R.attr.colorFabBackground)));
fabSearch.show();
if (server) {
if (animator != null && animator.isStarted())
animator.end();
} else {
if (animator != null && !animator.isStarted())
animator.start();
}
} else {
fabSearch.hide();
if (animator != null && animator.isStarted())
animator.end();
}
fabMore.hide();