From 084265a1ce6f16a05ce3b1cf9016f6cb520e0794 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 14 Feb 2019 08:55:20 +0000
Subject: [PATCH] Always collapse multiple expanded messages

---
 .../eu/faircode/email/FragmentMessages.java   |  7 +--
 app/src/main/res/layout/fragment_options.xml  | 43 ++++++++++++-------
 app/src/main/res/values/strings.xml           | 17 ++++----
 3 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c92beebb70..24062100bb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2478,13 +2478,14 @@ public class FragmentMessages extends FragmentBase {
                 return true;
             }
 
-            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-            if (prefs.getBoolean("collapse", false))
-                if (values.containsKey("expanded") && values.get("expanded").size() > 0) {
+            if (values.containsKey("expanded")) {
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+                if (values.get("expanded").size() > 1 || prefs.getBoolean("collapse", false)) {
                     values.get("expanded").clear();
                     adapter.notifyDataSetChanged();
                     return true;
                 }
+            }
 
             return false;
         }
diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index c7fe41c7c5..699c86bf0d 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -462,17 +462,42 @@
             app:layout_constraintTop_toBottomOf="@id/swAutoExpand" />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swAutoClose"
+            android:id="@+id/swCollapse"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:layout_marginTop="12dp"
             android:layout_marginEnd="12dp"
-            android:text="@string/title_advanced_autoclose"
+            android:text="@string/title_advanced_collapse"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAutoExpandHint"
             app:switchPadding="12dp" />
 
+        <TextView
+            android:id="@+id/tvAutoCollapseHint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="60dp"
+            android:text="@string/title_advanced_autocollapse_hint"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swCollapse" />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swAutoClose"
+            android:layout_width="match_parent"
+            android:layout_height="22dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="12dp"
+            android:text="@string/title_advanced_autoclose"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAutoCollapseHint"
+            app:switchPadding="12dp" />
+
         <TextView
             android:id="@+id/tvAutoCloseHint"
             android:layout_width="0dp"
@@ -498,18 +523,6 @@
             app:layout_constraintTop_toBottomOf="@id/tvAutoCloseHint"
             app:switchPadding="12dp" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swCollapse"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="12dp"
-            android:text="@string/title_advanced_collapse"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swAutoNext"
-            app:switchPadding="12dp" />
-
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swAutoRead"
             android:layout_width="match_parent"
@@ -519,7 +532,7 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_autoread"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swCollapse"
+            app:layout_constraintTop_toBottomOf="@id/swAutoNext"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 343382ce41..6f1727936c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -141,6 +141,7 @@
     <string name="title_advanced_section_misc">Miscellaneous</string>
 
     <string name="title_advanced_enabled">Synchronize</string>
+    <string name="title_advanced_updates">Check for updates</string>
 
     <string name="title_advanced_metered">Use metered connections</string>
     <string name="title_advanced_download">Automatically download messages and attachments on a metered connection up to</string>
@@ -158,24 +159,21 @@
     <string name="title_advanced_images">Automatically show images for known contacts</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
 
-    <string name="title_advanced_notify_preview">Show message preview in notifications</string>
-    <string name="title_advanced_light">Use notification light</string>
-    <string name="title_advanced_sound">Select notification sound</string>
-
     <string name="title_advanced_pull_refresh">Pull down to refresh</string>
-    <string name="title_advanced_autoexpand">Automatically expand messages</string>
-    <string name="title_advanced_autoclose">Automatically close conversations</string>
     <string name="title_advanced_swipenav">Swipe left/right to go to next/previous conversation</string>
+    <string name="title_advanced_autoexpand">Automatically expand messages</string>
+    <string name="title_advanced_collapse">Collapse messages in conversations on \'back\'</string>
+    <string name="title_advanced_autoclose">Automatically close conversations</string>
     <string name="title_advanced_autonext">Automatically go to next conversation on close conversation</string>
     <string name="title_advanced_autoread">Automatically mark messages read on moving messages</string>
-    <string name="title_advanced_collapse">Collapse messages in conversations on \'back\'</string>
     <string name="title_advanced_automove">Confirm moving messages</string>
-    <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
     <string name="title_advanced_autoresize">Automatically resize images for displaying on screens</string>
     <string name="title_advanced_sender">Allow editing sender address</string>
     <string name="title_advanced_autosend">Confirm sending messages</string>
 
-    <string name="title_advanced_updates">Check for updates</string>
+    <string name="title_advanced_notify_preview">Show message preview in notifications</string>
+    <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_debug">Debug mode</string>
 
     <string name="title_advanced_enabled_hint">Globally disable or enable receiving and sending of messages</string>
@@ -186,6 +184,7 @@
     <string name="title_advanced_name_email_hint">When disabled only names will be shown when available</string>
     <string name="title_advanced_preview_hint">Only available when message text was downloaded</string>
     <string name="title_advanced_autoexpand_hint">Automatically open message when there is just one message or just one unread message in a conversation</string>
+    <string name="title_advanced_autocollapse_hint">Multiple expanded messages will always be closed on \'back\'</string>
     <string name="title_advanced_autoclose_hint">Automatically close conversations when all messages are archived, sent or trashed</string>
     <string name="title_advanced_sender_hint">Most providers do not allow modified sender addresses</string>