Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 14:46:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Directly continue search on server for single folder

Browse Source
This commit is contained in:
M66B
2020-04-10 08:57:32 +02:00
parent c750666617
commit ee918757a3
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -969,6 +969,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
fabSearch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (folder > 0) {
search(getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
account, folder, true, criteria);
return;
}
Bundle args = new Bundle();
args.putLong("account", account);
args.putLong("folder", folder);
@@ -1019,24 +1025,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
popupMenu.getMenu().add(Menu.NONE, 0, order++, ss)
.setEnabled(false);
String folderName = args.getString("folderName", null);
if (!TextUtils.isEmpty(folderName))
popupMenu.getMenu().add(Menu.NONE, 1, order++, folderName);
for (EntityAccount account : accounts)
popupMenu.getMenu().add(Menu.NONE, 2, order++, account.name)
popupMenu.getMenu().add(Menu.NONE, 1, order++, account.name)
.setIntent(new Intent().putExtra("account", account.id));
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem target) {
if (target.getItemId() == 1) { // Search same folder
search(
getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
account, folder, true, criteria);
return true;
}
Intent intent = target.getIntent();
if (intent == null)
return false;