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

Merge branch 'stable'

This commit is contained in:
M66B 2019-12-16 11:36:24 +01:00
parent 0bf59f64a9 e7830366c8
commit bdd387e8b0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
View File

@ -489,7 +489,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
rules, null); rules, null);
found++; found++;
} }
if (message != null) if (message != null && query != null)
if (threading) if (threading)
db.message().setMessageFound(message.account, message.thread); db.message().setMessageFound(message.account, message.thread);
else else

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

@ -2765,8 +2765,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
(viewType == AdapterMessage.ViewType.UNIFIED && !EntityFolder.DRAFTS.equals(type)) || (viewType == AdapterMessage.ViewType.UNIFIED && !EntityFolder.DRAFTS.equals(type)) ||
(viewType == AdapterMessage.ViewType.FOLDER && !EntityFolder.DRAFTS.equals(type)); (viewType == AdapterMessage.ViewType.FOLDER && !EntityFolder.DRAFTS.equals(type));
menu.findItem(R.id.menu_search).setVisible( MenuItem menuSearch = menu.findItem(R.id.menu_search);
menuSearch.setVisible(
viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER); viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER);
if (!menuSearch.isVisible())
menuSearch.collapseActionView();
menu.findItem(R.id.menu_folders).setVisible(viewType == AdapterMessage.ViewType.UNIFIED && primary >= 0); menu.findItem(R.id.menu_folders).setVisible(viewType == AdapterMessage.ViewType.UNIFIED && primary >= 0);
ImageButton ib = (ImageButton) menu.findItem(R.id.menu_folders).getActionView(); ImageButton ib = (ImageButton) menu.findItem(R.id.menu_folders).getActionView();