mirror of https://github.com/M66B/FairEmail.git
Fixed showing folder errors
This commit is contained in:
parent
9dbb3de598
commit
5c37918bb9
|
@ -204,7 +204,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
||||||
tvKeywords.setVisibility(debug && folder.keywords.length > 0 ? View.VISIBLE : View.GONE);
|
tvKeywords.setVisibility(debug && folder.keywords.length > 0 ? View.VISIBLE : View.GONE);
|
||||||
|
|
||||||
tvError.setText(folder.error);
|
tvError.setText(folder.error);
|
||||||
tvError.setVisibility(folder.error != null && BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
|
tvError.setVisibility(folder.error != null ? View.VISIBLE : View.GONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -245,6 +245,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
||||||
popupMenu.getMenu().add(Menu.NONE, action_empty_trash, 3, R.string.title_empty_trash);
|
popupMenu.getMenu().add(Menu.NONE, action_empty_trash, 3, R.string.title_empty_trash);
|
||||||
|
|
||||||
if (folder.account != null) {
|
if (folder.account != null) {
|
||||||
|
if (!folder.accountPop || EntityFolder.INBOX.equals(folder.type))
|
||||||
popupMenu.getMenu().add(Menu.NONE, action_edit_properties, 4, R.string.title_edit_properties);
|
popupMenu.getMenu().add(Menu.NONE, action_edit_properties, 4, R.string.title_edit_properties);
|
||||||
if (!folder.accountPop)
|
if (!folder.accountPop)
|
||||||
popupMenu.getMenu().add(Menu.NONE, action_edit_rules, 5, R.string.title_edit_rules);
|
popupMenu.getMenu().add(Menu.NONE, action_edit_rules, 5, R.string.title_edit_rules);
|
||||||
|
|
Loading…
Reference in New Issue