From 12c47070fda2164ca46a0c606ff3a162c45d395b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 20 Jul 2019 21:47:07 +0200
Subject: [PATCH] Revert "Added option to enable unified system folders"

This reverts commit ded0259acc211040c52790702e2a20df4eb7d8cc.
---
 .../java/eu/faircode/email/ActivityView.java   | 18 ++++++++----------
 .../eu/faircode/email/FragmentOptions.java     |  2 +-
 .../faircode/email/FragmentOptionsDisplay.java | 12 +-----------
 .../res/layout/fragment_options_display.xml    | 12 ------------
 app/src/main/res/values/strings.xml            |  1 -
 5 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 58c47ba07b..6aca58976c 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -358,16 +358,14 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             }
         });
 
-        boolean unified_system = prefs.getBoolean("unified_system", false);
-        if (unified_system)
-            db.folder().liveUnifiedTypes().observe(this, new Observer<List<String>>() {
-                @Override
-                public void onChanged(List<String> types) {
-                    if (types == null)
-                        types = new ArrayList<>();
-                    uadapter.set(types);
-                }
-            });
+        db.folder().liveUnifiedTypes().observe(this, new Observer<List<String>>() {
+            @Override
+            public void onChanged(List<String> types) {
+                if (types == null)
+                    types = new ArrayList<>();
+                uadapter.set(types);
+            }
+        });
 
         db.folder().liveNavigation().observe(this, new Observer<List<TupleFolderNav>>() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 43ad3c5dbe..72c29d841e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -39,7 +39,7 @@ public class FragmentOptions extends FragmentBase {
 
     static String[] OPTIONS_RESTART = new String[]{
             "startup", "date", "threading", "avatars", "identicons", "circular", "name_email", "subject_italic", "flags", "preview",
-            "addresses", "attachments_alt", "contrast", "monospaced", "autohtml", "autoimages", "actionbar", "unified_system",
+            "addresses", "attachments_alt", "contrast", "monospaced", "autohtml", "autoimages", "actionbar",
             "autoscroll", "swipenav", "autoexpand", "autoclose", "autonext",
             "subscriptions", "debug",
             "biometrics"
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 1ed4555585..7551fd05aa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -63,12 +63,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
     private SwitchCompat swCollapseQuotes;
     private SwitchCompat swRemoteContent;
     private SwitchCompat swActionbar;
-    private SwitchCompat swUnifiedSystem;
 
     private final static String[] RESET_OPTIONS = new String[]{
             "theme", "startup", "date", "threading", "avatars", "identicons", "circular", "name_email", "subject_italic",
             "flags", "preview", "addresses", "attachments_alt",
-            "contrast", "monospaced", "inline_images", "autoimages", "collapse_quotes", "autocontent", "actionbar", "unified_system"
+            "contrast", "monospaced", "inline_images", "autoimages", "collapse_quotes", "autocontent", "actionbar",
     };
 
     @Override
@@ -101,7 +100,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swCollapseQuotes = view.findViewById(R.id.swCollapseQuotes);
         swRemoteContent = view.findViewById(R.id.swRemoteContent);
         swActionbar = view.findViewById(R.id.swActionbar);
-        swUnifiedSystem = view.findViewById(R.id.swUnifiedSystem);
 
         setOptions();
 
@@ -258,13 +256,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             }
         });
 
-        swUnifiedSystem.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("unified_system", checked).apply();
-            }
-        });
-
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 
         return view;
@@ -338,7 +329,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swCollapseQuotes.setChecked(prefs.getBoolean("collapse_quotes", false));
         swRemoteContent.setChecked(prefs.getBoolean("autocontent", false));
         swActionbar.setChecked(prefs.getBoolean("actionbar", true));
-        swUnifiedSystem.setChecked(prefs.getBoolean("unified_system", false));
     }
 
     public static class FragmentDialogTheme extends DialogFragmentEx {
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index d0e2015158..3dfce9a0a5 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -339,18 +339,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvRemoteContentHint"
                 app:switchPadding="12dp" />
-
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/swUnifiedSystem"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:checked="false"
-                android:text="@string/title_advanced_unified_system"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/swActionbar"
-                app:switchPadding="12dp" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 042caf758e..c284dff9e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -224,7 +224,6 @@
     <string name="title_advanced_collapse_quotes">Collapse quoted text</string>
     <string name="title_advanced_remote_content">Automatically show remote content when viewing original messages</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
-    <string name="title_advanced_unified_system">Show unified folders in navigation menu</string>
 
     <string name="title_advanced_pull_refresh">Pull down to refresh</string>
     <string name="title_advanced_autoscroll">Scroll to top on receiving new messages</string>