From 3d6ffadc5eed59b31f124ae435bdf7988e97750e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 15 Jun 2019 11:58:56 +0200
Subject: [PATCH] Bring back folder hiding

---
 .../java/eu/faircode/email/AdapterFolder.java | 29 ++++++++++++++-----
 .../eu/faircode/email/AdapterMessage.java     |  2 +-
 .../java/eu/faircode/email/DaoFolder.java     |  3 +-
 .../java/eu/faircode/email/EntityFolder.java  |  7 ++++-
 .../eu/faircode/email/FragmentFolder.java     |  8 ++++-
 .../eu/faircode/email/FragmentFolders.java    | 26 ++++++++++++++++-
 .../eu/faircode/email/FragmentMessages.java   |  2 +-
 app/src/main/res/layout/fragment_folder.xml   | 11 ++++++-
 app/src/main/res/menu/menu_folders.xml        |  6 ++++
 app/src/main/res/values/strings.xml           |  2 ++
 10 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 0bb5d2f44d..b2fa4b13c8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -66,6 +66,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     private Context context;
     private LayoutInflater inflater;
     private LifecycleOwner owner;
+    private boolean show_hidden;
 
     private long account;
     private IFolderSelectedListener listener;
@@ -152,7 +153,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
         private void bindTo(final TupleFolderEx folder) {
             view.setActivated(folder.tbc != null || folder.tbd != null);
-            view.setAlpha(disabledIds.contains(folder.id) ? Helper.LOW_LIGHT : 1.0f);
+            view.setAlpha(folder.hide || disabledIds.contains(folder.id) ? Helper.LOW_LIGHT : 1.0f);
 
             if (textSize != 0)
                 tvName.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
@@ -675,10 +676,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         }
     }
 
-    AdapterFolder(Context context, LifecycleOwner owner, long account, IFolderSelectedListener listener) {
+    AdapterFolder(Context context, LifecycleOwner owner, long account, boolean show_hidden, IFolderSelectedListener listener) {
         this.context = context;
         this.inflater = LayoutInflater.from(context);
         this.owner = owner;
+        this.show_hidden = show_hidden;
         this.account = account;
         this.listener = listener;
 
@@ -699,6 +701,13 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         setHasStableIds(true);
     }
 
+    void setShowHidden(boolean show_hidden) {
+        if (this.show_hidden != show_hidden) {
+            this.show_hidden = show_hidden;
+            set(all);
+        }
+    }
+
     void setDisabled(List<Long> ids) {
         disabledIds = ids;
     }
@@ -790,12 +799,13 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     List<TupleFolderEx> getHierarchical(List<TupleFolderEx> parents, int indentation) {
         List<TupleFolderEx> result = new ArrayList<>();
 
-        for (TupleFolderEx parent : parents) {
-            parent.indentation = indentation;
-            result.add(parent);
-            if (!parent.collapsed && parent.child_refs != null)
-                result.addAll(getHierarchical(parent.child_refs, indentation + 1));
-        }
+        for (TupleFolderEx parent : parents)
+            if (!parent.hide || show_hidden) {
+                parent.indentation = indentation;
+                result.add(parent);
+                if (!parent.collapsed && parent.child_refs != null)
+                    result.addAll(getHierarchical(parent.child_refs, indentation + 1));
+            }
 
         return result;
     }
@@ -836,6 +846,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             TupleFolderEx p1 = f1.parent_ref;
             TupleFolderEx p2 = f2.parent_ref;
             while (p1 != null && p2 != null) {
+                if (p1.hide != p2.hide)
+                    return false;
+
                 if (p1.collapsed != p2.collapsed)
                     return false;
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e9ba128996..55bda61418 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2961,7 +2961,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             LinearLayoutManager llm = new LinearLayoutManager(context);
             rvFolder.setLayoutManager(llm);
 
-            final AdapterFolder adapter = new AdapterFolder(context, owner, data.message.account,
+            final AdapterFolder adapter = new AdapterFolder(context, owner, data.message.account, false,
                     new AdapterFolder.IFolderSelectedListener() {
                         @Override
                         public void onFolderSelected(TupleFolderEx folder) {
diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index 93b33a3dda..a3f7133c2b 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -221,6 +221,7 @@ public interface DaoFolder {
             ", unified = :unified" +
             ", navigation = :navigation" +
             ", notify = :notify" +
+            ", hide = :hide" +
             ", synchronize = :synchronize" +
             ", poll = :poll" +
             ", download = :download" +
@@ -230,7 +231,7 @@ public interface DaoFolder {
             " WHERE id = :id")
     int setFolderProperties(
             long id,
-            String display, boolean unified, boolean navigation, boolean notify,
+            String display, boolean unified, boolean navigation, boolean notify, boolean hide,
             boolean synchronize, boolean poll, boolean download,
             int sync_days, int keep_days, boolean auto_delete);
 
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index 4d1c54f8da..108dd89db1 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -85,7 +85,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
     public Boolean auto_delete = false;
     public String display;
     @NonNull
-    public Boolean hide = false; // obsolete
+    public Boolean hide = false;
     @NonNull
     public Boolean collapsed = false;
     @NonNull
@@ -289,6 +289,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
                     this.keep_days.equals(other.keep_days) &&
                     Objects.equals(this.display, other.display) &&
                     Objects.equals(this.order, other.order) &&
+                    this.hide == other.hide &&
                     this.collapsed == other.collapsed &&
                     this.unified == other.unified &&
                     this.notify == other.notify &&
@@ -322,6 +323,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
         json.put("keep_days", keep_days);
         json.put("auto_delete", auto_delete);
         json.put("display", display);
+        json.put("hide", hide);
         json.put("collapsed", collapsed);
         json.put("unified", unified);
         json.put("navigation", navigation);
@@ -364,6 +366,9 @@ public class EntityFolder extends EntityOrder implements Serializable {
         if (json.has("display") && !json.isNull("display"))
             folder.display = json.getString("display");
 
+        if (json.has("hide"))
+            folder.hide = json.getBoolean("hide");
+
         if (json.has("collapsed"))
             folder.collapsed = json.getBoolean("collapsed");
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index d725d0be65..d43f36920c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -46,6 +46,7 @@ public class FragmentFolder extends FragmentBase {
     private ViewGroup view;
     private EditText etName;
     private EditText etDisplay;
+    private CheckBox cbHide;
     private CheckBox cbUnified;
     private CheckBox cbNavigation;
     private CheckBox cbNotify;
@@ -87,6 +88,7 @@ public class FragmentFolder extends FragmentBase {
         // Get controls
         etName = view.findViewById(R.id.etName);
         etDisplay = view.findViewById(R.id.etDisplay);
+        cbHide = view.findViewById(R.id.cbHide);
         cbUnified = view.findViewById(R.id.cbUnified);
         cbNavigation = view.findViewById(R.id.cbNavigation);
         cbNotify = view.findViewById(R.id.cbNotify);
@@ -151,6 +153,7 @@ public class FragmentFolder extends FragmentBase {
         args.putLong("account", account);
         args.putString("name", etName.getText().toString());
         args.putString("display", etDisplay.getText().toString());
+        args.putBoolean("hide", cbHide.isChecked());
         args.putBoolean("unified", cbUnified.isChecked());
         args.putBoolean("navigation", cbNavigation.isChecked());
         args.putBoolean("notify", cbNotify.getVisibility() == View.VISIBLE && cbNotify.isChecked());
@@ -186,6 +189,7 @@ public class FragmentFolder extends FragmentBase {
                 long aid = args.getLong("account");
                 String name = args.getString("name");
                 String display = args.getString("display");
+                boolean hide = args.getBoolean("hide");
                 boolean unified = args.getBoolean("unified");
                 boolean navigation = args.getBoolean("navigation");
                 boolean notify = args.getBoolean("notify");
@@ -224,6 +228,7 @@ public class FragmentFolder extends FragmentBase {
                         create.name = name;
                         create.display = display;
                         create.type = EntityFolder.USER;
+                        create.hide = hide;
                         create.unified = unified;
                         create.navigation = navigation;
                         create.notify = notify;
@@ -240,7 +245,7 @@ public class FragmentFolder extends FragmentBase {
 
                         Log.i("Updating folder=" + name);
                         db.folder().setFolderProperties(id,
-                                display, unified, navigation, notify,
+                                display, unified, navigation, notify, hide,
                                 synchronize, poll, download,
                                 sync_days, keep_days, auto_delete);
                         db.folder().setFolderError(id, null);
@@ -403,6 +408,7 @@ public class FragmentFolder extends FragmentBase {
                     etName.setText(folder == null ? null : folder.name);
                     etDisplay.setText(folder == null ? null : folder.display);
                     etDisplay.setHint(folder == null ? null : Helper.localizeFolderName(getContext(), folder.name));
+                    cbHide.setChecked(folder == null ? false : folder.hide);
                     cbUnified.setChecked(folder == null ? false : folder.unified);
                     cbNavigation.setChecked(folder == null ? false : folder.navigation);
                     cbNotify.setChecked(folder == null ? false : folder.notify);
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 84bd3f168e..f601fc128f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -66,6 +66,7 @@ public class FragmentFolders extends FragmentBase {
     private FloatingActionButton fabError;
 
     private long account;
+    private boolean show_hidden = false;
     private String searching = null;
     private AdapterFolder adapter;
 
@@ -143,7 +144,7 @@ public class FragmentFolders extends FragmentBase {
         itemDecorator.setDrawable(getContext().getDrawable(R.drawable.divider));
         rvFolder.addItemDecoration(itemDecorator);
 
-        adapter = new AdapterFolder(getContext(), getViewLifecycleOwner(), account, null);
+        adapter = new AdapterFolder(getContext(), getViewLifecycleOwner(), account, show_hidden, null);
         rvFolder.setAdapter(adapter);
 
         fab.setOnClickListener(new View.OnClickListener() {
@@ -394,4 +395,27 @@ public class FragmentFolders extends FragmentBase {
 
         super.onCreateOptionsMenu(menu, inflater);
     }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        menu.findItem(R.id.menu_show_hidden).setChecked(show_hidden);
+        super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_show_hidden:
+                onMenuShowHidden();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void onMenuShowHidden() {
+        show_hidden = !show_hidden;
+        getActivity().invalidateOptionsMenu();
+        adapter.setShowHidden(show_hidden);
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6956a319ed..2cc8c1eec9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1869,7 +1869,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         LinearLayoutManager llm = new LinearLayoutManager(getContext());
         rvFolder.setLayoutManager(llm);
 
-        final AdapterFolder adapter = new AdapterFolder(getContext(), getViewLifecycleOwner(), account,
+        final AdapterFolder adapter = new AdapterFolder(getContext(), getViewLifecycleOwner(), account, false,
                 new AdapterFolder.IFolderSelectedListener() {
                     @Override
                     public void onFolderSelected(TupleFolderEx folder) {
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 0c4a619cc1..c4ae0c8177 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -58,6 +58,15 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvDisplay" />
 
+            <CheckBox
+                android:id="@+id/cbHide"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/title_hide_folder"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/etDisplay" />
+
             <CheckBox
                 android:id="@+id/cbUnified"
                 android:layout_width="wrap_content"
@@ -65,7 +74,7 @@
                 android:layout_marginTop="12dp"
                 android:text="@string/title_unified_folder"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/etDisplay" />
+                app:layout_constraintTop_toBottomOf="@id/cbHide" />
 
             <CheckBox
                 android:id="@+id/cbNavigation"
diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml
index 38f71a0ad1..b621a2ae0d 100644
--- a/app/src/main/res/menu/menu_folders.xml
+++ b/app/src/main/res/menu/menu_folders.xml
@@ -8,4 +8,10 @@
         android:title="@string/title_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="collapseActionView|always" />
+
+    <item
+        android:id="@+id/menu_show_hidden"
+        android:checkable="true"
+        android:title="@string/title_show_folders"
+        app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4be65537d..1db0f54694 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -357,6 +357,8 @@
 
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
+    <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide folder</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_navigation_folder">Show in navigation menu</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>