diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java index b495131e46..4d83e74e12 100644 --- a/app/src/main/java/eu/faircode/email/AdapterFolder.java +++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java @@ -90,7 +90,6 @@ public class AdapterFolder extends RecyclerView.Adapter ids) { disabledIds = ids; } public void set(@NonNull List folders) { - Log.i("Set folders=" + folders.size() + " search=" + search + - " atop=" + sort_unread_atop + " hide=" + folder_hide_read); + Log.i("Set folders=" + folders.size() + " search=" + search); all = folders; List hierarchical; if (account < 0 && !primary) { - List selected; - if (folder_hide_read) { - selected = new ArrayList<>(); - for (TupleFolderEx folder : folders) - if (folder.unseen > 0) - selected.add(folder); - } else - selected = folders; - - if (selected.size() > 0) - Collections.sort(selected, folders.get(0).getComparator(context)); + if (folders.size() > 0) + Collections.sort(folders, folders.get(0).getComparator(context)); + hierarchical = folders; if (sort_unread_atop) - Collections.sort(selected, new Comparator() { + Collections.sort(hierarchical, new Comparator() { @Override public int compare(TupleFolderEx f1, TupleFolderEx f2) { return -Boolean.compare(f1.unseen > 0, f2.unseen > 0); } }); - - hierarchical = selected; } else { List parents = new ArrayList<>(); Map idFolder = new HashMap<>(); diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index f464d24514..62122d39fb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -663,7 +663,6 @@ public class FragmentFolders extends FragmentBase { boolean subscriptions = prefs.getBoolean("subscriptions", false); boolean subscribed_only = prefs.getBoolean("subscribed_only", false); boolean sort_unread_atop = prefs.getBoolean("sort_unread_atop", false); - boolean folder_hide_read = prefs.getBoolean("folder_hide_read", false); menu.findItem(R.id.menu_unified).setVisible(account < 0 || primary); menu.findItem(R.id.menu_compact).setChecked(compact); @@ -674,9 +673,6 @@ public class FragmentFolders extends FragmentBase { .setChecked(subscribed_only) .setVisible(subscriptions); menu.findItem(R.id.menu_sort_unread_atop).setChecked(sort_unread_atop); - menu.findItem(R.id.menu_hide_read) - .setChecked(folder_hide_read) - .setVisible(account < 0 && !primary); menu.findItem(R.id.menu_apply_all).setVisible(account >= 0 && imap); menu.findItem(R.id.menu_edit_account_name).setVisible(account >= 0); @@ -710,9 +706,6 @@ public class FragmentFolders extends FragmentBase { } else if (itemId == R.id.menu_sort_unread_atop) { onMenuSortUnreadAtop(); return true; - } else if (itemId == R.id.menu_hide_read) { - onMenuHideRead(); - return true; } else if (itemId == R.id.menu_search_folder) { onMenuSearchFolder(item); return true; @@ -817,14 +810,6 @@ public class FragmentFolders extends FragmentBase { adapter.setSortUnreadAtop(sort_unread_atop); } - private void onMenuHideRead() { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - boolean folder_hide_read = !prefs.getBoolean("folder_hide_read", false); - prefs.edit().putBoolean("folder_hide_read", folder_hide_read).apply(); - invalidateOptionsMenu(); - adapter.setHideRead(folder_hide_read); - } - private void onMenuSearchFolder(MenuItem item) { if (item.isActionViewExpanded()) item.collapseActionView(); diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml index 80ccbd9c17..d5d8e4346d 100644 --- a/app/src/main/res/menu/menu_folders.xml +++ b/app/src/main/res/menu/menu_folders.xml @@ -53,12 +53,6 @@ android:checkable="true" android:title="@string/title_sort_unread_atop" app:showAsAction="never" /> - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2bbcbda483..e1a774a238 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1060,7 +1060,6 @@ Show starred message count Subscribed only Sort unread on top - Hide all read Search for folder Apply to all Edit account name