Fixed showing folder errors

This commit is contained in:
M66B 2019-02-10 19:21:07 +00:00
parent 9dbb3de598
commit 5c37918bb9
1 changed files with 3 additions and 2 deletions

View File

@ -204,7 +204,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
tvKeywords.setVisibility(debug && folder.keywords.length > 0 ? View.VISIBLE : View.GONE);
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
@ -245,7 +245,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
popupMenu.getMenu().add(Menu.NONE, action_empty_trash, 3, R.string.title_empty_trash);
if (folder.account != null) {
popupMenu.getMenu().add(Menu.NONE, action_edit_properties, 4, R.string.title_edit_properties);
if (!folder.accountPop || EntityFolder.INBOX.equals(folder.type))
popupMenu.getMenu().add(Menu.NONE, action_edit_properties, 4, R.string.title_edit_properties);
if (!folder.accountPop)
popupMenu.getMenu().add(Menu.NONE, action_edit_rules, 5, R.string.title_edit_rules);
}