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

Small behavior improvement

This commit is contained in:
M66B 2019-01-31 12:23:48 +00:00
parent 2b0380a5c4
commit a390d525ae
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,9 +123,9 @@ public class FragmentMessages extends FragmentBase {
private boolean autonext;
private boolean addresses;
private long primary = -1;
private Long primary = null;
private boolean outbox = false;
private boolean connected = false;
private Boolean connected = null;
private boolean searching = false;
private AdapterMessage adapter;
@ -1396,7 +1396,8 @@ public class FragmentMessages extends FragmentBase {
public void onChanged(EntityAccount account) {
long primary = (account == null ? -1 : account.id);
boolean connected = (account != null && "connected".equals(account.state));
if (FragmentMessages.this.primary != primary || FragmentMessages.this.connected != connected) {
if (FragmentMessages.this.primary == null || FragmentMessages.this.connected == null ||
FragmentMessages.this.primary != primary || FragmentMessages.this.connected != connected) {
FragmentMessages.this.primary = primary;
FragmentMessages.this.connected = connected;
getActivity().invalidateOptionsMenu();
@ -1649,8 +1650,10 @@ public class FragmentMessages extends FragmentBase {
menu.findItem(R.id.menu_search).setVisible(viewType != AdapterMessage.ViewType.SEARCH);
menu.findItem(R.id.menu_folders).setVisible(primary >= 0);
menu.findItem(R.id.menu_folders).setIcon(connected ? R.drawable.baseline_folder_24 : R.drawable.baseline_folder_open_24);
menu.findItem(R.id.menu_folders).setVisible(primary == null || primary >= 0);
menu.findItem(R.id.menu_folders).setEnabled(primary != null);
menu.findItem(R.id.menu_folders).setIcon(
connected != null && connected ? R.drawable.baseline_folder_24 : R.drawable.baseline_folder_open_24);
menu.findItem(R.id.menu_sort_on).setVisible(!selection &&
(viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER));