From 300c95c8ddf653b9d9bad7c7f5b2c27640584392 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Wed, 24 Apr 2024 16:57:42 +0200
Subject: [PATCH 01/29] Design settings auto advance

---
 .idea/navEditor.xml                           | 170 ++++++++++--------
 .../settings/AutoAdvanceSettingsFragment.kt   |  45 +++++
 .../main/settings/SettingRadioButtonView.kt   |   9 +
 .../mail/ui/main/settings/SettingsFragment.kt |   4 +
 .../layout/fragment_auto_advance_settings.xml |  74 ++++++++
 app/src/main/res/layout/fragment_settings.xml |   9 +
 .../res/layout/view_setting_radio_button.xml  |  22 ++-
 .../main/res/navigation/main_navigation.xml   |  44 +++++
 app/src/main/res/values-de/strings.xml        |  11 ++
 app/src/main/res/values-es/strings.xml        |  11 ++
 app/src/main/res/values-fr/strings.xml        |  11 ++
 app/src/main/res/values-it/strings.xml        |  11 ++
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/strings.xml           |  11 ++
 14 files changed, 356 insertions(+), 77 deletions(-)
 create mode 100644 app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_auto_advance_settings.xml

diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index 4826d3d1ea..a97de92654 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -13,8 +13,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="1834" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -25,8 +25,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="4708" />
+                            <option name="x" value="1476" />
+                            <option name="y" value="1410" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -61,8 +61,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="3614" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="2859" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -73,8 +73,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="4682" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="1436" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -85,7 +85,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="12" />
+                            <option name="x" value="744" />
                             <option name="y" value="368" />
                           </Point>
                         </option>
@@ -106,8 +106,20 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="2696" />
-                            <option name="y" value="12" />
+                            <option name="x" value="12" />
+                            <option name="y" value="368" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="autoAdvanceFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="1720" />
+                            <option name="y" value="2503" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -118,8 +130,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="2546" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="5394" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -130,8 +142,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="1122" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="3970" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -142,8 +154,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="766" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="3614" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -154,8 +166,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="410" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="3258" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -166,8 +178,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="724" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="3571" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -192,8 +204,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="5750" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="368" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -204,7 +216,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="256" />
+                            <option name="x" value="988" />
                             <option name="y" value="368" />
                           </Point>
                         </option>
@@ -217,7 +229,7 @@
                         <option name="myPosition">
                           <Point>
                             <option name="x" value="988" />
-                            <option name="y" value="368" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -228,8 +240,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="1478" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="4326" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -240,8 +252,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="5394" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="724" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -264,7 +276,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
+                            <option name="x" value="2208" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -276,8 +288,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="5038" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="1792" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -288,7 +300,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1476" />
+                            <option name="x" value="2696" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -300,8 +312,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="2190" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="5038" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -331,7 +343,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
+                            <option name="x" value="2452" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -355,8 +367,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="3970" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="6462" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -367,8 +379,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="3479" />
+                            <option name="x" value="1476" />
+                            <option name="y" value="6327" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -400,8 +412,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="3184" />
-                            <option name="y" value="12" />
+                            <option name="x" value="500" />
+                            <option name="y" value="368" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -412,8 +424,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="2940" />
-                            <option name="y" value="12" />
+                            <option name="x" value="256" />
+                            <option name="y" value="368" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -424,7 +436,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="2452" />
+                            <option name="x" value="3672" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -448,7 +460,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
+                            <option name="x" value="3184" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -460,8 +472,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="5750" />
+                            <option name="x" value="1476" />
+                            <option name="y" value="368" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -481,8 +493,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="1436" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="4284" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -507,12 +519,17 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="2179" />
+                            <option name="x" value="1476" />
+                            <option name="y" value="3571" />
                           </Point>
                         </option>
                         <option name="myPositions">
                           <map>
+                            <entry key="action_settingsFragment_to_aiEngineSettingFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
                             <entry key="action_settings_to_accentColorSetting">
                               <value>
                                 <LayoutPositions />
@@ -523,6 +540,11 @@
                                 <LayoutPositions />
                               </value>
                             </entry>
+                            <entry key="action_settings_to_autoAdvanceSettings">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
                             <entry key="action_settings_to_dataManagementSettings">
                               <value>
                                 <LayoutPositions />
@@ -573,8 +595,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="1834" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="5038" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -585,8 +607,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="2190" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="4682" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -597,8 +619,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="3258" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="6106" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -609,8 +631,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="3258" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="6106" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -630,8 +652,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="4326" />
+                            <option name="x" value="1720" />
+                            <option name="y" value="1080" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -642,7 +664,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="2208" />
+                            <option name="x" value="3428" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -654,8 +676,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="1080" />
+                            <option name="x" value="1476" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -666,8 +688,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="3835" />
+                            <option name="x" value="1476" />
+                            <option name="y" value="3215" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -678,8 +700,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="2546" />
+                            <option name="x" value="1232" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -690,8 +712,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="500" />
-                            <option name="y" value="4694" />
+                            <option name="x" value="1232" />
+                            <option name="y" value="3201" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -746,8 +768,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="2902" />
+                            <option name="x" value="1964" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -758,7 +780,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
+                            <option name="x" value="2940" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
new file mode 100644
index 0000000000..b107cd0dae
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -0,0 +1,45 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2024 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.main.settings
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.infomaniak.lib.core.utils.safeBinding
+import com.infomaniak.mail.data.LocalSettings
+import com.infomaniak.mail.databinding.FragmentAutoAdvanceSettingsBinding
+import com.infomaniak.mail.databinding.FragmentThemeSettingBinding
+import javax.inject.Inject
+
+class AutoAdvanceSettingsFragment : Fragment() {
+
+    private var binding: FragmentAutoAdvanceSettingsBinding by safeBinding()
+
+    @Inject
+    lateinit var localSettings: LocalSettings
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return FragmentAutoAdvanceSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+    }
+}
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
index bfe1725c3c..f8da251b18 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
@@ -20,6 +20,7 @@ package com.infomaniak.mail.ui.main.settings
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.annotation.ColorInt
@@ -55,9 +56,17 @@ class SettingRadioButtonView @JvmOverloads constructor(
                 associatedValue = getString(R.styleable.SettingRadioButtonView_value)
 
                 setIcon(iconDrawable)
+
                 text.text = textString
                 checkMark.setColorFilter(checkMarkColor)
 
+                getString(R.styleable.SettingRadioButtonView_subText).let {
+                    subText.apply {
+                        subText.text = it
+                        isGone = it == null
+                    }
+                }
+
                 root.setOnClickListener {
                     (parent as? OnCheckListener)?.onChecked(this@SettingRadioButtonView.id) ?: onClickListener?.onClick(root)
                 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
index a12254cd84..b6f91a6615 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
@@ -159,6 +159,10 @@ class SettingsFragment : Fragment() {
         settingsDataManagement.setOnClickListener {
             animatedNavigation(SettingsFragmentDirections.actionSettingsToDataManagementSettings())
         }
+
+        settingsAutomaticAdvance.setOnClickListener {
+            animatedNavigation(SettingsFragmentDirections.actionSettingsToAutoAdvanceSettings())
+        }
     }
 
     private fun observeFeatureFlag() {
diff --git a/app/src/main/res/layout/fragment_auto_advance_settings.xml b/app/src/main/res/layout/fragment_auto_advance_settings.xml
new file mode 100644
index 0000000000..aed2098580
--- /dev/null
+++ b/app/src/main/res/layout/fragment_auto_advance_settings.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2024 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.infomaniak.mail.ui.main.menu.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:title="@string/settingsAutoAdvanceTitle">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/SettingHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settingsAutoAdvanceDescription" />
+
+            <com.infomaniak.mail.ui.main.settings.SettingRadioGroupView
+                android:id="@+id/radioGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
+                    android:id="@+id/lastThread"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:text="@string/settingsAutoAdvancePreviousThreadTitle" />
+
+                <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
+                    android:id="@+id/nextThread"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:text="@string/settingsAutoAdvanceFollowingThreadTitle" />
+
+                <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
+                    android:id="@+id/listThread"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:text="@string/settingsAutoAdvanceListOfThreadsTitle" />
+
+                <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
+                    android:id="@+id/lastAction"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:subText="@string/settingsAutoAdvanceNaturalThreadHint"
+                    app:text="@string/settingsAutoAdvanceNaturalThreadTitle" />
+
+
+            </com.infomaniak.mail.ui.main.settings.SettingRadioGroupView>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</com.infomaniak.mail.ui.main.menu.SimpleSettingView>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index feea381108..99ff6c9d7b 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -102,6 +102,15 @@
                 app:title="@string/settingsExternalContentTitle"
                 tools:subtitle="@string/settingsOptionAskMe" />
 
+            <com.infomaniak.mail.ui.main.settings.ItemSettingView
+                android:id="@+id/settingsAutomaticAdvance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:itemAction="chevron"
+                app:title="@string/settingsAutoAdvanceTitle"
+                tools:subtitle="@string/settingsAutoAdvanceDescription" />
+
+
             <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
 
             <TextView
diff --git a/app/src/main/res/layout/view_setting_radio_button.xml b/app/src/main/res/layout/view_setting_radio_button.xml
index 530af1bdc9..c5c5d518e1 100644
--- a/app/src/main/res/layout/view_setting_radio_button.xml
+++ b/app/src/main/res/layout/view_setting_radio_button.xml
@@ -33,12 +33,28 @@
         android:importantForAccessibility="no"
         android:visibility="gone" />
 
-    <TextView
-        android:id="@+id/text"
+    <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        tools:text="Simple messages" />
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Simple messages" />
+
+        <TextView
+            android:id="@+id/subText"
+            style="@style/BodySmall.Tertiary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:text="@string/settingsDefault"
+            tools:visibility="visible"
+            android:paddingTop="@dimen/marginStandardVerySmall"/>
+    </LinearLayout>
 
     <ImageView
         android:id="@+id/checkMark"
diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
index ee348c703f..04c2230b63 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -313,8 +313,52 @@
         <action
             android:id="@+id/action_settings_to_dataManagementSettings"
             app:destination="@id/dataManagementSettingsFragment" />
+        <action
+            android:id="@+id/action_settings_to_externalContentSetting"
+            app:destination="@id/externalContentSettingFragment" />
+        <action
+            android:id="@+id/action_settingsFragment_to_aiEngineSettingFragment"
+            app:destination="@id/aiEngineSettingFragment" />
+        <action
+            android:id="@+id/action_settings_to_autoAdvanceSettings"
+            app:destination="@id/autoAdvanceFragment" />
     </fragment>
 
+    <fragment
+        android:id="@+id/autoAdvanceFragment"
+        android:name="com.infomaniak.mail.ui.main.settings.AutoAdvanceSettingsFragment"
+        android:label="AutoAdvanceSettingFragment"
+        tools:layout="@layout/fragment_auto_advance_settings" />
+    <fragment
+        android:id="@+id/threadListDensitySettingFragment"
+        android:name="com.infomaniak.mail.ui.main.settings.ThreadListDensitySettingFragment"
+        android:label="ListDensitySettingFragment"
+        tools:layout="@layout/fragment_thread_list_density_setting" />
+
+    <fragment
+        android:id="@+id/themeSettingFragment"
+        android:name="com.infomaniak.mail.ui.main.settings.ThemeSettingFragment"
+        android:label="ThemeSettingFragment"
+        tools:layout="@layout/fragment_theme_setting" />
+
+    <fragment
+        android:id="@+id/accentColorSettingFragment"
+        android:name="com.infomaniak.mail.ui.main.settings.AccentColorSettingFragment"
+        android:label="AccentColorSettingFragment"
+        tools:layout="@layout/fragment_accent_color_setting" />
+
+    <fragment
+        android:id="@+id/threadModeSettingFragment"
+        android:name="com.infomaniak.mail.ui.main.settings.ThreadModeSettingFragment"
+        android:label="ThreadModeSettingFragment"
+        tools:layout="@layout/fragment_thread_mode_setting" />
+
+    <fragment
+        android:id="@+id/externalContentSettingFragment"
+        android:name="com.infomaniak.mail.ui.main.settings.ExternalContentSettingFragment"
+        android:label="ExternalContentSettingFragment"
+        tools:layout="@layout/fragment_external_content_setting" />
+
     <fragment
         android:id="@+id/mailboxSettingsFragment"
         android:name="com.infomaniak.mail.ui.main.settings.mailbox.MailboxSettingsFragment"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 580d7f4c93..424d09ee00 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -392,6 +392,17 @@
     <string name="settingsAiEngineDescription">Wählen Sie Ihren Schreibassistent</string>
     <string name="settingsAppLock">App-Sperre</string>
     <string name="settingsAuthorizeTracking">Verfolgung genehmigen</string>
+    <string name="settingsAutoAdvanceDescription">Auswählen, was angezeigt werden soll, wenn eine Nachricht archiviert oder gelöscht wird</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Beim Archivieren oder Löschen folgenden Thread anzeigen\n</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Folgender Thread</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Liste der Threads beim Archivieren oder Löschen anzeigen</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Liste der Themen</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Wiederholt die letzte Aktion, die Sie durchgeführt haben</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Wählt automatisch die nächste oder vorherige Konversation aus, je nachdem, wie Sie zuletzt interagiert haben.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Wiederholung der letzten Aktion</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Vorheriges Thema beim Archivieren oder Löschen anzeigen</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Voriges Thema</string>
+    <string name="settingsAutoAdvanceTitle">Autovorschuss</string>
     <string name="settingsCancellationPeriodDescription">Sie haben die Möglichkeit, den Versand Ihrer E-Mail bis zu 30 Sekunden abzubrechen</string>
     <string name="settingsCancellationPeriodTitle">Kündigungsfrist senden</string>
     <string name="settingsDataManagementDescription">Sie können die Nutzungs- und Betriebsdaten, die Infomaniak abruft, individuell anpassen, um Fehler zu beheben und die Anwendung zu verbessern. Beide Tools werden ausschliesslich von uns gehostet und verwaltet.\n\nInfomaniak respektiert Ihre Privatsphäre: Der Quellcode dieser Anwendung kann überprüft werden, die gesammelten Informationen sind anonym und Ihre persönlichen Daten werden streng vertraulich behandelt und niemals an Dritte weitergegeben.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 60911cdd56..58aa9a3cfc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -392,6 +392,17 @@
     <string name="settingsAiEngineDescription">Seleccione su asistente de redacción</string>
     <string name="settingsAppLock">Bloqueo de aplicaciones</string>
     <string name="settingsAuthorizeTracking">Autorizar el seguimiento</string>
+    <string name="settingsAutoAdvanceDescription">Seleccione qué mostrar cuando se archiva o elimina un mensaje</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar el siguiente hilo al archivar o borrar\n</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Siguiendo el hilo</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Mostrar lista de hilos al archivar o borrar</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Lista de temas</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Repite la última acción realizada</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Selecciona automáticamente la conversación siguiente o anterior, en función de tu última interacción.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Repetir la última acción</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Mostrar el hilo anterior al archivar o borrar</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Tema anterior</string>
+    <string name="settingsAutoAdvanceTitle">Auto advance</string>
     <string name="settingsCancellationPeriodDescription">Tiene la posibilidad de cancelar el envío de su correo electrónico hasta 30 segundos</string>
     <string name="settingsCancellationPeriodTitle">Enviar plazo de anulación</string>
     <string name="settingsDataManagementDescription">Puede personalizar los datos de uso y funcionamiento que Infomaniak recupera para corregir errores y mejorar la aplicación. Ambas herramientas están alojadas y gestionadas exclusivamente por nosotros.\n\nInfomaniak respeta su privacidad: el código fuente de esta aplicación puede verificarse, la información recopilada es anónima y sus datos personales permanecen estrictamente confidenciales y nunca se comparten con terceros.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b7ddb520b5..e715a35db8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -400,6 +400,17 @@
     <string name="settingsAiEngineDescription">Sélectionnez votre assistant à la rédaction</string>
     <string name="settingsAppLock">Verrouillage de l’application</string>
     <string name="settingsAuthorizeTracking">Autoriser le suivi</string>
+    <string name="settingsAutoAdvanceDescription">Sélectionnez ce que vous souhaitez afficher lorsqu’un message est archivé ou supprimé</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Afficher la conversation suivante après archivage ou suppression</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Conversation suivante</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Afficher la liste des conversations après archivage ou suppression</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Liste des conversations</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Répète la dernière action que vous avez effectuée</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Sélectionne automatiquement la conversation suivante ou précédente, selon votre dernière interaction.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Répéter la dernière action</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Afficher la conversation précédente après archivage ou suppression</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Conversation précédente</string>
+    <string name="settingsAutoAdvanceTitle">Avance automatique</string>
     <string name="settingsCancellationPeriodDescription">Vous avez la possibilité d’annuler l’envoi de votre e-mail jusqu’à 30 secondes</string>
     <string name="settingsCancellationPeriodTitle">Délai d’annulation d’envoi</string>
     <string name="settingsDataManagementDescription">Vous pouvez personnaliser les données d’utilisation et opérationnelles qui sont récupérées par Infomaniak pour corriger des bugs et faire évoluer l’application. Les deux outils utilisés sont hébergés et gérés exclusivement chez nous.\n\nInfomaniak respecte votre vie privée : le code source de cette application peut être vérifié, les informations récoltées sont anonymes et vos informations personnelles restent strictement confidentielles et ne sont jamais partagées avec des tiers.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 849f85daeb..0fd5efa65d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -392,6 +392,17 @@
     <string name="settingsAiEngineDescription">Selezionare l’assistente di scrittura</string>
     <string name="settingsAppLock">Blocco dell’app</string>
     <string name="settingsAuthorizeTracking">Autorizza il tracciamento</string>
+    <string name="settingsAutoAdvanceDescription">Selezionare cosa visualizzare quando un messaggio viene archiviato o eliminato</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Visualizza la seguente discussione quando si archivia o si elimina\n</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Seguendo il filo conduttore</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Visualizzazione dell’elenco delle discussioni durante l’archiviazione o la cancellazione</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Elenco delle discussioni</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Ripete l’ultima azione eseguita</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Seleziona automaticamente la conversazione successiva o precedente, a seconda dell’ultima interazione.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Ripetere l’ultima azione</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Visualizzazione della discussione precedente quando si archivia o si elimina</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Filo conduttore precedente</string>
+    <string name="settingsAutoAdvanceTitle">Anticipo auto</string>
     <string name="settingsCancellationPeriodDescription">Avete la possibilità di annullare l’invio della vostra email fino a 30 secondi.</string>
     <string name="settingsCancellationPeriodTitle">Periodo di cancellazione dell’invio</string>
     <string name="settingsDataManagementDescription">È possibile personalizzare i dati di utilizzo e operativi che Infomaniak recupera per correggere i bug e migliorare l’applicazione. Entrambi gli strumenti sono ospitati e gestiti esclusivamente da noi.\n\nInfomaniak rispetta la vostra privacy: il codice sorgente di questa applicazione può essere verificato, le informazioni raccolte sono anonime e i vostri dati personali rimangono strettamente confidenziali e non vengono mai condivisi con terze parti.</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 98f3c0c9c1..e1788eb1b5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -101,6 +101,7 @@
     <declare-styleable name="SettingRadioButtonView">
         <attr name="icon" />
         <attr name="text" />
+        <attr name="subText" format="string"/>
         <attr name="checkMarkColor" format="color" />
         <attr name="value" format="string" />
     </declare-styleable>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e8b9428d39..c6f65a15ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -398,6 +398,17 @@
     <string name="settingsAiEngineDescription">Select your AI writing assistant</string>
     <string name="settingsAppLock">App lock</string>
     <string name="settingsAuthorizeTracking">Authorize tracking</string>
+    <string name="settingsAutoAdvanceDescription">Select what to display when a message is archived or deleted\u0020</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Display following thread when archiving or deleting\n</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Following thread</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Display list of threads when archiving or deleting</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">List of threads</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Repeats the last action you performed</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Automatically selects the next or previous thread, depending on your last interaction.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Repeat last action</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Display previous thread when archiving or deleting</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Previous thread</string>
+    <string name="settingsAutoAdvanceTitle">Auto advance</string>
     <string name="settingsCancellationPeriodDescription">You have the possibility to cancel the sending of your email up to 30 seconds</string>
     <string name="settingsCancellationPeriodTitle">Send cancellation period</string>
     <string name="settingsDataManagementDescription">You can customize the usage and operational data that Infomaniak retrieves to correct bugs and enhance the application. Both tools are hosted and managed exclusively by us.\n\nInfomaniak respects your privacy: the source code of this application can be verified, the information collected is anonymous and your personal information remains strictly confidential and is never shared with third parties.</string>

From 14ff3a12286970d6da3435f675608540e73ba817 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 29 Apr 2024 08:55:24 +0200
Subject: [PATCH 02/29] Add autoAdvanceSettings back-end logic

---
 .../com/infomaniak/mail/data/LocalSettings.kt |  8 ++++++
 .../settings/AutoAdvanceSettingsFragment.kt   | 26 +++++++++++++++++--
 .../layout/fragment_auto_advance_settings.xml | 12 ++++++---
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
index 7f1238ffd7..5950977b42 100644
--- a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
@@ -64,6 +64,7 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var showPermissionsOnboarding by sharedValue("showPermissionsOnboardingKey", true)
     var isSentryTrackingEnabled by sharedValue("isSentryTrackingEnabledKey", true)
     var isMatomoTrackingEnabled by sharedValue("isMatomoTrackingEnabledKey", true)
+    var autoAdvanceMode by sharedValue("autoAdvanceModeKey", AutoAdvanceCode.NEXT_THREAD)
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 
@@ -191,6 +192,13 @@ class LocalSettings private constructor(context: Context) : SharedValues {
         ASK_ME("false", R.string.settingsOptionAskMe, "askMe"),
     }
 
+    enum class AutoAdvanceCode(val id: String) {
+        LAST_THREAD("lastThread"),
+        NEXT_THREAD("nextThread"),
+        LIST_THREAD("listThread"),
+        LAST_ACTION("lastAction"),
+    }
+
     companion object {
 
         private val TAG = LocalSettings::class.java.simpleName
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
index b107cd0dae..b64a40b0ab 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -23,11 +23,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.infomaniak.lib.core.utils.safeBinding
+import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.databinding.FragmentAutoAdvanceSettingsBinding
-import com.infomaniak.mail.databinding.FragmentThemeSettingBinding
+import com.infomaniak.mail.utils.extensions.setSystemBarsColors
+import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class AutoAdvanceSettingsFragment : Fragment() {
 
     private var binding: FragmentAutoAdvanceSettingsBinding by safeBinding()
@@ -39,7 +42,26 @@ class AutoAdvanceSettingsFragment : Fragment() {
         return FragmentAutoAdvanceSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding.radioGroup) {
+        super.onViewCreated(view, savedInstanceState)
+        setSystemBarsColors()
 
+        initBijectionTable(
+            R.id.lastAction to LocalSettings.AutoAdvanceCode.LAST_ACTION,
+            R.id.nextThread to LocalSettings.AutoAdvanceCode.NEXT_THREAD,
+            R.id.listThread to LocalSettings.AutoAdvanceCode.LIST_THREAD,
+            R.id.lastThread to LocalSettings.AutoAdvanceCode.LAST_THREAD,
+        )
+
+        check(localSettings.autoAdvanceMode)
+
+        onItemCheckedListener { _, _, autoAdvanceMode ->
+            chooseAutoAdvanceMode(autoAdvanceMode as LocalSettings.AutoAdvanceCode)
+            // TODO track event
+        }
+    }
+
+    private fun chooseAutoAdvanceMode(autoAdvanceMode: LocalSettings.AutoAdvanceCode) {
+        localSettings.autoAdvanceMode = autoAdvanceMode
     }
 }
diff --git a/app/src/main/res/layout/fragment_auto_advance_settings.xml b/app/src/main/res/layout/fragment_auto_advance_settings.xml
index aed2098580..b6c0d42a26 100644
--- a/app/src/main/res/layout/fragment_auto_advance_settings.xml
+++ b/app/src/main/res/layout/fragment_auto_advance_settings.xml
@@ -45,26 +45,30 @@
                     android:id="@+id/lastThread"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:text="@string/settingsAutoAdvancePreviousThreadTitle" />
+                    app:text="@string/settingsAutoAdvancePreviousThreadTitle"
+                    app:value="lastThread"/>
 
                 <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
                     android:id="@+id/nextThread"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:text="@string/settingsAutoAdvanceFollowingThreadTitle" />
+                    app:text="@string/settingsAutoAdvanceFollowingThreadTitle"
+                    app:value="nextThread"/>
 
                 <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
                     android:id="@+id/listThread"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:text="@string/settingsAutoAdvanceListOfThreadsTitle" />
+                    app:text="@string/settingsAutoAdvanceListOfThreadsTitle"
+                    app:value="listThread"/>
 
                 <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
                     android:id="@+id/lastAction"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:subText="@string/settingsAutoAdvanceNaturalThreadHint"
-                    app:text="@string/settingsAutoAdvanceNaturalThreadTitle" />
+                    app:text="@string/settingsAutoAdvanceNaturalThreadTitle"
+                    app:value="lastAction"/>
 
 
             </com.infomaniak.mail.ui.main.settings.SettingRadioGroupView>

From 5eaaf06fbbe4dacf43ef522c202c2cb5742e42f2 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Wed, 1 May 2024 15:09:35 +0200
Subject: [PATCH 03/29] Add autoAdvanceSettings back-end logic on delete or
 archive action

---
 .../com/infomaniak/mail/data/LocalSettings.kt | 12 ++++----
 .../com/infomaniak/mail/ui/MainViewModel.kt   |  4 +++
 .../mail/ui/main/folder/ThreadListAdapter.kt  | 29 +++++++++++++++++++
 .../mail/ui/main/folder/ThreadListFragment.kt |  4 +++
 .../settings/AutoAdvanceSettingsFragment.kt   | 12 ++++----
 .../mail/ui/main/settings/SettingsFragment.kt |  1 +
 .../mail/ui/main/thread/ThreadFragment.kt     |  2 ++
 7 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
index 5950977b42..a44167f010 100644
--- a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
@@ -64,7 +64,7 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var showPermissionsOnboarding by sharedValue("showPermissionsOnboardingKey", true)
     var isSentryTrackingEnabled by sharedValue("isSentryTrackingEnabledKey", true)
     var isMatomoTrackingEnabled by sharedValue("isMatomoTrackingEnabledKey", true)
-    var autoAdvanceMode by sharedValue("autoAdvanceModeKey", AutoAdvanceCode.NEXT_THREAD)
+    var autoAdvanceMode by sharedValue("autoAdvanceModeKey", AutoAdvanceMode.LIST_THREAD)
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 
@@ -192,11 +192,11 @@ class LocalSettings private constructor(context: Context) : SharedValues {
         ASK_ME("false", R.string.settingsOptionAskMe, "askMe"),
     }
 
-    enum class AutoAdvanceCode(val id: String) {
-        LAST_THREAD("lastThread"),
-        NEXT_THREAD("nextThread"),
-        LIST_THREAD("listThread"),
-        LAST_ACTION("lastAction"),
+    enum class AutoAdvanceMode(val id: String, @StringRes val localisedNameRes: Int) {
+        LAST_THREAD("lastThread", R.string.settingsAutoAdvancePreviousThreadDescription),
+        NEXT_THREAD("nextThread", R.string.settingsAutoAdvanceFollowingThreadDescription),
+        LIST_THREAD("listThread", R.string.settingsAutoAdvanceListOfThreadsDescription),
+        LAST_ACTION("lastAction", R.string.settingsAutoAdvanceNaturalThreadDescription),
     }
 
     companion object {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 2eca089ed3..98e806ab95 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -110,6 +110,10 @@ class MainViewModel @Inject constructor(
     val reportPhishingTrigger = SingleLiveEvent<Unit>()
     val canInstallUpdate = MutableLiveData(false)
 
+
+    // Thread auto advance
+    val isThreadDeletedOrArchived = MutableLiveData(false)
+
     val mailboxesLive = mailboxController.getMailboxesAsync(AccountUtils.currentUserId).asLiveData(ioCoroutineContext)
 
     //region Multi selection
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 7e6ae90090..35fab13ea2 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -313,6 +313,35 @@ class ThreadListAdapter @Inject constructor(
         if (newPosition != null) notifyItemChanged(newPosition, NotificationType.SELECTED_STATE)
     }
 
+    fun openThreadByPosition(autoAdvanceMode: LocalSettings.AutoAdvanceMode) {
+        val thread: Thread? = openedThreadPosition?.let {
+            getThreadByPosition(it, autoAdvanceMode)
+        }
+
+        thread?.let {
+            onThreadClicked?.invoke(it)
+            if (thread.uid != openedThreadUid && !thread.isOnlyOneDraft) selectNewThread(openedThreadPosition, thread.uid)
+        }
+    }
+
+    private fun getThreadByPosition(positionThread: Int, autoAdvanceMode: LocalSettings.AutoAdvanceMode): Thread? {
+        var indexThread = positionThread
+        if (autoAdvanceMode == LocalSettings.AutoAdvanceMode.LAST_THREAD)
+            while (indexThread > 0)
+                if (dataSet[indexThread - 1] is Thread) {
+                    openedThreadPosition = indexThread
+                    return dataSet[indexThread - 1] as Thread
+                } else indexThread--
+        else if (autoAdvanceMode == LocalSettings.AutoAdvanceMode.NEXT_THREAD)
+            while (indexThread + 1 < dataSet.size)
+                if (dataSet[indexThread + 1] is Thread) {
+                    openedThreadPosition = indexThread + 1
+                    return dataSet[indexThread + 1] as Thread
+                } else indexThread++
+
+        return null
+    }
+
     /**
      * Sometimes, we want to select a Thread before even having any Thread in the Adapter (example: coming from a Notification).
      * The selected Thread's UI will update when the Adapter triggers the next batch of `onBindViewHolder()`.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index 3344df5e3c..c0e7743e94 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -409,6 +409,10 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
                 return shouldKeepItem
             }
         }
+
+        mainViewModel.isThreadDeletedOrArchived.observe(viewLifecycleOwner) {
+            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode)
+        }
     }
 
     /**
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
index b64a40b0ab..e4cc7ae6c4 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -47,21 +47,21 @@ class AutoAdvanceSettingsFragment : Fragment() {
         setSystemBarsColors()
 
         initBijectionTable(
-            R.id.lastAction to LocalSettings.AutoAdvanceCode.LAST_ACTION,
-            R.id.nextThread to LocalSettings.AutoAdvanceCode.NEXT_THREAD,
-            R.id.listThread to LocalSettings.AutoAdvanceCode.LIST_THREAD,
-            R.id.lastThread to LocalSettings.AutoAdvanceCode.LAST_THREAD,
+            R.id.lastAction to LocalSettings.AutoAdvanceMode.LAST_ACTION,
+            R.id.nextThread to LocalSettings.AutoAdvanceMode.NEXT_THREAD,
+            R.id.listThread to LocalSettings.AutoAdvanceMode.LIST_THREAD,
+            R.id.lastThread to LocalSettings.AutoAdvanceMode.LAST_THREAD,
         )
 
         check(localSettings.autoAdvanceMode)
 
         onItemCheckedListener { _, _, autoAdvanceMode ->
-            chooseAutoAdvanceMode(autoAdvanceMode as LocalSettings.AutoAdvanceCode)
+            chooseAutoAdvanceMode(autoAdvanceMode as LocalSettings.AutoAdvanceMode)
             // TODO track event
         }
     }
 
-    private fun chooseAutoAdvanceMode(autoAdvanceMode: LocalSettings.AutoAdvanceCode) {
+    private fun chooseAutoAdvanceMode(autoAdvanceMode: LocalSettings.AutoAdvanceMode) {
         localSettings.autoAdvanceMode = autoAdvanceMode
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
index b6f91a6615..e955030b71 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
@@ -95,6 +95,7 @@ class SettingsFragment : Fragment() {
             settingsAccentColor.setSubtitle(accentColor.localisedNameRes)
             settingsThreadMode.setSubtitle(threadMode.localisedNameRes)
             settingsExternalContent.setSubtitle(externalContent.localisedNameRes)
+            settingsAutomaticAdvance.setSubtitle(autoAdvanceMode.localisedNameRes)
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index c6da3578c3..98a98ca176 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -499,11 +499,13 @@ class ThreadFragment : Fragment() {
                 R.id.quickActionArchive -> {
                     trackThreadActionsEvent(ACTION_ARCHIVE_NAME, isFromArchive)
                     mainViewModel.archiveThread(threadUid)
+                    mainViewModel.isThreadDeletedOrArchived.value = true
                 }
                 R.id.quickActionDelete -> {
                     descriptionDialog.deleteWithConfirmationPopup(folderRole, count = 1) {
                         trackThreadActionsEvent(ACTION_DELETE_NAME)
                         mainViewModel.deleteThread(threadUid)
+                        mainViewModel.isThreadDeletedOrArchived.value = true
                     }
                 }
                 R.id.quickActionMenu -> {

From 72b65b12a6aec66a1f8ebb68e457b253435c48bb Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Thu, 2 May 2024 10:23:53 +0200
Subject: [PATCH 04/29] Reformat code

---
 .../com/infomaniak/mail/data/LocalSettings.kt |  3 +-
 .../com/infomaniak/mail/ui/MainViewModel.kt   |  1 +
 .../mail/ui/main/SnackbarManager.kt           |  3 +-
 .../mail/ui/main/folder/ThreadListAdapter.kt  | 69 +++++++++++++------
 .../settings/AutoAdvanceSettingsFragment.kt   | 11 +--
 .../main/settings/SettingRadioButtonView.kt   |  9 ++-
 6 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
index a44167f010..110a1132e8 100644
--- a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
@@ -65,6 +65,7 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var isSentryTrackingEnabled by sharedValue("isSentryTrackingEnabledKey", true)
     var isMatomoTrackingEnabled by sharedValue("isMatomoTrackingEnabledKey", true)
     var autoAdvanceMode by sharedValue("autoAdvanceModeKey", AutoAdvanceMode.LIST_THREAD)
+    var autoAdvanceIntelligentMode by sharedValue("autoAdvanceIntelligentModeKey", AutoAdvanceMode.NEXT_THREAD)
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 
@@ -193,7 +194,7 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     }
 
     enum class AutoAdvanceMode(val id: String, @StringRes val localisedNameRes: Int) {
-        LAST_THREAD("lastThread", R.string.settingsAutoAdvancePreviousThreadDescription),
+        PREVIOUS_THREAD("lastThread", R.string.settingsAutoAdvancePreviousThreadDescription),
         NEXT_THREAD("nextThread", R.string.settingsAutoAdvanceFollowingThreadDescription),
         LIST_THREAD("listThread", R.string.settingsAutoAdvanceListOfThreadsDescription),
         LAST_ACTION("lastAction", R.string.settingsAutoAdvanceNaturalThreadDescription),
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 98e806ab95..91a6b2bf71 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -603,6 +603,7 @@ class MainViewModel @Inject constructor(
             message == null -> appContext.resources.getQuantityString(R.plurals.snackbarThreadMoved, threads.count(), destination)
             else -> appContext.getString(R.string.snackbarMessageMoved, destination)
         }
+        println(destinationFolder.name)
 
         val undoData = apiResponse.data?.undoResource?.let { UndoData(it, undoFoldersIds, undoDestinationId) }
         snackbarManager.postValue(snackbarTitle, undoData)
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt b/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
index 7787e295e0..d10bf6cd2b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
@@ -51,7 +51,8 @@ class SnackbarManager @Inject constructor() {
 
             val buttonTitle = buttonTitleRes ?: RCore.string.buttonCancel
 
-            previousSnackbar?.dismiss()
+            //previousSnackbar?.dismiss()
+
             previousSnackbar = showSnackbar(
                 view = view,
                 title = title,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 35fab13ea2..70e1e8a922 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -47,8 +47,7 @@ import com.infomaniak.lib.core.utils.*
 import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
-import com.infomaniak.mail.data.LocalSettings.SwipeAction
-import com.infomaniak.mail.data.LocalSettings.ThreadDensity
+import com.infomaniak.mail.data.LocalSettings.*
 import com.infomaniak.mail.data.models.Folder.FolderRole
 import com.infomaniak.mail.data.models.correspondent.Recipient
 import com.infomaniak.mail.data.models.thread.Thread
@@ -98,6 +97,8 @@ class ThreadListAdapter @Inject constructor(
     private var multiSelection: MultiSelectionListener<Thread>? = null
     private var isFolderNameVisible: Boolean = false
 
+    private var previousThreadClickedPosition: Int? = null
+
     //region Tablet mode
     private var openedThreadPosition: Int? = null
     private var openedThreadUid: String? = null
@@ -216,7 +217,19 @@ class ThreadListAdapter @Inject constructor(
             if (unseenMessagesCount == 0) setThreadUiRead() else setThreadUiUnread()
         }
 
-        selectionCardView.setOnClickListener { onThreadClicked(thread, position) }
+        selectionCardView.setOnClickListener {
+            previousThreadClickedPosition?.let { previousThreadClickedPosition ->
+                if (position > previousThreadClickedPosition) {
+                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.NEXT_THREAD
+                } else if (position < previousThreadClickedPosition) {
+                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.PREVIOUS_THREAD
+                }
+            }
+
+            previousThreadClickedPosition = position
+
+            onThreadClicked(thread, position)
+        }
 
         multiSelection?.let { listener ->
             selectionCardView.setOnLongClickListener {
@@ -313,32 +326,45 @@ class ThreadListAdapter @Inject constructor(
         if (newPosition != null) notifyItemChanged(newPosition, NotificationType.SELECTED_STATE)
     }
 
-    fun openThreadByPosition(autoAdvanceMode: LocalSettings.AutoAdvanceMode) {
+    fun openThreadByPosition(autoAdvanceMode: AutoAdvanceMode) {
         val thread: Thread? = openedThreadPosition?.let {
-            getThreadByPosition(it, autoAdvanceMode)
+            getNextThreadToOpenByPosition(it, autoAdvanceMode)
         }
 
         thread?.let {
-            onThreadClicked?.invoke(it)
             if (thread.uid != openedThreadUid && !thread.isOnlyOneDraft) selectNewThread(openedThreadPosition, thread.uid)
+            onThreadClicked?.invoke(it)
         }
     }
 
-    private fun getThreadByPosition(positionThread: Int, autoAdvanceMode: LocalSettings.AutoAdvanceMode): Thread? {
-        var indexThread = positionThread
-        if (autoAdvanceMode == LocalSettings.AutoAdvanceMode.LAST_THREAD)
-            while (indexThread > 0)
-                if (dataSet[indexThread - 1] is Thread) {
-                    openedThreadPosition = indexThread
-                    return dataSet[indexThread - 1] as Thread
-                } else indexThread--
-        else if (autoAdvanceMode == LocalSettings.AutoAdvanceMode.NEXT_THREAD)
-            while (indexThread + 1 < dataSet.size)
-                if (dataSet[indexThread + 1] is Thread) {
-                    openedThreadPosition = indexThread + 1
-                    return dataSet[indexThread + 1] as Thread
-                } else indexThread++
+    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Thread? {
+        return when (autoAdvanceMode) {
+            AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
+            AutoAdvanceMode.NEXT_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+            AutoAdvanceMode.LIST_THREAD -> null
+            AutoAdvanceMode.LAST_ACTION -> {
+                if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
+                    getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
+                } else {
+                    getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+                }
+            }
+        }
+    }
 
+    private fun getNextThread(startingThreadIndex: Int, direction: Int): Thread? {
+        var currentIndexThread = startingThreadIndex
+        currentIndexThread += direction
+        while (currentIndexThread >= 0 && currentIndexThread <= dataSet.lastIndex) {
+            println("iteration $currentIndexThread")
+            println("start $startingThreadIndex")
+            if (dataSet[currentIndexThread] is Thread) {
+                openedThreadPosition = currentIndexThread
+                return dataSet[currentIndexThread] as Thread
+            }
+            
+            currentIndexThread += direction
+        }
         return null
     }
 
@@ -705,6 +731,9 @@ class ThreadListAdapter @Inject constructor(
 
         private const val FULL_MONTH = "MMMM"
         private const val MONTH_AND_YEAR = "MMMM yyyy"
+
+        private const val PREVIOUS_CHRONOLOGICAL_THREAD = 1
+        private const val NEXT_CHRONOLOGICAL_THREAD = -1
     }
 
     class ThreadListViewHolder(val binding: ViewBinding) : ViewHolder(binding.root) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
index e4cc7ae6c4..7ced98c538 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -42,21 +42,22 @@ class AutoAdvanceSettingsFragment : Fragment() {
         return FragmentAutoAdvanceSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding.radioGroup) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) {
         super.onViewCreated(view, savedInstanceState)
         setSystemBarsColors()
 
-        initBijectionTable(
+        radioGroup.initBijectionTable(
             R.id.lastAction to LocalSettings.AutoAdvanceMode.LAST_ACTION,
             R.id.nextThread to LocalSettings.AutoAdvanceMode.NEXT_THREAD,
             R.id.listThread to LocalSettings.AutoAdvanceMode.LIST_THREAD,
-            R.id.lastThread to LocalSettings.AutoAdvanceMode.LAST_THREAD,
+            R.id.lastThread to LocalSettings.AutoAdvanceMode.PREVIOUS_THREAD,
         )
 
-        check(localSettings.autoAdvanceMode)
+        radioGroup.check(localSettings.autoAdvanceMode)
 
-        onItemCheckedListener { _, _, autoAdvanceMode ->
+        radioGroup.onItemCheckedListener { _, _, autoAdvanceMode ->
             chooseAutoAdvanceMode(autoAdvanceMode as LocalSettings.AutoAdvanceMode)
+            lastAction.setSubTextVisibility(if (autoAdvanceMode == LocalSettings.AutoAdvanceMode.LAST_ACTION) View.VISIBLE else View.GONE)
             // TODO track event
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
index f8da251b18..373e91949f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
@@ -19,6 +19,7 @@ package com.infomaniak.mail.ui.main.settings
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.opengl.Visibility
 import android.util.AttributeSet
 import android.util.Log
 import android.view.LayoutInflater
@@ -63,10 +64,12 @@ class SettingRadioButtonView @JvmOverloads constructor(
                 getString(R.styleable.SettingRadioButtonView_subText).let {
                     subText.apply {
                         subText.text = it
-                        isGone = it == null
+                        subText.visibility = GONE
                     }
                 }
 
+
+
                 root.setOnClickListener {
                     (parent as? OnCheckListener)?.onChecked(this@SettingRadioButtonView.id) ?: onClickListener?.onClick(root)
                 }
@@ -99,6 +102,10 @@ class SettingRadioButtonView @JvmOverloads constructor(
         }
     }
 
+    fun setSubTextVisibility(visibility: Int) = with(binding.subText){
+        this.visibility = visibility
+    }
+
     override fun setOnClickListener(listener: OnClickListener?) {
         onClickListener = listener
     }

From 8730ac1c3daa9b51b52766e10bc6ee054521050c Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Thu, 2 May 2024 14:58:49 +0200
Subject: [PATCH 05/29] Fix snackbar bug

Modify anchor so the snackbar is always displayed on thread archived action or delete
---
 .../main/java/com/infomaniak/mail/ui/MainViewModel.kt    | 1 -
 .../java/com/infomaniak/mail/ui/main/SnackbarManager.kt  | 2 +-
 .../infomaniak/mail/ui/main/folder/ThreadListAdapter.kt  | 4 +---
 .../infomaniak/mail/ui/main/folder/ThreadListFragment.kt | 9 ++++++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 91a6b2bf71..98e806ab95 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -603,7 +603,6 @@ class MainViewModel @Inject constructor(
             message == null -> appContext.resources.getQuantityString(R.plurals.snackbarThreadMoved, threads.count(), destination)
             else -> appContext.getString(R.string.snackbarMessageMoved, destination)
         }
-        println(destinationFolder.name)
 
         val undoData = apiResponse.data?.undoResource?.let { UndoData(it, undoFoldersIds, undoDestinationId) }
         snackbarManager.postValue(snackbarTitle, undoData)
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt b/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
index d10bf6cd2b..7af3b69b2e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
@@ -51,7 +51,7 @@ class SnackbarManager @Inject constructor() {
 
             val buttonTitle = buttonTitleRes ?: RCore.string.buttonCancel
 
-            //previousSnackbar?.dismiss()
+            previousSnackbar?.dismiss()
 
             previousSnackbar = showSnackbar(
                 view = view,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 70e1e8a922..3329e65813 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -100,7 +100,7 @@ class ThreadListAdapter @Inject constructor(
     private var previousThreadClickedPosition: Int? = null
 
     //region Tablet mode
-    private var openedThreadPosition: Int? = null
+    var openedThreadPosition: Int? = null
     private var openedThreadUid: String? = null
     //endregion
 
@@ -356,8 +356,6 @@ class ThreadListAdapter @Inject constructor(
         var currentIndexThread = startingThreadIndex
         currentIndexThread += direction
         while (currentIndexThread >= 0 && currentIndexThread <= dataSet.lastIndex) {
-            println("iteration $currentIndexThread")
-            println("start $startingThreadIndex")
             if (dataSet[currentIndexThread] is Thread) {
                 openedThreadPosition = currentIndexThread
                 return dataSet[currentIndexThread] as Thread
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index c0e7743e94..8644fc3be6 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -173,13 +173,16 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     override fun getRightPane(): FragmentContainerView? = _binding?.threadHostFragment
 
     override fun getAnchor(): View? {
-        return if (isOnlyRightShown()) {
-            _binding?.threadHostFragment?.getFragment<ThreadFragment?>()?.getAnchor()
-        } else {
+        return if (isSelectedThreadAtLastPositionOrStart() || !isOnlyRightShown()) {
             _binding?.newMessageFab
+        } else {
+            _binding?.threadHostFragment?.getFragment<ThreadFragment?>()?.getAnchor()
         }
     }
 
+    private fun isSelectedThreadAtLastPositionOrStart() =
+        threadListAdapter.openedThreadPosition == 1 || threadListAdapter.openedThreadPosition == threadListAdapter.dataSet.size
+
     override fun doAfterFolderChanged() {
         navigateFromNotificationToThread()
     }

From 93e13363db4edc6724bbf9316923d50a9b7d02ed Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Fri, 3 May 2024 16:14:33 +0200
Subject: [PATCH 06/29] Add matomo track event

---
 app/src/main/java/com/infomaniak/mail/MatomoMail.kt    |  4 ++++
 .../java/com/infomaniak/mail/data/LocalSettings.kt     | 10 +++++-----
 .../ui/main/settings/AutoAdvanceSettingsFragment.kt    |  9 +++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/MatomoMail.kt b/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
index 44e27b39b8..258bac6f13 100644
--- a/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
+++ b/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
@@ -263,6 +263,10 @@ object MatomoMail : MatomoCore {
         trackEvent("homeScreenShortcuts", name)
     }
 
+    fun Fragment.trackAutoAdvanceEvent(name: String) {
+        trackEvent("settingsAutoAdvance", name)
+    }
+
     // We need to invert this logical value to keep a coherent value for analytics because actions
     // conditions are inverted (ex: if the condition is `message.isSpam`, then we want to unspam)
     private fun Boolean.toMailActionValue() = (!this).toFloat()
diff --git a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
index 110a1132e8..e77ce78eac 100644
--- a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
@@ -65,7 +65,7 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var isSentryTrackingEnabled by sharedValue("isSentryTrackingEnabledKey", true)
     var isMatomoTrackingEnabled by sharedValue("isMatomoTrackingEnabledKey", true)
     var autoAdvanceMode by sharedValue("autoAdvanceModeKey", AutoAdvanceMode.LIST_THREAD)
-    var autoAdvanceIntelligentMode by sharedValue("autoAdvanceIntelligentModeKey", AutoAdvanceMode.NEXT_THREAD)
+    var autoAdvanceIntelligentMode by sharedValue("autoAdvanceIntelligentModeKey", AutoAdvanceMode.FOLLOWING_THREAD)
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 
@@ -194,10 +194,10 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     }
 
     enum class AutoAdvanceMode(val id: String, @StringRes val localisedNameRes: Int) {
-        PREVIOUS_THREAD("lastThread", R.string.settingsAutoAdvancePreviousThreadDescription),
-        NEXT_THREAD("nextThread", R.string.settingsAutoAdvanceFollowingThreadDescription),
-        LIST_THREAD("listThread", R.string.settingsAutoAdvanceListOfThreadsDescription),
-        LAST_ACTION("lastAction", R.string.settingsAutoAdvanceNaturalThreadDescription),
+        PREVIOUS_THREAD("previousThread", R.string.settingsAutoAdvancePreviousThreadDescription),
+        FOLLOWING_THREAD("followingThread", R.string.settingsAutoAdvanceFollowingThreadDescription),
+        LIST_THREAD("listOfThread", R.string.settingsAutoAdvanceListOfThreadsDescription),
+        NATURAL_THREAD("naturalThread", R.string.settingsAutoAdvanceNaturalThreadDescription),
     }
 
     companion object {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
index 7ced98c538..830fdfb765 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -23,6 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.infomaniak.lib.core.utils.safeBinding
+import com.infomaniak.mail.MatomoMail.trackAutoAdvanceEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.databinding.FragmentAutoAdvanceSettingsBinding
@@ -47,8 +48,8 @@ class AutoAdvanceSettingsFragment : Fragment() {
         setSystemBarsColors()
 
         radioGroup.initBijectionTable(
-            R.id.lastAction to LocalSettings.AutoAdvanceMode.LAST_ACTION,
-            R.id.nextThread to LocalSettings.AutoAdvanceMode.NEXT_THREAD,
+            R.id.lastAction to LocalSettings.AutoAdvanceMode.NATURAL_THREAD,
+            R.id.nextThread to LocalSettings.AutoAdvanceMode.FOLLOWING_THREAD,
             R.id.listThread to LocalSettings.AutoAdvanceMode.LIST_THREAD,
             R.id.lastThread to LocalSettings.AutoAdvanceMode.PREVIOUS_THREAD,
         )
@@ -57,8 +58,8 @@ class AutoAdvanceSettingsFragment : Fragment() {
 
         radioGroup.onItemCheckedListener { _, _, autoAdvanceMode ->
             chooseAutoAdvanceMode(autoAdvanceMode as LocalSettings.AutoAdvanceMode)
-            lastAction.setSubTextVisibility(if (autoAdvanceMode == LocalSettings.AutoAdvanceMode.LAST_ACTION) View.VISIBLE else View.GONE)
-            // TODO track event
+            lastAction.setSubTextVisibility(if (autoAdvanceMode == LocalSettings.AutoAdvanceMode.NATURAL_THREAD) View.VISIBLE else View.GONE)
+            trackAutoAdvanceEvent(autoAdvanceMode.id)
         }
     }
 

From 86a94180e53264dc1f0d54dba480c234886ceff8 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Fri, 3 May 2024 16:15:39 +0200
Subject: [PATCH 07/29] Modify observe logic on archive and delete and
 animation on tablet mode

wip
---
 .../com/infomaniak/mail/ui/MainViewModel.kt   | 35 ++++++++++++---
 .../mail/ui/main/folder/ThreadListAdapter.kt  | 43 +++++++++++--------
 .../mail/ui/main/folder/ThreadListFragment.kt |  4 +-
 .../mail/ui/main/thread/ThreadFragment.kt     |  3 +-
 .../main/res/navigation/main_navigation.xml   |  3 --
 5 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 98e806ab95..85ba9b3e32 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -110,9 +110,7 @@ class MainViewModel @Inject constructor(
     val reportPhishingTrigger = SingleLiveEvent<Unit>()
     val canInstallUpdate = MutableLiveData(false)
 
-
-    // Thread auto advance
-    val isThreadDeletedOrArchived = MutableLiveData(false)
+    val threadUidToDeleteOrArchive = MutableLiveData<List<String>>()
 
     val mailboxesLive = mailboxController.getMailboxesAsync(AccountUtils.currentUserId).asLiveData(ioCoroutineContext)
 
@@ -444,15 +442,21 @@ class MainViewModel @Inject constructor(
 
     //region Delete
     fun deleteMessage(threadUid: String, message: Message) {
+        if (shouldWeDeleteOrAchieveThread(threadUid))
+            threadUidToDeleteOrArchive.postValue(listOf(threadUid))
+
         deleteThreadsOrMessage(threadsUids = listOf(threadUid), message = message)
     }
 
     fun deleteThread(threadUid: String, isSwipe: Boolean = false) {
-        deleteThreadsOrMessage(threadsUids = listOf(threadUid), isSwipe = isSwipe)
+        val threadUidList = listOf(threadUid)
+        deleteThreadsOrMessage(threadsUids = threadUidList, isSwipe = isSwipe)
+        threadUidToDeleteOrArchive.postValue(threadUidList)
     }
 
     fun deleteThreads(threadsUids: List<String>) {
         deleteThreadsOrMessage(threadsUids = threadsUids)
+        threadUidToDeleteOrArchive.postValue(threadsUids)
     }
 
     private fun deleteThreadsOrMessage(
@@ -503,6 +507,7 @@ class MainViewModel @Inject constructor(
             undoDestinationId,
             threads.count(),
         )
+
     }
 
     private fun showDeleteSnackbar(
@@ -611,14 +616,21 @@ class MainViewModel @Inject constructor(
 
     //region Archive
     fun archiveMessage(threadUid: String, message: Message) {
+        if (shouldWeDeleteOrAchieveThread(threadUid))
+            threadUidToDeleteOrArchive.postValue(listOf(threadUid))
+
         archiveThreadsOrMessage(threadsUids = listOf(threadUid), message = message)
     }
 
     fun archiveThread(threadUid: String) {
-        archiveThreadsOrMessage(threadsUids = listOf(threadUid))
+        val threadUidsList = listOf(threadUid)
+        if (shouldWeDeleteOrAchieveThread(threadUid)) threadUidToDeleteOrArchive.postValue(threadUidsList)
+
+        archiveThreadsOrMessage(threadsUids = threadUidsList)
     }
 
     fun archiveThreads(threadsUids: List<String>) {
+        threadUidToDeleteOrArchive.postValue(threadsUids)
         archiveThreadsOrMessage(threadsUids = threadsUids)
     }
 
@@ -626,6 +638,7 @@ class MainViewModel @Inject constructor(
         threadsUids: List<String>,
         message: Message? = null,
     ) = viewModelScope.launch(ioCoroutineContext) {
+
         val mailbox = currentMailbox.value!!
         val threads = getActionThreads(threadsUids).ifEmpty { return@launch }
 
@@ -647,6 +660,7 @@ class MainViewModel @Inject constructor(
                 destinationFolderId = destinationFolder.id,
                 callbacks = RefreshCallbacks(::onDownloadStart, ::onDownloadStop),
             )
+
         }
 
         showMoveSnackbar(threads, message, messages, apiResponse, destinationFolder)
@@ -1042,7 +1056,18 @@ class MainViewModel @Inject constructor(
 
         snackbarManager.postValue(appContext.getString(snackbarTitleRes))
     }
+    private fun shouldWeDeleteOrAchieveThread(threadUid: String): Boolean {
+        var howMuchMessageInFolder = 0
+        threadController.getThread(threadUid)?.messages?.forEach {
+            if (it.folderId == currentFolderId)
+                howMuchMessageInFolder++
 
+            if (howMuchMessageInFolder > 1)
+                return false
+        }
+
+        return true
+    }
     companion object {
         private val TAG: String = MainViewModel::class.java.simpleName
         private val DEFAULT_SELECTED_FOLDER = FolderRole.INBOX
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 3329e65813..64a0b1db5c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -40,7 +40,6 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.ernestoyaquello.dragdropswiperecyclerview.DragDropSwipeAdapter
 import com.ernestoyaquello.dragdropswiperecyclerview.DragDropSwipeRecyclerView
-import com.ernestoyaquello.dragdropswiperecyclerview.util.DragDropSwipeDiffCallback
 import com.google.android.material.card.MaterialCardView
 import com.infomaniak.lib.core.MatomoCore.TrackerAction
 import com.infomaniak.lib.core.utils.*
@@ -167,8 +166,8 @@ class ThreadListAdapter @Inject constructor(
     }
 
     override fun onBindViewHolder(holder: ThreadListViewHolder, position: Int, payloads: MutableList<Any>) = runCatchingRealm {
-
         val payload = payloads.firstOrNull()
+
         if (payload !is NotificationType) {
             super.onBindViewHolder(holder, position, payloads)
             return@runCatchingRealm
@@ -219,9 +218,9 @@ class ThreadListAdapter @Inject constructor(
 
         selectionCardView.setOnClickListener {
             previousThreadClickedPosition?.let { previousThreadClickedPosition ->
-                if (position > previousThreadClickedPosition) {
-                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.NEXT_THREAD
-                } else if (position < previousThreadClickedPosition) {
+                if (position < previousThreadClickedPosition) {
+                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.FOLLOWING_THREAD
+                } else if (position > previousThreadClickedPosition) {
                     localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.PREVIOUS_THREAD
                 }
             }
@@ -326,23 +325,28 @@ class ThreadListAdapter @Inject constructor(
         if (newPosition != null) notifyItemChanged(newPosition, NotificationType.SELECTED_STATE)
     }
 
-    fun openThreadByPosition(autoAdvanceMode: AutoAdvanceMode) {
-        val thread: Thread? = openedThreadPosition?.let {
-            getNextThreadToOpenByPosition(it, autoAdvanceMode)
-        }
+    fun openThreadByPosition(autoAdvanceMode: AutoAdvanceMode, threadDeleteUid: List<String>) {
+        if (threadDeleteUid.contains(openedThreadUid)) {
+            val thread: Thread? = openedThreadPosition?.let {
+                println("here start openedThread")
+                getNextThreadToOpenByPosition(it, autoAdvanceMode)
+            }
 
-        thread?.let {
-            if (thread.uid != openedThreadUid && !thread.isOnlyOneDraft) selectNewThread(openedThreadPosition, thread.uid)
-            onThreadClicked?.invoke(it)
+            thread?.let {
+                if (thread.uid != openedThreadUid && !thread.isOnlyOneDraft) selectNewThread(openedThreadPosition, thread.uid)
+                onThreadClicked?.invoke(it)
+            }
+        } else {
+            println("don't contains")
         }
     }
 
     private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Thread? {
         return when (autoAdvanceMode) {
             AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-            AutoAdvanceMode.NEXT_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+            AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
             AutoAdvanceMode.LIST_THREAD -> null
-            AutoAdvanceMode.LAST_ACTION -> {
+            AutoAdvanceMode.NATURAL_THREAD -> {
                 if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
                     getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
                 } else {
@@ -353,14 +357,19 @@ class ThreadListAdapter @Inject constructor(
     }
 
     private fun getNextThread(startingThreadIndex: Int, direction: Int): Thread? {
+        println("start")
         var currentIndexThread = startingThreadIndex
         currentIndexThread += direction
+        println("second start $currentIndexThread")
         while (currentIndexThread >= 0 && currentIndexThread <= dataSet.lastIndex) {
+            println("here $currentIndexThread")
             if (dataSet[currentIndexThread] is Thread) {
-                openedThreadPosition = currentIndexThread
+                println("found")
+                println("folder ${dataSet[currentIndexThread]}")
+                val thread = dataSet[currentIndexThread] as Thread
                 return dataSet[currentIndexThread] as Thread
             }
-            
+
             currentIndexThread += direction
         }
         return null
@@ -618,7 +627,7 @@ class ThreadListAdapter @Inject constructor(
         return getItemViewType(position) == DisplayType.THREAD.layout && swipingIsAuthorized
     }
 
-    override fun createDiffUtil(oldList: List<Any>, newList: List<Any>): DragDropSwipeDiffCallback<Any>? = null
+    override fun createDiffUtil(oldList: List<Any>, newList: List<Any>) = null
 
     override fun updateList(itemList: List<Thread>, lifecycleScope: LifecycleCoroutineScope) {
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index 8644fc3be6..1bdafeecd9 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -413,8 +413,8 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
             }
         }
 
-        mainViewModel.isThreadDeletedOrArchived.observe(viewLifecycleOwner) {
-            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode)
+        mainViewModel.threadUidToDeleteOrArchive.observe(viewLifecycleOwner) {
+            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode, it)
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 98a98ca176..b59ed818fc 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -44,6 +44,7 @@ import com.infomaniak.mail.MatomoMail.ACTION_FORWARD_NAME
 import com.infomaniak.mail.MatomoMail.ACTION_REPLY_NAME
 import com.infomaniak.mail.MatomoMail.OPEN_ACTION_BOTTOM_SHEET
 import com.infomaniak.mail.MatomoMail.OPEN_FROM_DRAFT_NAME
+import com.infomaniak.mail.MatomoMail.shouldOptOut
 import com.infomaniak.mail.MatomoMail.trackAttachmentActionsEvent
 import com.infomaniak.mail.MatomoMail.trackMessageActionsEvent
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
@@ -499,13 +500,11 @@ class ThreadFragment : Fragment() {
                 R.id.quickActionArchive -> {
                     trackThreadActionsEvent(ACTION_ARCHIVE_NAME, isFromArchive)
                     mainViewModel.archiveThread(threadUid)
-                    mainViewModel.isThreadDeletedOrArchived.value = true
                 }
                 R.id.quickActionDelete -> {
                     descriptionDialog.deleteWithConfirmationPopup(folderRole, count = 1) {
                         trackThreadActionsEvent(ACTION_DELETE_NAME)
                         mainViewModel.deleteThread(threadUid)
-                        mainViewModel.isThreadDeletedOrArchived.value = true
                     }
                 }
                 R.id.quickActionMenu -> {
diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
index 04c2230b63..10753c2bc0 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -292,9 +292,6 @@
         <action
             android:id="@+id/action_settings_to_aiEngineSetting"
             app:destination="@id/aiEngineSettingFragment" />
-        <action
-            android:id="@+id/action_settings_to_externalContentSetting"
-            app:destination="@id/externalContentSettingFragment" />
         <action
             android:id="@+id/action_settings_to_threadListDensitySetting"
             app:destination="@id/threadListDensitySettingFragment" />

From 6d9072f9dd0233e0bd320f5f488add0a0fa771f6 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 6 May 2024 14:44:14 +0200
Subject: [PATCH 08/29] Add move action to auto advance

---
 app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 85ba9b3e32..4646159938 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -579,6 +579,8 @@ class MainViewModel @Inject constructor(
 
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
+        threadUidToDeleteOrArchive.postValue(threadsUids.toList())
+
         if (apiResponse.isSuccess()) {
             refreshFoldersAsync(
                 mailbox = mailbox,

From f8d1f187f1b6707c1df07d63a7263b5aa2fa9c89 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 6 May 2024 14:45:52 +0200
Subject: [PATCH 09/29] Simplify auto advance

---
 .idea/navEditor.xml                           | 158 +++++++++---------
 .../cache/mailboxContent/ThreadController.kt  |   5 +
 .../com/infomaniak/mail/ui/MainViewModel.kt   |  37 ++--
 .../mail/ui/main/SnackbarManager.kt           |   1 -
 .../mail/ui/main/folder/ThreadListAdapter.kt  |  27 ++-
 .../mail/ui/main/folder/ThreadListFragment.kt |  11 +-
 .../main/res/navigation/main_navigation.xml   |  29 ----
 7 files changed, 118 insertions(+), 150 deletions(-)

diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index a97de92654..e140dc3b45 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -13,8 +13,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="12" />
+                            <option name="x" value="520" />
+                            <option name="y" value="859" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -25,8 +25,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1476" />
-                            <option name="y" value="1410" />
+                            <option name="x" value="256" />
+                            <option name="y" value="6612" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -61,8 +61,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="2859" />
+                            <option name="x" value="520" />
+                            <option name="y" value="2283" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -73,8 +73,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="1436" />
+                            <option name="x" value="520" />
+                            <option name="y" value="6333" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -85,8 +85,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="368" />
+                            <option name="x" value="3428" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -106,8 +106,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="12" />
-                            <option name="y" value="368" />
+                            <option name="x" value="2696" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -118,8 +118,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="2503" />
+                            <option name="x" value="520" />
+                            <option name="y" value="1927" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -130,8 +130,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="5394" />
+                            <option name="x" value="764" />
+                            <option name="y" value="1991" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -142,8 +142,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="3970" />
+                            <option name="x" value="764" />
+                            <option name="y" value="3059" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -154,8 +154,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="3614" />
+                            <option name="x" value="764" />
+                            <option name="y" value="4127" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -166,8 +166,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="3258" />
+                            <option name="x" value="764" />
+                            <option name="y" value="3771" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -178,8 +178,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="3571" />
+                            <option name="x" value="520" />
+                            <option name="y" value="4084" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -204,8 +204,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="368" />
+                            <option name="x" value="520" />
+                            <option name="y" value="7045" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -216,8 +216,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="368" />
+                            <option name="x" value="3672" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -228,8 +228,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="12" />
+                            <option name="x" value="520" />
+                            <option name="y" value="1215" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -240,8 +240,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="4326" />
+                            <option name="x" value="764" />
+                            <option name="y" value="3415" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -252,8 +252,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="724" />
+                            <option name="x" value="520" />
+                            <option name="y" value="5621" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -276,7 +276,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="2208" />
+                            <option name="x" value="988" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -288,8 +288,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="1792" />
+                            <option name="x" value="520" />
+                            <option name="y" value="5977" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -300,7 +300,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="2696" />
+                            <option name="x" value="1476" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -312,8 +312,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="5038" />
+                            <option name="x" value="520" />
+                            <option name="y" value="2639" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -343,7 +343,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="2452" />
+                            <option name="x" value="1232" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -367,8 +367,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="6462" />
+                            <option name="x" value="520" />
+                            <option name="y" value="503" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -379,8 +379,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1476" />
-                            <option name="y" value="6327" />
+                            <option name="x" value="256" />
+                            <option name="y" value="368" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -412,8 +412,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="500" />
-                            <option name="y" value="368" />
+                            <option name="x" value="3184" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -424,8 +424,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="256" />
-                            <option name="y" value="368" />
+                            <option name="x" value="2940" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -436,7 +436,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="3672" />
+                            <option name="x" value="2452" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -460,7 +460,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="3184" />
+                            <option name="x" value="1964" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -472,8 +472,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1476" />
-                            <option name="y" value="368" />
+                            <option name="x" value="256" />
+                            <option name="y" value="7045" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -493,8 +493,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="4284" />
+                            <option name="x" value="520" />
+                            <option name="y" value="3372" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -519,8 +519,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1476" />
-                            <option name="y" value="3571" />
+                            <option name="x" value="256" />
+                            <option name="y" value="5044" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -595,8 +595,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="5038" />
+                            <option name="x" value="764" />
+                            <option name="y" value="2347" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -607,8 +607,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="4682" />
+                            <option name="x" value="764" />
+                            <option name="y" value="2703" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -619,8 +619,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="6106" />
+                            <option name="x" value="764" />
+                            <option name="y" value="5152" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -631,8 +631,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="6106" />
+                            <option name="x" value="520" />
+                            <option name="y" value="5152" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -652,8 +652,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1720" />
-                            <option name="y" value="1080" />
+                            <option name="x" value="520" />
+                            <option name="y" value="6689" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -664,7 +664,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="3428" />
+                            <option name="x" value="2208" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
@@ -676,8 +676,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1476" />
-                            <option name="y" value="12" />
+                            <option name="x" value="520" />
+                            <option name="y" value="4440" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -688,8 +688,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1476" />
-                            <option name="y" value="3215" />
+                            <option name="x" value="256" />
+                            <option name="y" value="5400" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -700,8 +700,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="12" />
+                            <option name="x" value="520" />
+                            <option name="y" value="1571" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -712,8 +712,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="3201" />
+                            <option name="x" value="12" />
+                            <option name="y" value="6945" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -768,8 +768,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1964" />
-                            <option name="y" value="12" />
+                            <option name="x" value="520" />
+                            <option name="y" value="4796" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -780,7 +780,7 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="2940" />
+                            <option name="x" value="1720" />
                             <option name="y" value="12" />
                           </Point>
                         </option>
diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt
index ecdd7a0642..f8ed1596c8 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt
@@ -71,6 +71,11 @@ class ThreadController @Inject constructor(
         return getThreadQuery(uid, mailboxContentRealm()).asFlow()
     }
 
+    fun getMessageCountInThreadForFolder(threadUid: String, folderId : String) : Int{
+        return getThreadQuery(threadUid, mailboxContentRealm()).find()?.messages?.query("${Message::folderId.name} == $0", folderId)?.count()
+            ?.find()?.toInt() ?: -1
+    }
+
     /**
      * Initialize and retrieve the search Threads obtained from the API.
      * - Format the remote threads to make them compatible with the existing logic.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 4646159938..9ead6e1bac 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -442,21 +442,20 @@ class MainViewModel @Inject constructor(
 
     //region Delete
     fun deleteMessage(threadUid: String, message: Message) {
-        if (shouldWeDeleteOrAchieveThread(threadUid))
-            threadUidToDeleteOrArchive.postValue(listOf(threadUid))
-
-        deleteThreadsOrMessage(threadsUids = listOf(threadUid), message = message)
+        val threadUidsList = listOf(threadUid)
+        if (isMessageTheLastInFolder(threadUid)) threadUidToDeleteOrArchive.postValue(threadUidsList)
+        deleteThreadsOrMessage(threadsUids = threadUidsList, message = message)
     }
 
     fun deleteThread(threadUid: String, isSwipe: Boolean = false) {
         val threadUidList = listOf(threadUid)
-        deleteThreadsOrMessage(threadsUids = threadUidList, isSwipe = isSwipe)
         threadUidToDeleteOrArchive.postValue(threadUidList)
+        deleteThreadsOrMessage(threadsUids = threadUidList, isSwipe = isSwipe)
     }
 
     fun deleteThreads(threadsUids: List<String>) {
-        deleteThreadsOrMessage(threadsUids = threadsUids)
         threadUidToDeleteOrArchive.postValue(threadsUids)
+        deleteThreadsOrMessage(threadsUids = threadsUids)
     }
 
     private fun deleteThreadsOrMessage(
@@ -618,16 +617,14 @@ class MainViewModel @Inject constructor(
 
     //region Archive
     fun archiveMessage(threadUid: String, message: Message) {
-        if (shouldWeDeleteOrAchieveThread(threadUid))
-            threadUidToDeleteOrArchive.postValue(listOf(threadUid))
-
-        archiveThreadsOrMessage(threadsUids = listOf(threadUid), message = message)
+        val threadUidsList = listOf(threadUid)
+        if (isMessageTheLastInFolder(threadUid)) threadUidToDeleteOrArchive.postValue(threadUidsList)
+        archiveThreadsOrMessage(threadsUids = threadUidsList, message = message)
     }
 
     fun archiveThread(threadUid: String) {
         val threadUidsList = listOf(threadUid)
-        if (shouldWeDeleteOrAchieveThread(threadUid)) threadUidToDeleteOrArchive.postValue(threadUidsList)
-
+        threadUidToDeleteOrArchive.postValue(threadUidsList)
         archiveThreadsOrMessage(threadsUids = threadUidsList)
     }
 
@@ -1058,18 +1055,16 @@ class MainViewModel @Inject constructor(
 
         snackbarManager.postValue(appContext.getString(snackbarTitleRes))
     }
-    private fun shouldWeDeleteOrAchieveThread(threadUid: String): Boolean {
-        var howMuchMessageInFolder = 0
-        threadController.getThread(threadUid)?.messages?.forEach {
-            if (it.folderId == currentFolderId)
-                howMuchMessageInFolder++
 
-            if (howMuchMessageInFolder > 1)
-                return false
+    private fun isMessageTheLastInFolder(threadUid: String): Boolean {
+        currentFolderId?.let { folderId ->
+            if (threadController.getMessageCountInThreadForFolder(threadUid, folderId) == 1) {
+                return true
+            }
         }
-
-        return true
+        return false
     }
+
     companion object {
         private val TAG: String = MainViewModel::class.java.simpleName
         private val DEFAULT_SELECTED_FOLDER = FolderRole.INBOX
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt b/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
index 7af3b69b2e..7787e295e0 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/SnackbarManager.kt
@@ -52,7 +52,6 @@ class SnackbarManager @Inject constructor() {
             val buttonTitle = buttonTitleRes ?: RCore.string.buttonCancel
 
             previousSnackbar?.dismiss()
-
             previousSnackbar = showSnackbar(
                 view = view,
                 title = title,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 64a0b1db5c..a07932080c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -166,8 +166,8 @@ class ThreadListAdapter @Inject constructor(
     }
 
     override fun onBindViewHolder(holder: ThreadListViewHolder, position: Int, payloads: MutableList<Any>) = runCatchingRealm {
-        val payload = payloads.firstOrNull()
 
+        val payload = payloads.firstOrNull()
         if (payload !is NotificationType) {
             super.onBindViewHolder(holder, position, payloads)
             return@runCatchingRealm
@@ -327,21 +327,21 @@ class ThreadListAdapter @Inject constructor(
 
     fun openThreadByPosition(autoAdvanceMode: AutoAdvanceMode, threadDeleteUid: List<String>) {
         if (threadDeleteUid.contains(openedThreadUid)) {
-            val thread: Thread? = openedThreadPosition?.let {
-                println("here start openedThread")
+            val nextThreadData: Pair<Thread, Int>? = openedThreadPosition?.let {
                 getNextThreadToOpenByPosition(it, autoAdvanceMode)
             }
 
-            thread?.let {
-                if (thread.uid != openedThreadUid && !thread.isOnlyOneDraft) selectNewThread(openedThreadPosition, thread.uid)
-                onThreadClicked?.invoke(it)
+            nextThreadData?.let { (nextThread, indexNextThread) ->
+                if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
+                    selectNewThread(newPosition = indexNextThread, nextThread.uid)
+                }
+
+                onThreadClicked?.invoke(nextThread)
             }
-        } else {
-            println("don't contains")
         }
     }
 
-    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Thread? {
+    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Pair<Thread, Int>? {
         return when (autoAdvanceMode) {
             AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
             AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
@@ -356,18 +356,13 @@ class ThreadListAdapter @Inject constructor(
         }
     }
 
-    private fun getNextThread(startingThreadIndex: Int, direction: Int): Thread? {
-        println("start")
+    private fun getNextThread(startingThreadIndex: Int, direction: Int): Pair<Thread, Int>? {
         var currentIndexThread = startingThreadIndex
         currentIndexThread += direction
-        println("second start $currentIndexThread")
         while (currentIndexThread >= 0 && currentIndexThread <= dataSet.lastIndex) {
-            println("here $currentIndexThread")
             if (dataSet[currentIndexThread] is Thread) {
-                println("found")
-                println("folder ${dataSet[currentIndexThread]}")
                 val thread = dataSet[currentIndexThread] as Thread
-                return dataSet[currentIndexThread] as Thread
+                return thread to currentIndexThread
             }
 
             currentIndexThread += direction
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index 1bdafeecd9..2e3c4ef14f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -163,6 +163,7 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         observeFlushFolderTrigger()
         observeUpdateInstall()
         observeLoadMoreTriggers()
+        observeArchiveOrDelete()
     }.getOrDefault(Unit)
 
     @ColorRes
@@ -412,10 +413,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
                 return shouldKeepItem
             }
         }
-
-        mainViewModel.threadUidToDeleteOrArchive.observe(viewLifecycleOwner) {
-            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode, it)
-        }
     }
 
     /**
@@ -629,6 +626,12 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         }
     }
 
+    private fun observeArchiveOrDelete() {
+        mainViewModel.threadUidToDeleteOrArchive.observe(viewLifecycleOwner) {
+            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode, it)
+        }
+    }
+
     private fun checkLastUpdateDay() {
         if (lastUpdatedDate?.isToday() == false) mainViewModel.forceTriggerCurrentFolder()
     }
diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
index 10753c2bc0..892d22b21a 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -326,35 +326,6 @@
         android:name="com.infomaniak.mail.ui.main.settings.AutoAdvanceSettingsFragment"
         android:label="AutoAdvanceSettingFragment"
         tools:layout="@layout/fragment_auto_advance_settings" />
-    <fragment
-        android:id="@+id/threadListDensitySettingFragment"
-        android:name="com.infomaniak.mail.ui.main.settings.ThreadListDensitySettingFragment"
-        android:label="ListDensitySettingFragment"
-        tools:layout="@layout/fragment_thread_list_density_setting" />
-
-    <fragment
-        android:id="@+id/themeSettingFragment"
-        android:name="com.infomaniak.mail.ui.main.settings.ThemeSettingFragment"
-        android:label="ThemeSettingFragment"
-        tools:layout="@layout/fragment_theme_setting" />
-
-    <fragment
-        android:id="@+id/accentColorSettingFragment"
-        android:name="com.infomaniak.mail.ui.main.settings.AccentColorSettingFragment"
-        android:label="AccentColorSettingFragment"
-        tools:layout="@layout/fragment_accent_color_setting" />
-
-    <fragment
-        android:id="@+id/threadModeSettingFragment"
-        android:name="com.infomaniak.mail.ui.main.settings.ThreadModeSettingFragment"
-        android:label="ThreadModeSettingFragment"
-        tools:layout="@layout/fragment_thread_mode_setting" />
-
-    <fragment
-        android:id="@+id/externalContentSettingFragment"
-        android:name="com.infomaniak.mail.ui.main.settings.ExternalContentSettingFragment"
-        android:label="ExternalContentSettingFragment"
-        tools:layout="@layout/fragment_external_content_setting" />
 
     <fragment
         android:id="@+id/mailboxSettingsFragment"

From 8f4fa905d37a0c6ae8869bec4dc376121be50117 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Wed, 8 May 2024 09:35:43 +0200
Subject: [PATCH 10/29] Apply suggestion from code review

---
 .../cache/mailboxContent/MessageController.kt |  8 +++++
 .../cache/mailboxContent/ThreadController.kt  |  5 ---
 .../com/infomaniak/mail/ui/MainViewModel.kt   | 31 +++++++-----------
 .../mail/ui/main/folder/ThreadListAdapter.kt  | 32 +++++++++----------
 .../mail/ui/main/folder/ThreadListFragment.kt | 10 +++---
 .../settings/AutoAdvanceSettingsFragment.kt   | 16 ++++++----
 .../main/settings/SettingRadioButtonView.kt   | 15 ---------
 .../mail/ui/main/thread/ThreadFragment.kt     |  1 -
 .../layout/fragment_auto_advance_settings.xml | 27 ++++++++++++----
 app/src/main/res/layout/fragment_settings.xml |  1 -
 .../res/layout/view_setting_radio_button.xml  | 10 ------
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values-es/strings.xml        |  6 ++--
 app/src/main/res/values-it/strings.xml        |  2 +-
 app/src/main/res/values/attrs.xml             |  1 -
 app/src/main/res/values/strings.xml           |  4 +--
 16 files changed, 77 insertions(+), 94 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
index 024f3138c7..15f7197993 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
@@ -25,6 +25,7 @@ import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.data.models.thread.Thread.ThreadFilter
 import com.infomaniak.mail.utils.AccountUtils
 import io.realm.kotlin.MutableRealm
+import io.realm.kotlin.Realm
 import io.realm.kotlin.TypedRealm
 import io.realm.kotlin.UpdatePolicy
 import io.realm.kotlin.ext.copyFromRealm
@@ -137,6 +138,12 @@ class MessageController @Inject constructor(private val mailboxContentRealm: Rea
     fun getMessagesAsync(messageUid: String): Flow<ResultsChange<Message>> {
         return getMessagesQuery(messageUid, mailboxContentRealm()).asFlow()
     }
+
+    fun getMessageCountInThreadForFolder(threadUid: String, folderId: String, realm: Realm): Long? {
+        return ThreadController.getThread(threadUid, realm)
+            ?.messages?.query("${Message::folderId.name} == $0", folderId)
+            ?.count()?.find()
+    }
     //endregion
 
     //region Edit data
@@ -198,6 +205,7 @@ class MessageController @Inject constructor(private val mailboxContentRealm: Rea
         fun getNewestMessages(folderId: String, limit: Int, realm: MutableRealm): List<Message> {
             return getOldestOrNewestMessagesQuery(folderId, Sort.DESCENDING, realm, limit).find()
         }
+
         //endregion
 
         //region Edit data
diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt
index f8ed1596c8..ecdd7a0642 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ThreadController.kt
@@ -71,11 +71,6 @@ class ThreadController @Inject constructor(
         return getThreadQuery(uid, mailboxContentRealm()).asFlow()
     }
 
-    fun getMessageCountInThreadForFolder(threadUid: String, folderId : String) : Int{
-        return getThreadQuery(threadUid, mailboxContentRealm()).find()?.messages?.query("${Message::folderId.name} == $0", folderId)?.count()
-            ?.find()?.toInt() ?: -1
-    }
-
     /**
      * Initialize and retrieve the search Threads obtained from the API.
      * - Format the remote threads to make them compatible with the existing logic.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 9ead6e1bac..832430d440 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -110,7 +110,7 @@ class MainViewModel @Inject constructor(
     val reportPhishingTrigger = SingleLiveEvent<Unit>()
     val canInstallUpdate = MutableLiveData(false)
 
-    val threadUidToDeleteOrArchive = MutableLiveData<List<String>>()
+    val threadUidsToDeleteOrArchive = MutableLiveData<List<String>>()
 
     val mailboxesLive = mailboxController.getMailboxesAsync(AccountUtils.currentUserId).asLiveData(ioCoroutineContext)
 
@@ -443,18 +443,18 @@ class MainViewModel @Inject constructor(
     //region Delete
     fun deleteMessage(threadUid: String, message: Message) {
         val threadUidsList = listOf(threadUid)
-        if (isMessageTheLastInFolder(threadUid)) threadUidToDeleteOrArchive.postValue(threadUidsList)
+        if (threadHasOnlyOneMessageLeftInCurrentFolder(threadUid)) threadUidsToDeleteOrArchive.postValue(threadUidsList)
         deleteThreadsOrMessage(threadsUids = threadUidsList, message = message)
     }
 
     fun deleteThread(threadUid: String, isSwipe: Boolean = false) {
         val threadUidList = listOf(threadUid)
-        threadUidToDeleteOrArchive.postValue(threadUidList)
+        threadUidsToDeleteOrArchive.postValue(threadUidList)
         deleteThreadsOrMessage(threadsUids = threadUidList, isSwipe = isSwipe)
     }
 
     fun deleteThreads(threadsUids: List<String>) {
-        threadUidToDeleteOrArchive.postValue(threadsUids)
+        threadUidsToDeleteOrArchive.postValue(threadsUids)
         deleteThreadsOrMessage(threadsUids = threadsUids)
     }
 
@@ -506,7 +506,6 @@ class MainViewModel @Inject constructor(
             undoDestinationId,
             threads.count(),
         )
-
     }
 
     private fun showDeleteSnackbar(
@@ -578,7 +577,7 @@ class MainViewModel @Inject constructor(
 
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
-        threadUidToDeleteOrArchive.postValue(threadsUids.toList())
+        threadUidsToDeleteOrArchive.postValue(threadsUids.toList())
 
         if (apiResponse.isSuccess()) {
             refreshFoldersAsync(
@@ -618,18 +617,18 @@ class MainViewModel @Inject constructor(
     //region Archive
     fun archiveMessage(threadUid: String, message: Message) {
         val threadUidsList = listOf(threadUid)
-        if (isMessageTheLastInFolder(threadUid)) threadUidToDeleteOrArchive.postValue(threadUidsList)
+        if (threadHasOnlyOneMessageLeftInCurrentFolder(threadUid)) threadUidsToDeleteOrArchive.postValue(threadUidsList)
         archiveThreadsOrMessage(threadsUids = threadUidsList, message = message)
     }
 
     fun archiveThread(threadUid: String) {
         val threadUidsList = listOf(threadUid)
-        threadUidToDeleteOrArchive.postValue(threadUidsList)
+        threadUidsToDeleteOrArchive.postValue(threadUidsList)
         archiveThreadsOrMessage(threadsUids = threadUidsList)
     }
 
     fun archiveThreads(threadsUids: List<String>) {
-        threadUidToDeleteOrArchive.postValue(threadsUids)
+        threadUidsToDeleteOrArchive.postValue(threadsUids)
         archiveThreadsOrMessage(threadsUids = threadsUids)
     }
 
@@ -637,7 +636,6 @@ class MainViewModel @Inject constructor(
         threadsUids: List<String>,
         message: Message? = null,
     ) = viewModelScope.launch(ioCoroutineContext) {
-
         val mailbox = currentMailbox.value!!
         val threads = getActionThreads(threadsUids).ifEmpty { return@launch }
 
@@ -659,7 +657,6 @@ class MainViewModel @Inject constructor(
                 destinationFolderId = destinationFolder.id,
                 callbacks = RefreshCallbacks(::onDownloadStart, ::onDownloadStop),
             )
-
         }
 
         showMoveSnackbar(threads, message, messages, apiResponse, destinationFolder)
@@ -1056,19 +1053,15 @@ class MainViewModel @Inject constructor(
         snackbarManager.postValue(appContext.getString(snackbarTitleRes))
     }
 
-    private fun isMessageTheLastInFolder(threadUid: String): Boolean {
-        currentFolderId?.let { folderId ->
-            if (threadController.getMessageCountInThreadForFolder(threadUid, folderId) == 1) {
-                return true
-            }
-        }
-        return false
+    private fun threadHasOnlyOneMessageLeftInCurrentFolder(threadUid: String): Boolean {
+        val folderId = currentFolderId ?: return false
+        return messageController.getMessageCountInThreadForFolder(threadUid, folderId, mailboxContentRealm()) == 1L
     }
 
     companion object {
         private val TAG: String = MainViewModel::class.java.simpleName
         private val DEFAULT_SELECTED_FOLDER = FolderRole.INBOX
-        private const val REFRESH_DELAY = 2_000L // We add this delay because it doesn't always work if we just use the `etop`.
+        private const val REFRESH_DELAY = 2_000L // We add this delay because `etop` isn't always big enough.
         private const val MAX_REFRESH_DELAY = 6_000L
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index a07932080c..83124e5730 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -40,6 +40,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.ernestoyaquello.dragdropswiperecyclerview.DragDropSwipeAdapter
 import com.ernestoyaquello.dragdropswiperecyclerview.DragDropSwipeRecyclerView
+import com.ernestoyaquello.dragdropswiperecyclerview.util.DragDropSwipeDiffCallback
 import com.google.android.material.card.MaterialCardView
 import com.infomaniak.lib.core.MatomoCore.TrackerAction
 import com.infomaniak.lib.core.utils.*
@@ -100,7 +101,9 @@ class ThreadListAdapter @Inject constructor(
 
     //region Tablet mode
     var openedThreadPosition: Int? = null
-    private var openedThreadUid: String? = null
+        private set
+    var openedThreadUid: String? = null
+        private set
     //endregion
 
     init {
@@ -218,9 +221,9 @@ class ThreadListAdapter @Inject constructor(
 
         selectionCardView.setOnClickListener {
             previousThreadClickedPosition?.let { previousThreadClickedPosition ->
-                if (position < previousThreadClickedPosition) {
+                if (position > previousThreadClickedPosition) {
                     localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.FOLLOWING_THREAD
-                } else if (position > previousThreadClickedPosition) {
+                } else {
                     localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.PREVIOUS_THREAD
                 }
             }
@@ -325,19 +328,14 @@ class ThreadListAdapter @Inject constructor(
         if (newPosition != null) notifyItemChanged(newPosition, NotificationType.SELECTED_STATE)
     }
 
-    fun openThreadByPosition(autoAdvanceMode: AutoAdvanceMode, threadDeleteUid: List<String>) {
-        if (threadDeleteUid.contains(openedThreadUid)) {
-            val nextThreadData: Pair<Thread, Int>? = openedThreadPosition?.let {
-                getNextThreadToOpenByPosition(it, autoAdvanceMode)
+    fun openThreadByPosition(autoAdvanceMode: AutoAdvanceMode) {
+        openedThreadPosition?.let {
+            val (nextThread, indexNextThread) = getNextThreadToOpenByPosition(it, autoAdvanceMode) ?: return@let
+            if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
+                selectNewThread(newPosition = indexNextThread, nextThread.uid)
             }
 
-            nextThreadData?.let { (nextThread, indexNextThread) ->
-                if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
-                    selectNewThread(newPosition = indexNextThread, nextThread.uid)
-                }
-
-                onThreadClicked?.invoke(nextThread)
-            }
+            onThreadClicked?.invoke(nextThread)
         }
     }
 
@@ -622,7 +620,7 @@ class ThreadListAdapter @Inject constructor(
         return getItemViewType(position) == DisplayType.THREAD.layout && swipingIsAuthorized
     }
 
-    override fun createDiffUtil(oldList: List<Any>, newList: List<Any>) = null
+    override fun createDiffUtil(oldList: List<Any>, newList: List<Any>): DragDropSwipeDiffCallback<Any>? = null
 
     override fun updateList(itemList: List<Thread>, lifecycleScope: LifecycleCoroutineScope) {
 
@@ -734,8 +732,8 @@ class ThreadListAdapter @Inject constructor(
         private const val FULL_MONTH = "MMMM"
         private const val MONTH_AND_YEAR = "MMMM yyyy"
 
-        private const val PREVIOUS_CHRONOLOGICAL_THREAD = 1
-        private const val NEXT_CHRONOLOGICAL_THREAD = -1
+        private const val PREVIOUS_CHRONOLOGICAL_THREAD = -1
+        private const val NEXT_CHRONOLOGICAL_THREAD = 1
     }
 
     class ThreadListViewHolder(val binding: ViewBinding) : ViewHolder(binding.root) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index 2e3c4ef14f..64847a0ffe 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -163,7 +163,7 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         observeFlushFolderTrigger()
         observeUpdateInstall()
         observeLoadMoreTriggers()
-        observeArchiveOrDelete()
+        observeClosedThread()
     }.getOrDefault(Unit)
 
     @ColorRes
@@ -626,9 +626,11 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         }
     }
 
-    private fun observeArchiveOrDelete() {
-        mainViewModel.threadUidToDeleteOrArchive.observe(viewLifecycleOwner) {
-            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode, it)
+    private fun observeClosedThread() {
+        mainViewModel.threadUidsToDeleteOrArchive.observe(viewLifecycleOwner) { listThreadsUids ->
+            if(!listThreadsUids.contains(threadListAdapter.openedThreadUid))
+                return@observe
+            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode)
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
index 830fdfb765..85fa49664b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -21,11 +21,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import com.infomaniak.lib.core.utils.safeBinding
 import com.infomaniak.mail.MatomoMail.trackAutoAdvanceEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
+import com.infomaniak.mail.data.LocalSettings.AutoAdvanceMode
 import com.infomaniak.mail.databinding.FragmentAutoAdvanceSettingsBinding
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
@@ -48,22 +50,22 @@ class AutoAdvanceSettingsFragment : Fragment() {
         setSystemBarsColors()
 
         radioGroup.initBijectionTable(
-            R.id.lastAction to LocalSettings.AutoAdvanceMode.NATURAL_THREAD,
-            R.id.nextThread to LocalSettings.AutoAdvanceMode.FOLLOWING_THREAD,
-            R.id.listThread to LocalSettings.AutoAdvanceMode.LIST_THREAD,
-            R.id.lastThread to LocalSettings.AutoAdvanceMode.PREVIOUS_THREAD,
+            R.id.lastAction to AutoAdvanceMode.NATURAL_THREAD,
+            R.id.nextThread to AutoAdvanceMode.FOLLOWING_THREAD,
+            R.id.listThread to AutoAdvanceMode.LIST_THREAD,
+            R.id.lastThread to AutoAdvanceMode.PREVIOUS_THREAD,
         )
 
         radioGroup.check(localSettings.autoAdvanceMode)
 
         radioGroup.onItemCheckedListener { _, _, autoAdvanceMode ->
-            chooseAutoAdvanceMode(autoAdvanceMode as LocalSettings.AutoAdvanceMode)
-            lastAction.setSubTextVisibility(if (autoAdvanceMode == LocalSettings.AutoAdvanceMode.NATURAL_THREAD) View.VISIBLE else View.GONE)
+            chooseAutoAdvanceMode(autoAdvanceMode as AutoAdvanceMode)
+            descriptionLastAction.isVisible = autoAdvanceMode == AutoAdvanceMode.NATURAL_THREAD
             trackAutoAdvanceEvent(autoAdvanceMode.id)
         }
     }
 
-    private fun chooseAutoAdvanceMode(autoAdvanceMode: LocalSettings.AutoAdvanceMode) {
+    private fun chooseAutoAdvanceMode(autoAdvanceMode: AutoAdvanceMode) {
         localSettings.autoAdvanceMode = autoAdvanceMode
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
index 373e91949f..86f6121312 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
@@ -19,9 +19,7 @@ package com.infomaniak.mail.ui.main.settings
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.opengl.Visibility
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.annotation.ColorInt
@@ -61,15 +59,6 @@ class SettingRadioButtonView @JvmOverloads constructor(
                 text.text = textString
                 checkMark.setColorFilter(checkMarkColor)
 
-                getString(R.styleable.SettingRadioButtonView_subText).let {
-                    subText.apply {
-                        subText.text = it
-                        subText.visibility = GONE
-                    }
-                }
-
-
-
                 root.setOnClickListener {
                     (parent as? OnCheckListener)?.onChecked(this@SettingRadioButtonView.id) ?: onClickListener?.onClick(root)
                 }
@@ -102,10 +91,6 @@ class SettingRadioButtonView @JvmOverloads constructor(
         }
     }
 
-    fun setSubTextVisibility(visibility: Int) = with(binding.subText){
-        this.visibility = visibility
-    }
-
     override fun setOnClickListener(listener: OnClickListener?) {
         onClickListener = listener
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index b59ed818fc..c6da3578c3 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -44,7 +44,6 @@ import com.infomaniak.mail.MatomoMail.ACTION_FORWARD_NAME
 import com.infomaniak.mail.MatomoMail.ACTION_REPLY_NAME
 import com.infomaniak.mail.MatomoMail.OPEN_ACTION_BOTTOM_SHEET
 import com.infomaniak.mail.MatomoMail.OPEN_FROM_DRAFT_NAME
-import com.infomaniak.mail.MatomoMail.shouldOptOut
 import com.infomaniak.mail.MatomoMail.trackAttachmentActionsEvent
 import com.infomaniak.mail.MatomoMail.trackMessageActionsEvent
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
diff --git a/app/src/main/res/layout/fragment_auto_advance_settings.xml b/app/src/main/res/layout/fragment_auto_advance_settings.xml
index b6c0d42a26..a4c7cf86f1 100644
--- a/app/src/main/res/layout/fragment_auto_advance_settings.xml
+++ b/app/src/main/res/layout/fragment_auto_advance_settings.xml
@@ -39,40 +39,53 @@
             <com.infomaniak.mail.ui.main.settings.SettingRadioGroupView
                 android:id="@+id/radioGroup"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:ignoreDividers="true">
 
                 <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
                     android:id="@+id/lastThread"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:text="@string/settingsAutoAdvancePreviousThreadTitle"
-                    app:value="lastThread"/>
+                    app:value="lastThread" />
+
+                <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
 
                 <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
                     android:id="@+id/nextThread"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:text="@string/settingsAutoAdvanceFollowingThreadTitle"
-                    app:value="nextThread"/>
+                    app:value="nextThread" />
+
+                <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
 
                 <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
                     android:id="@+id/listThread"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:text="@string/settingsAutoAdvanceListOfThreadsTitle"
-                    app:value="listThread"/>
+                    app:value="listThread" />
+
+                <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
 
                 <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
                     android:id="@+id/lastAction"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:subText="@string/settingsAutoAdvanceNaturalThreadHint"
                     app:text="@string/settingsAutoAdvanceNaturalThreadTitle"
-                    app:value="lastAction"/>
+                    app:value="lastAction" />
 
+                <TextView
+                    android:id="@+id/descriptionLastAction"
+                    style="@style/BodySmall.Tertiary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/marginStandardMedium"
+                    android:paddingEnd="@dimen/marginStandardMedium"
+                    android:text="@string/settingsAutoAdvanceNaturalThreadHint" />
 
             </com.infomaniak.mail.ui.main.settings.SettingRadioGroupView>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-
 </com.infomaniak.mail.ui.main.menu.SimpleSettingView>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 99ff6c9d7b..82bc3041f6 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -110,7 +110,6 @@
                 app:title="@string/settingsAutoAdvanceTitle"
                 tools:subtitle="@string/settingsAutoAdvanceDescription" />
 
-
             <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
 
             <TextView
diff --git a/app/src/main/res/layout/view_setting_radio_button.xml b/app/src/main/res/layout/view_setting_radio_button.xml
index c5c5d518e1..921e6a0a85 100644
--- a/app/src/main/res/layout/view_setting_radio_button.xml
+++ b/app/src/main/res/layout/view_setting_radio_button.xml
@@ -44,16 +44,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Simple messages" />
-
-        <TextView
-            android:id="@+id/subText"
-            style="@style/BodySmall.Tertiary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            tools:text="@string/settingsDefault"
-            tools:visibility="visible"
-            android:paddingTop="@dimen/marginStandardVerySmall"/>
     </LinearLayout>
 
     <ImageView
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 424d09ee00..285713e1dc 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -393,7 +393,7 @@
     <string name="settingsAppLock">App-Sperre</string>
     <string name="settingsAuthorizeTracking">Verfolgung genehmigen</string>
     <string name="settingsAutoAdvanceDescription">Auswählen, was angezeigt werden soll, wenn eine Nachricht archiviert oder gelöscht wird</string>
-    <string name="settingsAutoAdvanceFollowingThreadDescription">Beim Archivieren oder Löschen folgenden Thread anzeigen\n</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Beim Archivieren oder Löschen folgenden Thread anzeigen</string>
     <string name="settingsAutoAdvanceFollowingThreadTitle">Folgender Thread</string>
     <string name="settingsAutoAdvanceListOfThreadsDescription">Liste der Threads beim Archivieren oder Löschen anzeigen</string>
     <string name="settingsAutoAdvanceListOfThreadsTitle">Liste der Themen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 58aa9a3cfc..f43d5fd0a2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -393,15 +393,15 @@
     <string name="settingsAppLock">Bloqueo de aplicaciones</string>
     <string name="settingsAuthorizeTracking">Autorizar el seguimiento</string>
     <string name="settingsAutoAdvanceDescription">Seleccione qué mostrar cuando se archiva o elimina un mensaje</string>
-    <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar el siguiente hilo al archivar o borrar\n</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar el siguiente hilo al archivar o borrar</string>
     <string name="settingsAutoAdvanceFollowingThreadTitle">Siguiendo el hilo</string>
     <string name="settingsAutoAdvanceListOfThreadsDescription">Mostrar lista de hilos al archivar o borrar</string>
-    <string name="settingsAutoAdvanceListOfThreadsTitle">Lista de temas</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Lista de conversaciones</string>
     <string name="settingsAutoAdvanceNaturalThreadDescription">Repite la última acción realizada</string>
     <string name="settingsAutoAdvanceNaturalThreadHint">Selecciona automáticamente la conversación siguiente o anterior, en función de tu última interacción.</string>
     <string name="settingsAutoAdvanceNaturalThreadTitle">Repetir la última acción</string>
     <string name="settingsAutoAdvancePreviousThreadDescription">Mostrar el hilo anterior al archivar o borrar</string>
-    <string name="settingsAutoAdvancePreviousThreadTitle">Tema anterior</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Conversación anterior</string>
     <string name="settingsAutoAdvanceTitle">Auto advance</string>
     <string name="settingsCancellationPeriodDescription">Tiene la posibilidad de cancelar el envío de su correo electrónico hasta 30 segundos</string>
     <string name="settingsCancellationPeriodTitle">Enviar plazo de anulación</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0fd5efa65d..b2c59c0bb0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -393,7 +393,7 @@
     <string name="settingsAppLock">Blocco dell’app</string>
     <string name="settingsAuthorizeTracking">Autorizza il tracciamento</string>
     <string name="settingsAutoAdvanceDescription">Selezionare cosa visualizzare quando un messaggio viene archiviato o eliminato</string>
-    <string name="settingsAutoAdvanceFollowingThreadDescription">Visualizza la seguente discussione quando si archivia o si elimina\n</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Visualizza la seguente discussione quando si archivia o si elimina</string>
     <string name="settingsAutoAdvanceFollowingThreadTitle">Seguendo il filo conduttore</string>
     <string name="settingsAutoAdvanceListOfThreadsDescription">Visualizzazione dell’elenco delle discussioni durante l’archiviazione o la cancellazione</string>
     <string name="settingsAutoAdvanceListOfThreadsTitle">Elenco delle discussioni</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index e1788eb1b5..98f3c0c9c1 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -101,7 +101,6 @@
     <declare-styleable name="SettingRadioButtonView">
         <attr name="icon" />
         <attr name="text" />
-        <attr name="subText" format="string"/>
         <attr name="checkMarkColor" format="color" />
         <attr name="value" format="string" />
     </declare-styleable>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6f65a15ec..abcdc6519f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -398,8 +398,8 @@
     <string name="settingsAiEngineDescription">Select your AI writing assistant</string>
     <string name="settingsAppLock">App lock</string>
     <string name="settingsAuthorizeTracking">Authorize tracking</string>
-    <string name="settingsAutoAdvanceDescription">Select what to display when a message is archived or deleted\u0020</string>
-    <string name="settingsAutoAdvanceFollowingThreadDescription">Display following thread when archiving or deleting\n</string>
+    <string name="settingsAutoAdvanceDescription">Select what to display when a message is archived or deleted</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Display following thread when archiving or deleting</string>
     <string name="settingsAutoAdvanceFollowingThreadTitle">Following thread</string>
     <string name="settingsAutoAdvanceListOfThreadsDescription">Display list of threads when archiving or deleting</string>
     <string name="settingsAutoAdvanceListOfThreadsTitle">List of threads</string>

From 9f065d6bbb2410f45311d58b21c634ab4650673d Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Wed, 8 May 2024 15:08:48 +0200
Subject: [PATCH 11/29] Modify last action mode logic

---
 .../mail/ui/main/folder/ThreadListAdapter.kt           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 83124e5730..1e5fa920ba 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -310,6 +310,16 @@ class ThreadListAdapter @Inject constructor(
         if (multiSelection?.isEnabled == true) {
             toggleMultiSelectedThread(thread)
         } else {
+            previousThreadClickedPosition?.let { previousThreadClickedPosition ->
+                if (position > previousThreadClickedPosition) {
+                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.FOLLOWING_THREAD
+                } else {
+                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.PREVIOUS_THREAD
+                }
+            }
+
+            previousThreadClickedPosition = position
+
             onThreadClicked?.invoke(thread)
             // If the Thread is `onlyOneDraft`, we'll directly navigate to the NewMessageActivity.
             // It means that we won't go to the ThreadFragment, so there's no need to select anything.

From eab0a16e3cb0d9514816e81f22fb7ba21532e6a7 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Wed, 8 May 2024 15:09:11 +0200
Subject: [PATCH 12/29] Correction String

Remove not used string in feature
---
 app/src/main/res/values-es/strings.xml | 10 +++++-----
 app/src/main/res/values-it/strings.xml |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f43d5fd0a2..5703c447e8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -393,16 +393,16 @@
     <string name="settingsAppLock">Bloqueo de aplicaciones</string>
     <string name="settingsAuthorizeTracking">Autorizar el seguimiento</string>
     <string name="settingsAutoAdvanceDescription">Seleccione qué mostrar cuando se archiva o elimina un mensaje</string>
-    <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar el siguiente hilo al archivar o borrar</string>
-    <string name="settingsAutoAdvanceFollowingThreadTitle">Siguiendo el hilo</string>
-    <string name="settingsAutoAdvanceListOfThreadsDescription">Mostrar lista de hilos al archivar o borrar</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar el siguiente conversación al archivar o borrar</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Siguiendo el conversación</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Mostrar lista de conversaciones al archivar o borrar</string>
     <string name="settingsAutoAdvanceListOfThreadsTitle">Lista de conversaciones</string>
     <string name="settingsAutoAdvanceNaturalThreadDescription">Repite la última acción realizada</string>
     <string name="settingsAutoAdvanceNaturalThreadHint">Selecciona automáticamente la conversación siguiente o anterior, en función de tu última interacción.</string>
     <string name="settingsAutoAdvanceNaturalThreadTitle">Repetir la última acción</string>
-    <string name="settingsAutoAdvancePreviousThreadDescription">Mostrar el hilo anterior al archivar o borrar</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Mostrar el conversación anterior al archivar o borrar</string>
     <string name="settingsAutoAdvancePreviousThreadTitle">Conversación anterior</string>
-    <string name="settingsAutoAdvanceTitle">Auto advance</string>
+    <string name="settingsAutoAdvanceTitle">Avance automático</string>
     <string name="settingsCancellationPeriodDescription">Tiene la posibilidad de cancelar el envío de su correo electrónico hasta 30 segundos</string>
     <string name="settingsCancellationPeriodTitle">Enviar plazo de anulación</string>
     <string name="settingsDataManagementDescription">Puede personalizar los datos de uso y funcionamiento que Infomaniak recupera para corregir errores y mejorar la aplicación. Ambas herramientas están alojadas y gestionadas exclusivamente por nosotros.\n\nInfomaniak respeta su privacidad: el código fuente de esta aplicación puede verificarse, la información recopilada es anónima y sus datos personales permanecen estrictamente confidenciales y nunca se comparten con terceros.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b2c59c0bb0..0ebb51088c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -406,7 +406,7 @@
     <string name="settingsCancellationPeriodDescription">Avete la possibilità di annullare l’invio della vostra email fino a 30 secondi.</string>
     <string name="settingsCancellationPeriodTitle">Periodo di cancellazione dell’invio</string>
     <string name="settingsDataManagementDescription">È possibile personalizzare i dati di utilizzo e operativi che Infomaniak recupera per correggere i bug e migliorare l’applicazione. Entrambi gli strumenti sono ospitati e gestiti esclusivamente da noi.\n\nInfomaniak rispetta la vostra privacy: il codice sorgente di questa applicazione può essere verificato, le informazioni raccolte sono anonime e i vostri dati personali rimangono strettamente confidenziali e non vengono mai condivisi con terze parti.</string>
-    <string name="settingsDataManagementSourceCode">Vedere il codice sorgente</string>
+    <string name="settingsDataManagementSourceCode">Vedi il codice sorgente</string>
     <string name="settingsDataManagementTitle">Gestione dei dati</string>
     <string name="settingsDefault">Predefinito</string>
     <string name="settingsDelaySeconds">%d secondi</string>
@@ -416,7 +416,7 @@
     <string name="settingsDisabled">Disabili</string>
     <string name="settingsEnabled">Abilitato</string>
     <string name="settingsExternalContentDescription">Visualizzare il contenuto esterno</string>
-    <string name="settingsExternalContentTitle">contenuto esterno</string>
+    <string name="settingsExternalContentTitle">Contenuto esterno</string>
     <string name="settingsInboxAlias">Alias</string>
     <string name="settingsInboxRedirect">Reindirizzamenti</string>
     <string name="settingsInboxRules">Regole</string>
@@ -428,7 +428,7 @@
     <string name="settingsMatomoDescription">Matomo è uno strumento di analisi ospitato e gestito esclusivamente da Infomaniak per capire come viene utilizzata l’applicazione.\n\nStudiando questi dati, il nostro team è in grado di migliorare continuamente l’interfaccia dell’applicazione.</string>
     <string name="settingsMatomoTitle">Matomo</string>
     <string name="settingsOptionAlways">Sempre</string>
-    <string name="settingsOptionAskMe">Chiedetemi</string>
+    <string name="settingsOptionAskMe">Chiedi</string>
     <string name="settingsOptionDarkTheme">Scuro</string>
     <string name="settingsOptionLightTheme">Chiaro</string>
     <string name="settingsOptionSystemTheme">Sistema</string>

From da655251fb84d7bd04e7c860baaacfab7458ef60 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Wed, 8 May 2024 15:36:36 +0200
Subject: [PATCH 13/29] Regroup all call in same place

---
 .../com/infomaniak/mail/ui/MainViewModel.kt   | 36 ++++++++++---------
 .../mail/ui/main/folder/ThreadListAdapter.kt  | 21 +++--------
 .../mail/ui/main/folder/ThreadListFragment.kt |  6 ++--
 .../main/res/navigation/main_navigation.xml   | 15 ++++----
 4 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 832430d440..8612a7bd3d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -110,7 +110,7 @@ class MainViewModel @Inject constructor(
     val reportPhishingTrigger = SingleLiveEvent<Unit>()
     val canInstallUpdate = MutableLiveData(false)
 
-    val threadUidsToDeleteOrArchive = MutableLiveData<List<String>>()
+    val autoAdvanceTrigger = MutableLiveData<List<String>>()
 
     val mailboxesLive = mailboxController.getMailboxesAsync(AccountUtils.currentUserId).asLiveData(ioCoroutineContext)
 
@@ -442,19 +442,14 @@ class MainViewModel @Inject constructor(
 
     //region Delete
     fun deleteMessage(threadUid: String, message: Message) {
-        val threadUidsList = listOf(threadUid)
-        if (threadHasOnlyOneMessageLeftInCurrentFolder(threadUid)) threadUidsToDeleteOrArchive.postValue(threadUidsList)
-        deleteThreadsOrMessage(threadsUids = threadUidsList, message = message)
+        deleteThreadsOrMessage(threadsUids = listOf(threadUid), message = message)
     }
 
     fun deleteThread(threadUid: String, isSwipe: Boolean = false) {
-        val threadUidList = listOf(threadUid)
-        threadUidsToDeleteOrArchive.postValue(threadUidList)
-        deleteThreadsOrMessage(threadsUids = threadUidList, isSwipe = isSwipe)
+        deleteThreadsOrMessage(threadsUids = listOf(threadUid), isSwipe = isSwipe)
     }
 
     fun deleteThreads(threadsUids: List<String>) {
-        threadUidsToDeleteOrArchive.postValue(threadsUids)
         deleteThreadsOrMessage(threadsUids = threadsUids)
     }
 
@@ -484,6 +479,12 @@ class MainViewModel @Inject constructor(
 
         deleteThreadOrMessageTrigger.postValue(Unit)
         if (apiResponse.isSuccess()) {
+            if (message == null) {
+                autoAdvanceTrigger.postValue(threadsUids)
+            } else if (threadHasOnlyOneMessageLeftInCurrentFolder(threadsUids.first())) {
+                autoAdvanceTrigger.postValue(threadsUids)
+            }
+
             refreshFoldersAsync(
                 mailbox = mailbox,
                 messagesFoldersIds = messages.getFoldersIds(exception = trashId),
@@ -577,9 +578,9 @@ class MainViewModel @Inject constructor(
 
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
-        threadUidsToDeleteOrArchive.postValue(threadsUids.toList())
-
         if (apiResponse.isSuccess()) {
+            autoAdvanceTrigger.postValue(threadsUids.toList())
+
             refreshFoldersAsync(
                 mailbox = mailbox,
                 messagesFoldersIds = messages.getFoldersIds(exception = destinationFolder.id),
@@ -616,19 +617,14 @@ class MainViewModel @Inject constructor(
 
     //region Archive
     fun archiveMessage(threadUid: String, message: Message) {
-        val threadUidsList = listOf(threadUid)
-        if (threadHasOnlyOneMessageLeftInCurrentFolder(threadUid)) threadUidsToDeleteOrArchive.postValue(threadUidsList)
-        archiveThreadsOrMessage(threadsUids = threadUidsList, message = message)
+        archiveThreadsOrMessage(listOf(threadUid), message = message)
     }
 
     fun archiveThread(threadUid: String) {
-        val threadUidsList = listOf(threadUid)
-        threadUidsToDeleteOrArchive.postValue(threadUidsList)
-        archiveThreadsOrMessage(threadsUids = threadUidsList)
+        archiveThreadsOrMessage(listOf(threadUid))
     }
 
     fun archiveThreads(threadsUids: List<String>) {
-        threadUidsToDeleteOrArchive.postValue(threadsUids)
         archiveThreadsOrMessage(threadsUids = threadsUids)
     }
 
@@ -650,6 +646,12 @@ class MainViewModel @Inject constructor(
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
         if (apiResponse.isSuccess()) {
+            if (message == null) {
+                autoAdvanceTrigger.postValue(threadsUids)
+            } else if (threadHasOnlyOneMessageLeftInCurrentFolder(threadsUids.first())) {
+                autoAdvanceTrigger.postValue(threadsUids)
+            }
+
             val messagesFoldersIds = messages.getFoldersIds(exception = destinationFolder.id)
             refreshFoldersAsync(
                 mailbox = mailbox,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 1e5fa920ba..585f3df5cd 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -102,8 +102,7 @@ class ThreadListAdapter @Inject constructor(
     //region Tablet mode
     var openedThreadPosition: Int? = null
         private set
-    var openedThreadUid: String? = null
-        private set
+    private var openedThreadUid: String? = null
     //endregion
 
     init {
@@ -219,19 +218,7 @@ class ThreadListAdapter @Inject constructor(
             if (unseenMessagesCount == 0) setThreadUiRead() else setThreadUiUnread()
         }
 
-        selectionCardView.setOnClickListener {
-            previousThreadClickedPosition?.let { previousThreadClickedPosition ->
-                if (position > previousThreadClickedPosition) {
-                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.FOLLOWING_THREAD
-                } else {
-                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.PREVIOUS_THREAD
-                }
-            }
-
-            previousThreadClickedPosition = position
-
-            onThreadClicked(thread, position)
-        }
+        selectionCardView.setOnClickListener { onThreadClicked(thread, position) }
 
         multiSelection?.let { listener ->
             selectionCardView.setOnLongClickListener {
@@ -338,7 +325,9 @@ class ThreadListAdapter @Inject constructor(
         if (newPosition != null) notifyItemChanged(newPosition, NotificationType.SELECTED_STATE)
     }
 
-    fun openThreadByPosition(autoAdvanceMode: AutoAdvanceMode) {
+    fun tryToAutoAdvance(autoAdvanceMode: AutoAdvanceMode, listThreadUids : List<String>) {
+        if (!listThreadUids.contains(openedThreadUid)) return
+
         openedThreadPosition?.let {
             val (nextThread, indexNextThread) = getNextThreadToOpenByPosition(it, autoAdvanceMode) ?: return@let
             if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index 64847a0ffe..01e0dd876b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -627,10 +627,8 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     }
 
     private fun observeClosedThread() {
-        mainViewModel.threadUidsToDeleteOrArchive.observe(viewLifecycleOwner) { listThreadsUids ->
-            if(!listThreadsUids.contains(threadListAdapter.openedThreadUid))
-                return@observe
-            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode)
+        mainViewModel.autoAdvanceTrigger.observe(viewLifecycleOwner) { listThreadsUids ->
+            threadListAdapter.tryToAutoAdvance(localSettings.autoAdvanceMode, listThreadsUids)
         }
     }
 
diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
index 892d22b21a..5ee795898f 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -292,6 +292,12 @@
         <action
             android:id="@+id/action_settings_to_aiEngineSetting"
             app:destination="@id/aiEngineSettingFragment" />
+        <action
+            android:id="@+id/action_settings_to_externalContentSetting"
+            app:destination="@id/externalContentSettingFragment" />
+        <action
+            android:id="@+id/action_settings_to_autoAdvanceSettings"
+            app:destination="@id/autoAdvanceFragment" />
         <action
             android:id="@+id/action_settings_to_threadListDensitySetting"
             app:destination="@id/threadListDensitySettingFragment" />
@@ -310,15 +316,6 @@
         <action
             android:id="@+id/action_settings_to_dataManagementSettings"
             app:destination="@id/dataManagementSettingsFragment" />
-        <action
-            android:id="@+id/action_settings_to_externalContentSetting"
-            app:destination="@id/externalContentSettingFragment" />
-        <action
-            android:id="@+id/action_settingsFragment_to_aiEngineSettingFragment"
-            app:destination="@id/aiEngineSettingFragment" />
-        <action
-            android:id="@+id/action_settings_to_autoAdvanceSettings"
-            app:destination="@id/autoAdvanceFragment" />
     </fragment>
 
     <fragment

From bb16481389ec302069b743b77d7cd281746e56e5 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Wed, 8 May 2024 15:44:22 +0200
Subject: [PATCH 14/29] Apply suggestion from code review

---
 app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt     | 2 +-
 .../mail/ui/main/settings/AutoAdvanceSettingsFragment.kt        | 2 +-
 app/src/main/res/layout/fragment_settings.xml                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
index e77ce78eac..cb53a2bcfe 100644
--- a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
@@ -193,7 +193,7 @@ class LocalSettings private constructor(context: Context) : SharedValues {
         ASK_ME("false", R.string.settingsOptionAskMe, "askMe"),
     }
 
-    enum class AutoAdvanceMode(val id: String, @StringRes val localisedNameRes: Int) {
+    enum class AutoAdvanceMode(val matomoValue: String, @StringRes val localisedNameRes: Int) {
         PREVIOUS_THREAD("previousThread", R.string.settingsAutoAdvancePreviousThreadDescription),
         FOLLOWING_THREAD("followingThread", R.string.settingsAutoAdvanceFollowingThreadDescription),
         LIST_THREAD("listOfThread", R.string.settingsAutoAdvanceListOfThreadsDescription),
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
index 85fa49664b..6df6a98384 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -61,7 +61,7 @@ class AutoAdvanceSettingsFragment : Fragment() {
         radioGroup.onItemCheckedListener { _, _, autoAdvanceMode ->
             chooseAutoAdvanceMode(autoAdvanceMode as AutoAdvanceMode)
             descriptionLastAction.isVisible = autoAdvanceMode == AutoAdvanceMode.NATURAL_THREAD
-            trackAutoAdvanceEvent(autoAdvanceMode.id)
+            trackAutoAdvanceEvent(autoAdvanceMode.matomoValue)
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 82bc3041f6..b5ce44e272 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -108,7 +108,7 @@
                 android:layout_height="wrap_content"
                 app:itemAction="chevron"
                 app:title="@string/settingsAutoAdvanceTitle"
-                tools:subtitle="@string/settingsAutoAdvanceDescription" />
+                tools:subtitle="@string/settingsAutoAdvanceListOfThreadsDescription" />
 
             <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
 

From 322ec574c7f98311000470e2e82bbedfb8613744 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Fri, 10 May 2024 08:30:12 +0200
Subject: [PATCH 15/29] Better place auto advance logic

---
 .../mail/ui/main/folder/ThreadListAdapter.kt  | 38 ++-------------
 .../mail/ui/main/folder/ThreadListFragment.kt |  6 ---
 .../mail/ui/main/thread/ThreadFragment.kt     | 47 +++++++++++++++++++
 3 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 585f3df5cd..46790b938e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -102,7 +102,9 @@ class ThreadListAdapter @Inject constructor(
     //region Tablet mode
     var openedThreadPosition: Int? = null
         private set
-    private var openedThreadUid: String? = null
+    var openedThreadUid: String? = null
+        private set
+
     //endregion
 
     init {
@@ -315,7 +317,6 @@ class ThreadListAdapter @Inject constructor(
     }
 
     fun selectNewThread(newPosition: Int?, threadUid: String?) {
-
         val oldPosition = openedThreadPosition
 
         openedThreadPosition = newPosition
@@ -325,35 +326,7 @@ class ThreadListAdapter @Inject constructor(
         if (newPosition != null) notifyItemChanged(newPosition, NotificationType.SELECTED_STATE)
     }
 
-    fun tryToAutoAdvance(autoAdvanceMode: AutoAdvanceMode, listThreadUids : List<String>) {
-        if (!listThreadUids.contains(openedThreadUid)) return
-
-        openedThreadPosition?.let {
-            val (nextThread, indexNextThread) = getNextThreadToOpenByPosition(it, autoAdvanceMode) ?: return@let
-            if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
-                selectNewThread(newPosition = indexNextThread, nextThread.uid)
-            }
-
-            onThreadClicked?.invoke(nextThread)
-        }
-    }
-
-    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Pair<Thread, Int>? {
-        return when (autoAdvanceMode) {
-            AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-            AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-            AutoAdvanceMode.LIST_THREAD -> null
-            AutoAdvanceMode.NATURAL_THREAD -> {
-                if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
-                    getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-                } else {
-                    getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-                }
-            }
-        }
-    }
-
-    private fun getNextThread(startingThreadIndex: Int, direction: Int): Pair<Thread, Int>? {
+    fun getNextThread(startingThreadIndex: Int, direction: Int): Pair<Thread, Int>? {
         var currentIndexThread = startingThreadIndex
         currentIndexThread += direction
         while (currentIndexThread >= 0 && currentIndexThread <= dataSet.lastIndex) {
@@ -730,9 +703,6 @@ class ThreadListAdapter @Inject constructor(
 
         private const val FULL_MONTH = "MMMM"
         private const val MONTH_AND_YEAR = "MMMM yyyy"
-
-        private const val PREVIOUS_CHRONOLOGICAL_THREAD = -1
-        private const val NEXT_CHRONOLOGICAL_THREAD = 1
     }
 
     class ThreadListViewHolder(val binding: ViewBinding) : ViewHolder(binding.root) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index 01e0dd876b..ca5646c10c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -163,7 +163,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         observeFlushFolderTrigger()
         observeUpdateInstall()
         observeLoadMoreTriggers()
-        observeClosedThread()
     }.getOrDefault(Unit)
 
     @ColorRes
@@ -626,11 +625,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         }
     }
 
-    private fun observeClosedThread() {
-        mainViewModel.autoAdvanceTrigger.observe(viewLifecycleOwner) { listThreadsUids ->
-            threadListAdapter.tryToAutoAdvance(localSettings.autoAdvanceMode, listThreadsUids)
-        }
-    }
 
     private fun checkLastUpdateDay() {
         if (lastUpdatedDate?.isToday() == false) mainViewModel.forceTriggerCurrentFolder()
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index c6da3578c3..421e962779 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -50,11 +50,13 @@ import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.MatomoMail.trackThreadActionsEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
+import com.infomaniak.mail.data.LocalSettings.AutoAdvanceMode
 import com.infomaniak.mail.data.LocalSettings.ExternalContent
 import com.infomaniak.mail.data.api.ApiRoutes
 import com.infomaniak.mail.data.models.Folder.FolderRole
 import com.infomaniak.mail.data.models.draft.Draft.DraftMode
 import com.infomaniak.mail.data.models.message.Message
+import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.databinding.FragmentThreadBinding
 import com.infomaniak.mail.ui.MainViewModel
 import com.infomaniak.mail.ui.alertDialogs.*
@@ -145,6 +147,7 @@ class ThreadFragment : Fragment() {
         observeCurrentFolderName()
 
         observeThreadOpening()
+        observeClosedThread()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -462,6 +465,13 @@ class ThreadFragment : Fragment() {
         }
     }
 
+    private fun observeClosedThread() {
+        mainViewModel.autoAdvanceTrigger.observe(viewLifecycleOwner) { listThreadsUids ->
+            println("called")
+            tryToAutoAdvance(localSettings.autoAdvanceMode, listThreadsUids)
+        }
+    }
+
     private fun displayThreadView() = with(binding) {
         emptyView.isGone = true
         threadView.isVisible = true
@@ -621,6 +631,40 @@ class ThreadFragment : Fragment() {
         twoPaneViewModel.navArgs.value = NavData(resId, args)
     }
 
+    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Pair<Thread, Int>? =
+        with(twoPaneFragment.threadListAdapter) {
+            return when (autoAdvanceMode) {
+                AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
+                AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+                AutoAdvanceMode.LIST_THREAD -> null
+                AutoAdvanceMode.NATURAL_THREAD -> {
+                    if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
+                        getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
+                    } else {
+                        getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+                    }
+                }
+            }
+        }
+
+    private fun tryToAutoAdvance(autoAdvanceMode: AutoAdvanceMode, listThreadUids: List<String>) =
+        with(twoPaneFragment.threadListAdapter) {
+            if (!listThreadUids.contains(openedThreadUid)) return@with
+
+            openedThreadPosition?.let {
+                val data = getNextThreadToOpenByPosition(it, autoAdvanceMode)
+
+                data?.let { (nextThread, index) ->
+                    if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
+                        selectNewThread(newPosition = index, nextThread.uid)
+                    }
+                    onThreadClicked?.invoke(nextThread)
+                } ?: run {
+                    twoPaneViewModel.closeThread()
+                }
+            }
+        }
+
     enum class HeaderState {
         ELEVATED,
         LOWERED,
@@ -630,6 +674,9 @@ class ThreadFragment : Fragment() {
         private const val COLLAPSE_TITLE_THRESHOLD = 0.5
         private const val ARCHIVE_INDEX = 2
 
+        private const val PREVIOUS_CHRONOLOGICAL_THREAD = -1
+        private const val NEXT_CHRONOLOGICAL_THREAD = 1
+
         private fun allAttachmentsFileName(subject: String) = "infomaniak-mail-attachments-$subject.zip"
     }
 }

From 04e47f896a4daa415473dd8931bc829a5802357e Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Fri, 10 May 2024 08:40:35 +0200
Subject: [PATCH 16/29] Apply suggestion from code review

---
 .../cache/mailboxContent/MessageController.kt |  1 -
 .../com/infomaniak/mail/ui/MainViewModel.kt   |  4 +--
 .../mail/ui/main/folder/ThreadListAdapter.kt  |  9 ++---
 .../mail/ui/main/folder/ThreadListFragment.kt | 10 ++----
 .../main/settings/SettingRadioButtonView.kt   |  1 -
 .../mail/ui/main/thread/ThreadFragment.kt     | 33 +++++++++----------
 .../res/layout/view_setting_radio_button.xml  | 12 ++-----
 7 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
index 15f7197993..5d14d5ce48 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
@@ -205,7 +205,6 @@ class MessageController @Inject constructor(private val mailboxContentRealm: Rea
         fun getNewestMessages(folderId: String, limit: Int, realm: MutableRealm): List<Message> {
             return getOldestOrNewestMessagesQuery(folderId, Sort.DESCENDING, realm, limit).find()
         }
-
         //endregion
 
         //region Edit data
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 8612a7bd3d..7e7a6db02e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -617,11 +617,11 @@ class MainViewModel @Inject constructor(
 
     //region Archive
     fun archiveMessage(threadUid: String, message: Message) {
-        archiveThreadsOrMessage(listOf(threadUid), message = message)
+        archiveThreadsOrMessage(threadsUids = listOf(threadUid), message = message)
     }
 
     fun archiveThread(threadUid: String) {
-        archiveThreadsOrMessage(listOf(threadUid))
+        archiveThreadsOrMessage(threadsUids = listOf(threadUid))
     }
 
     fun archiveThreads(threadsUids: List<String>) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 46790b938e..1db0663b4c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -299,11 +299,11 @@ class ThreadListAdapter @Inject constructor(
         if (multiSelection?.isEnabled == true) {
             toggleMultiSelectedThread(thread)
         } else {
-            previousThreadClickedPosition?.let { previousThreadClickedPosition ->
-                if (position > previousThreadClickedPosition) {
-                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.FOLLOWING_THREAD
+            previousThreadClickedPosition?.let {
+                localSettings.autoAdvanceIntelligentMode = if (position > it) {
+                    AutoAdvanceMode.FOLLOWING_THREAD
                 } else {
-                    localSettings.autoAdvanceIntelligentMode = AutoAdvanceMode.PREVIOUS_THREAD
+                    AutoAdvanceMode.PREVIOUS_THREAD
                 }
             }
 
@@ -317,6 +317,7 @@ class ThreadListAdapter @Inject constructor(
     }
 
     fun selectNewThread(newPosition: Int?, threadUid: String?) {
+
         val oldPosition = openedThreadPosition
 
         openedThreadPosition = newPosition
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index ca5646c10c..3344df5e3c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -173,16 +173,13 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     override fun getRightPane(): FragmentContainerView? = _binding?.threadHostFragment
 
     override fun getAnchor(): View? {
-        return if (isSelectedThreadAtLastPositionOrStart() || !isOnlyRightShown()) {
-            _binding?.newMessageFab
-        } else {
+        return if (isOnlyRightShown()) {
             _binding?.threadHostFragment?.getFragment<ThreadFragment?>()?.getAnchor()
+        } else {
+            _binding?.newMessageFab
         }
     }
 
-    private fun isSelectedThreadAtLastPositionOrStart() =
-        threadListAdapter.openedThreadPosition == 1 || threadListAdapter.openedThreadPosition == threadListAdapter.dataSet.size
-
     override fun doAfterFolderChanged() {
         navigateFromNotificationToThread()
     }
@@ -625,7 +622,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         }
     }
 
-
     private fun checkLastUpdateDay() {
         if (lastUpdatedDate?.isToday() == false) mainViewModel.forceTriggerCurrentFolder()
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
index 86f6121312..bfe1725c3c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
@@ -55,7 +55,6 @@ class SettingRadioButtonView @JvmOverloads constructor(
                 associatedValue = getString(R.styleable.SettingRadioButtonView_value)
 
                 setIcon(iconDrawable)
-
                 text.text = textString
                 checkMark.setColorFilter(checkMarkColor)
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 421e962779..3e2f27af61 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -467,7 +467,6 @@ class ThreadFragment : Fragment() {
 
     private fun observeClosedThread() {
         mainViewModel.autoAdvanceTrigger.observe(viewLifecycleOwner) { listThreadsUids ->
-            println("called")
             tryToAutoAdvance(localSettings.autoAdvanceMode, listThreadsUids)
         }
     }
@@ -631,22 +630,6 @@ class ThreadFragment : Fragment() {
         twoPaneViewModel.navArgs.value = NavData(resId, args)
     }
 
-    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Pair<Thread, Int>? =
-        with(twoPaneFragment.threadListAdapter) {
-            return when (autoAdvanceMode) {
-                AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-                AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-                AutoAdvanceMode.LIST_THREAD -> null
-                AutoAdvanceMode.NATURAL_THREAD -> {
-                    if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
-                        getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-                    } else {
-                        getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-                    }
-                }
-            }
-        }
-
     private fun tryToAutoAdvance(autoAdvanceMode: AutoAdvanceMode, listThreadUids: List<String>) =
         with(twoPaneFragment.threadListAdapter) {
             if (!listThreadUids.contains(openedThreadUid)) return@with
@@ -665,6 +648,22 @@ class ThreadFragment : Fragment() {
             }
         }
 
+    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Pair<Thread, Int>? =
+        with(twoPaneFragment.threadListAdapter) {
+            return when (autoAdvanceMode) {
+                AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
+                AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+                AutoAdvanceMode.LIST_THREAD -> null
+                AutoAdvanceMode.NATURAL_THREAD -> {
+                    if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
+                        getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
+                    } else {
+                        getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+                    }
+                }
+            }
+        }
+
     enum class HeaderState {
         ELEVATED,
         LOWERED,
diff --git a/app/src/main/res/layout/view_setting_radio_button.xml b/app/src/main/res/layout/view_setting_radio_button.xml
index 921e6a0a85..530af1bdc9 100644
--- a/app/src/main/res/layout/view_setting_radio_button.xml
+++ b/app/src/main/res/layout/view_setting_radio_button.xml
@@ -33,18 +33,12 @@
         android:importantForAccessibility="no"
         android:visibility="gone" />
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="Simple messages" />
-    </LinearLayout>
+        tools:text="Simple messages" />
 
     <ImageView
         android:id="@+id/checkMark"

From 3f47987f235a5c25bda65e5bc6d2466e0968f785 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 13 May 2024 14:30:49 +0200
Subject: [PATCH 17/29] directly call navigate to thread method instead of
 adapters callback method

---
 .../java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 3e2f27af61..1e80869fca 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -641,7 +641,8 @@ class ThreadFragment : Fragment() {
                     if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
                         selectNewThread(newPosition = index, nextThread.uid)
                     }
-                    onThreadClicked?.invoke(nextThread)
+
+                    twoPaneFragment.navigateToThread(nextThread)
                 } ?: run {
                     twoPaneViewModel.closeThread()
                 }

From 82ac114bb33dc7f159fdaa3fdeb7ea4bc357bf2d Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 13 May 2024 14:33:48 +0200
Subject: [PATCH 18/29] Change Array type to List so we don't have to repeat
 .toList() call

---
 .../com/infomaniak/mail/ui/MainViewModel.kt   | 26 ++++++++-----------
 .../mail/ui/main/menu/MoveFragment.kt         |  4 +--
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 7e7a6db02e..6a1936d13b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -479,11 +479,7 @@ class MainViewModel @Inject constructor(
 
         deleteThreadOrMessageTrigger.postValue(Unit)
         if (apiResponse.isSuccess()) {
-            if (message == null) {
-                autoAdvanceTrigger.postValue(threadsUids)
-            } else if (threadHasOnlyOneMessageLeftInCurrentFolder(threadsUids.first())) {
-                autoAdvanceTrigger.postValue(threadsUids)
-            }
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceTrigger.postValue(threadsUids)
 
             refreshFoldersAsync(
                 mailbox = mailbox,
@@ -566,12 +562,12 @@ class MainViewModel @Inject constructor(
     //region Move
     fun moveThreadsOrMessageTo(
         destinationFolderId: String,
-        threadsUids: Array<String>,
+        threadsUids: List<String>,
         messageUid: String? = null,
     ) = viewModelScope.launch(ioCoroutineContext) {
         val mailbox = currentMailbox.value!!
         val destinationFolder = folderController.getFolder(destinationFolderId)!!
-        val threads = getActionThreads(threadsUids.toList()).ifEmpty { return@launch }
+        val threads = getActionThreads(threadsUids).ifEmpty { return@launch }
         val message = messageUid?.let { messageController.getMessage(it)!! }
 
         val messages = sharedUtils.getMessagesToMove(threads, message)
@@ -579,7 +575,7 @@ class MainViewModel @Inject constructor(
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
         if (apiResponse.isSuccess()) {
-            autoAdvanceTrigger.postValue(threadsUids.toList())
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceTrigger.postValue(threadsUids)
 
             refreshFoldersAsync(
                 mailbox = mailbox,
@@ -646,11 +642,7 @@ class MainViewModel @Inject constructor(
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
         if (apiResponse.isSuccess()) {
-            if (message == null) {
-                autoAdvanceTrigger.postValue(threadsUids)
-            } else if (threadHasOnlyOneMessageLeftInCurrentFolder(threadsUids.first())) {
-                autoAdvanceTrigger.postValue(threadsUids)
-            }
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceTrigger.postValue(threadsUids)
 
             val messagesFoldersIds = messages.getFoldersIds(exception = destinationFolder.id)
             refreshFoldersAsync(
@@ -854,7 +846,6 @@ class MainViewModel @Inject constructor(
             snackbarManager.postValue(appContext.getString(snackbarTitle))
         }
     }
-    //endregion
 
     //region BlockUser
     fun blockUser(message: Message) = viewModelScope.launch(ioCoroutineContext) {
@@ -913,7 +904,7 @@ class MainViewModel @Inject constructor(
 
     fun moveToNewFolder(
         name: String,
-        threadsUids: Array<String>,
+        threadsUids: List<String>,
         messageUid: String?,
     ) = viewModelScope.launch(ioCoroutineContext) {
         val newFolderId = createNewFolderSync(name) ?: return@launch
@@ -1060,6 +1051,11 @@ class MainViewModel @Inject constructor(
         return messageController.getMessageCountInThreadForFolder(threadUid, folderId, mailboxContentRealm()) == 1L
     }
 
+    private fun shouldAutoAdvance(message: Message?, threadsUids: List<String>): Boolean {
+        val isWorkingWithThread = message == null
+        return isWorkingWithThread || threadHasOnlyOneMessageLeftInCurrentFolder(threadsUids.first())
+    }
+
     companion object {
         private val TAG: String = MainViewModel::class.java.simpleName
         private val DEFAULT_SELECTED_FOLDER = FolderRole.INBOX
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt
index b2d5df7637..94aeee2201 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt
@@ -104,7 +104,7 @@ class MoveFragment : MenuFoldersFragment() {
         inputDialog.setCallbacks(
             onPositiveButtonClicked = { folderName ->
                 trackCreateFolderEvent("confirm")
-                mainViewModel.moveToNewFolder(folderName, navigationArgs.threadsUids, navigationArgs.messageUid)
+                mainViewModel.moveToNewFolder(folderName, navigationArgs.threadsUids.toList(), navigationArgs.messageUid)
             },
             onErrorCheck = ::checkForFolderCreationErrors,
         )
@@ -133,7 +133,7 @@ class MoveFragment : MenuFoldersFragment() {
     }
 
     override fun onFolderSelected(folderId: String): Unit = with(navigationArgs) {
-        mainViewModel.moveThreadsOrMessageTo(folderId, threadsUids, messageUid)
+        mainViewModel.moveThreadsOrMessageTo(folderId, threadsUids.toList(), messageUid)
         findNavController().popBackStack()
     }
 

From 246cbb575c00377a932bffb53378a6064ae85ccd Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 13 May 2024 14:35:03 +0200
Subject: [PATCH 19/29] Apply suggestion from code review

---
 .../com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt   | 4 ++--
 .../mail/ui/main/settings/AutoAdvanceSettingsFragment.kt      | 2 ++
 .../java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 1db0663b4c..fb6eec9346 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -299,8 +299,8 @@ class ThreadListAdapter @Inject constructor(
         if (multiSelection?.isEnabled == true) {
             toggleMultiSelectedThread(thread)
         } else {
-            previousThreadClickedPosition?.let {
-                localSettings.autoAdvanceIntelligentMode = if (position > it) {
+            previousThreadClickedPosition?.let { previousPosition ->
+                localSettings.autoAdvanceIntelligentMode = if (position > previousPosition) {
                     AutoAdvanceMode.FOLLOWING_THREAD
                 } else {
                     AutoAdvanceMode.PREVIOUS_THREAD
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
index 6df6a98384..3e5d839db1 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -58,6 +58,8 @@ class AutoAdvanceSettingsFragment : Fragment() {
 
         radioGroup.check(localSettings.autoAdvanceMode)
 
+        descriptionLastAction.isVisible = localSettings.autoAdvanceMode == AutoAdvanceMode.NATURAL_THREAD
+
         radioGroup.onItemCheckedListener { _, _, autoAdvanceMode ->
             chooseAutoAdvanceMode(autoAdvanceMode as AutoAdvanceMode)
             descriptionLastAction.isVisible = autoAdvanceMode == AutoAdvanceMode.NATURAL_THREAD
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 1e80869fca..bcd0e16342 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -147,7 +147,7 @@ class ThreadFragment : Fragment() {
         observeCurrentFolderName()
 
         observeThreadOpening()
-        observeClosedThread()
+        observeAutoAdavance()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -465,7 +465,7 @@ class ThreadFragment : Fragment() {
         }
     }
 
-    private fun observeClosedThread() {
+    private fun observeAutoAdavance() {
         mainViewModel.autoAdvanceTrigger.observe(viewLifecycleOwner) { listThreadsUids ->
             tryToAutoAdvance(localSettings.autoAdvanceMode, listThreadsUids)
         }

From 979c3476dc09a4e8937007aaa8e664db1e8dbbdc Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 13 May 2024 14:35:19 +0200
Subject: [PATCH 20/29] Correct es String

---
 app/src/main/res/values-es/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5703c447e8..520567713b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -393,14 +393,14 @@
     <string name="settingsAppLock">Bloqueo de aplicaciones</string>
     <string name="settingsAuthorizeTracking">Autorizar el seguimiento</string>
     <string name="settingsAutoAdvanceDescription">Seleccione qué mostrar cuando se archiva o elimina un mensaje</string>
-    <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar el siguiente conversación al archivar o borrar</string>
-    <string name="settingsAutoAdvanceFollowingThreadTitle">Siguiendo el conversación</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar la siguiente conversación al archivar o borrar</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Siguiendo la conversación</string>
     <string name="settingsAutoAdvanceListOfThreadsDescription">Mostrar lista de conversaciones al archivar o borrar</string>
     <string name="settingsAutoAdvanceListOfThreadsTitle">Lista de conversaciones</string>
     <string name="settingsAutoAdvanceNaturalThreadDescription">Repite la última acción realizada</string>
     <string name="settingsAutoAdvanceNaturalThreadHint">Selecciona automáticamente la conversación siguiente o anterior, en función de tu última interacción.</string>
     <string name="settingsAutoAdvanceNaturalThreadTitle">Repetir la última acción</string>
-    <string name="settingsAutoAdvancePreviousThreadDescription">Mostrar el conversación anterior al archivar o borrar</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Mostrar la conversación anterior al archivar o borrar</string>
     <string name="settingsAutoAdvancePreviousThreadTitle">Conversación anterior</string>
     <string name="settingsAutoAdvanceTitle">Avance automático</string>
     <string name="settingsCancellationPeriodDescription">Tiene la posibilidad de cancelar el envío de su correo electrónico hasta 30 segundos</string>

From 8b95b46cda6b06885e3373a2cd290aba3ded91aa Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 13 May 2024 15:15:17 +0200
Subject: [PATCH 21/29] Change logic emplacement to natural advance mode

---
 .../mail/ui/main/folder/ThreadListAdapter.kt      | 13 ++++++++-----
 .../mail/ui/main/folder/ThreadListFragment.kt     |  5 +----
 .../mail/ui/main/folder/TwoPaneFragment.kt        | 15 +++++++++++++--
 .../mail/ui/main/search/SearchFragment.kt         |  5 +----
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index fb6eec9346..9ab8f6c46c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -92,6 +92,8 @@ class ThreadListAdapter @Inject constructor(
     private var onFlushClicked: ((dialogTitle: String) -> Unit)? = null
     private var onLoadMoreClicked: (() -> Unit)? = null
 
+    private var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? = null
+
     private var folderRole: FolderRole? = null
     private var onSwipeFinished: (() -> Unit)? = null
     private var multiSelection: MultiSelectionListener<Thread>? = null
@@ -119,6 +121,7 @@ class ThreadListAdapter @Inject constructor(
         onThreadClicked: ((thread: Thread) -> Unit),
         onFlushClicked: ((dialogTitle: String) -> Unit)? = null,
         onLoadMoreClicked: (() -> Unit)? = null,
+        onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? = null,
     ) {
         this.folderRole = folderRole
         this.onSwipeFinished = onSwipeFinished
@@ -127,6 +130,7 @@ class ThreadListAdapter @Inject constructor(
         this.onThreadClicked = onThreadClicked
         this.onFlushClicked = onFlushClicked
         this.onLoadMoreClicked = onLoadMoreClicked
+        this.onPositionClickedChanged = onPositionClickedChanged
     }
 
     override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
@@ -300,11 +304,10 @@ class ThreadListAdapter @Inject constructor(
             toggleMultiSelectedThread(thread)
         } else {
             previousThreadClickedPosition?.let { previousPosition ->
-                localSettings.autoAdvanceIntelligentMode = if (position > previousPosition) {
-                    AutoAdvanceMode.FOLLOWING_THREAD
-                } else {
-                    AutoAdvanceMode.PREVIOUS_THREAD
-                }
+                onPositionClickedChanged?.invoke(
+                    position,
+                    previousPosition
+                )
             }
 
             previousThreadClickedPosition = position
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index 3344df5e3c..fcbb86e067 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -55,7 +55,6 @@ import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.MatomoMail.trackThreadListEvent
 import com.infomaniak.mail.R
-import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.LocalSettings.SwipeAction
 import com.infomaniak.mail.data.LocalSettings.ThreadDensity.COMPACT
 import com.infomaniak.mail.data.models.Folder
@@ -104,9 +103,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
 
     private var isFirstTimeRefreshingThreads = true
 
-    @Inject
-    lateinit var localSettings: LocalSettings
-
     @Inject
     lateinit var notificationManagerCompat: NotificationManagerCompat
 
@@ -320,6 +316,7 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
                 trackThreadListEvent("loadMore")
                 mainViewModel.getOnePageOfOldMessages()
             },
+            onPositionClickedChanged = ::changeNaturalAdvanceModeByPosition
         )
 
         threadListAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
index fe07289bdc..28ec94917c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
@@ -33,6 +33,7 @@ import com.infomaniak.lib.core.utils.safeNavigate
 import com.infomaniak.mail.MatomoMail.OPEN_FROM_DRAFT_NAME
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.R
+import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.cache.mailboxContent.FolderController
 import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.ui.MainActivity
@@ -53,6 +54,9 @@ abstract class TwoPaneFragment : Fragment() {
     @Inject
     lateinit var threadListAdapter: ThreadListAdapter
 
+    @Inject
+    lateinit var localSettings: LocalSettings
+
     @ColorRes
     abstract fun getStatusBarColor(): Int
     abstract fun getLeftPane(): View?
@@ -184,8 +188,7 @@ abstract class TwoPaneFragment : Fragment() {
         }
     }
 
-    private fun computeTwoPaneWidths(widthPixels: Int, isThreadOpen: Boolean): Pair<Int, Int> = with(twoPaneViewModel) {
-
+    private fun computeTwoPaneWidths(widthPixels: Int, isThreadOpen: Boolean): Pair<Int, Int> {
         val leftPaneWidthRatio = ResourcesCompat.getFloat(resources, R.dimen.leftPaneWidthRatio)
         val rightPaneWidthRatio = ResourcesCompat.getFloat(resources, R.dimen.rightPaneWidthRatio)
 
@@ -217,4 +220,12 @@ abstract class TwoPaneFragment : Fragment() {
 
         setSystemBarsColors(statusBarColor = statusBarColor, navigationBarColor = null)
     }
+
+    protected fun changeNaturalAdvanceModeByPosition(currentPosition: Int, previousPosition: Int) {
+        localSettings.autoAdvanceIntelligentMode = if (currentPosition > previousPosition) {
+            LocalSettings.AutoAdvanceMode.FOLLOWING_THREAD
+        } else {
+            LocalSettings.AutoAdvanceMode.PREVIOUS_THREAD
+        }
+    }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
index 3c6bb01ebb..5d8e044f53 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
@@ -46,7 +46,6 @@ import com.infomaniak.mail.MatomoMail.SEARCH_DELETE_NAME
 import com.infomaniak.mail.MatomoMail.SEARCH_VALIDATE_NAME
 import com.infomaniak.mail.MatomoMail.trackSearchEvent
 import com.infomaniak.mail.R
-import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.models.Folder
 import com.infomaniak.mail.data.models.thread.Thread.ThreadFilter
 import com.infomaniak.mail.databinding.FragmentSearchBinding
@@ -57,7 +56,6 @@ import com.infomaniak.mail.utils.RealmChangesBinding.Companion.bindResultsChange
 import com.infomaniak.mail.utils.Utils.Shortcuts
 import com.infomaniak.mail.utils.extensions.*
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class SearchFragment : TwoPaneFragment() {
@@ -66,8 +64,6 @@ class SearchFragment : TwoPaneFragment() {
     private val binding get() = _binding!! // This property is only valid between onCreateView and onDestroyView
 
     private val searchViewModel: SearchViewModel by viewModels()
-    @Inject
-    lateinit var localSettings: LocalSettings
 
     private val showLoadingTimer: CountDownTimer by lazy { Utils.createRefreshTimer(onTimerFinish = ::showRefreshLayout) }
 
@@ -160,6 +156,7 @@ class SearchFragment : TwoPaneFragment() {
                     navigateToThread(thread)
                 }
             },
+            onPositionClickedChanged = ::changeNaturalAdvanceModeByPosition
         )
 
         threadListAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY

From 33aa8c05dc03e07c57911b7f333740fb9b4730cf Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Tue, 14 May 2024 08:49:48 +0200
Subject: [PATCH 22/29] Apply suggestion from code review

---
 .../com/infomaniak/mail/data/LocalSettings.kt    |  6 +++---
 .../cache/mailboxContent/MessageController.kt    |  3 ++-
 .../java/com/infomaniak/mail/ui/MainViewModel.kt |  8 ++++----
 .../main/settings/AutoAdvanceSettingsFragment.kt |  2 +-
 .../mail/ui/main/thread/ThreadFragment.kt        | 16 ++++++++--------
 app/src/main/res/values-it/strings.xml           |  4 ++--
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
index cb53a2bcfe..b3be6234d3 100644
--- a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
@@ -64,8 +64,8 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var showPermissionsOnboarding by sharedValue("showPermissionsOnboardingKey", true)
     var isSentryTrackingEnabled by sharedValue("isSentryTrackingEnabledKey", true)
     var isMatomoTrackingEnabled by sharedValue("isMatomoTrackingEnabledKey", true)
-    var autoAdvanceMode by sharedValue("autoAdvanceModeKey", AutoAdvanceMode.LIST_THREAD)
-    var autoAdvanceIntelligentMode by sharedValue("autoAdvanceIntelligentModeKey", AutoAdvanceMode.FOLLOWING_THREAD)
+    var autoAdvanceMode by sharedValue("autoAdvanceModeKey", AutoAdvanceMode.THREADS_LIST)
+    var autoAdvanceNaturalThread by sharedValue("autoAdvanceNaturalThreadKey", AutoAdvanceMode.FOLLOWING_THREAD)
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 
@@ -196,7 +196,7 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     enum class AutoAdvanceMode(val matomoValue: String, @StringRes val localisedNameRes: Int) {
         PREVIOUS_THREAD("previousThread", R.string.settingsAutoAdvancePreviousThreadDescription),
         FOLLOWING_THREAD("followingThread", R.string.settingsAutoAdvanceFollowingThreadDescription),
-        LIST_THREAD("listOfThread", R.string.settingsAutoAdvanceListOfThreadsDescription),
+        THREADS_LIST("listOfThread", R.string.settingsAutoAdvanceListOfThreadsDescription),
         NATURAL_THREAD("naturalThread", R.string.settingsAutoAdvanceNaturalThreadDescription),
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
index 5d14d5ce48..db0bf4b6bf 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
@@ -142,7 +142,8 @@ class MessageController @Inject constructor(private val mailboxContentRealm: Rea
     fun getMessageCountInThreadForFolder(threadUid: String, folderId: String, realm: Realm): Long? {
         return ThreadController.getThread(threadUid, realm)
             ?.messages?.query("${Message::folderId.name} == $0", folderId)
-            ?.count()?.find()
+            ?.count()
+            ?.find()
     }
     //endregion
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 6a1936d13b..25052f4018 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -110,7 +110,7 @@ class MainViewModel @Inject constructor(
     val reportPhishingTrigger = SingleLiveEvent<Unit>()
     val canInstallUpdate = MutableLiveData(false)
 
-    val autoAdvanceTrigger = MutableLiveData<List<String>>()
+    val autoAdvanceThreadsUids = MutableLiveData<List<String>>()
 
     val mailboxesLive = mailboxController.getMailboxesAsync(AccountUtils.currentUserId).asLiveData(ioCoroutineContext)
 
@@ -479,7 +479,7 @@ class MainViewModel @Inject constructor(
 
         deleteThreadOrMessageTrigger.postValue(Unit)
         if (apiResponse.isSuccess()) {
-            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceTrigger.postValue(threadsUids)
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceThreadsUids.postValue(threadsUids)
 
             refreshFoldersAsync(
                 mailbox = mailbox,
@@ -575,7 +575,7 @@ class MainViewModel @Inject constructor(
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
         if (apiResponse.isSuccess()) {
-            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceTrigger.postValue(threadsUids)
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceThreadsUids.postValue(threadsUids)
 
             refreshFoldersAsync(
                 mailbox = mailbox,
@@ -642,7 +642,7 @@ class MainViewModel @Inject constructor(
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
         if (apiResponse.isSuccess()) {
-            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceTrigger.postValue(threadsUids)
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceThreadsUids.postValue(threadsUids)
 
             val messagesFoldersIds = messages.getFoldersIds(exception = destinationFolder.id)
             refreshFoldersAsync(
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
index 3e5d839db1..f040a44083 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -52,7 +52,7 @@ class AutoAdvanceSettingsFragment : Fragment() {
         radioGroup.initBijectionTable(
             R.id.lastAction to AutoAdvanceMode.NATURAL_THREAD,
             R.id.nextThread to AutoAdvanceMode.FOLLOWING_THREAD,
-            R.id.listThread to AutoAdvanceMode.LIST_THREAD,
+            R.id.listThread to AutoAdvanceMode.THREADS_LIST,
             R.id.lastThread to AutoAdvanceMode.PREVIOUS_THREAD,
         )
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index bcd0e16342..3ae518acdb 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -466,8 +466,8 @@ class ThreadFragment : Fragment() {
     }
 
     private fun observeAutoAdavance() {
-        mainViewModel.autoAdvanceTrigger.observe(viewLifecycleOwner) { listThreadsUids ->
-            tryToAutoAdvance(localSettings.autoAdvanceMode, listThreadsUids)
+        mainViewModel.autoAdvanceThreadsUids.observe(viewLifecycleOwner) { listThreadsUids ->
+            tryToAutoAdvance(listThreadsUids)
         }
     }
 
@@ -630,12 +630,12 @@ class ThreadFragment : Fragment() {
         twoPaneViewModel.navArgs.value = NavData(resId, args)
     }
 
-    private fun tryToAutoAdvance(autoAdvanceMode: AutoAdvanceMode, listThreadUids: List<String>) =
+    private fun tryToAutoAdvance(listThreadUids: List<String>) =
         with(twoPaneFragment.threadListAdapter) {
             if (!listThreadUids.contains(openedThreadUid)) return@with
 
             openedThreadPosition?.let {
-                val data = getNextThreadToOpenByPosition(it, autoAdvanceMode)
+                val data = getNextThreadToOpenByPosition(it)
 
                 data?.let { (nextThread, index) ->
                     if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
@@ -649,14 +649,14 @@ class ThreadFragment : Fragment() {
             }
         }
 
-    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Pair<Thread, Int>? =
+    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int): Pair<Thread, Int>? =
         with(twoPaneFragment.threadListAdapter) {
-            return when (autoAdvanceMode) {
+            return when (localSettings.autoAdvanceMode) {
                 AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
                 AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-                AutoAdvanceMode.LIST_THREAD -> null
+                AutoAdvanceMode.THREADS_LIST -> null
                 AutoAdvanceMode.NATURAL_THREAD -> {
-                    if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
+                    if (localSettings.autoAdvanceNaturalThread == AutoAdvanceMode.PREVIOUS_THREAD) {
                         getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
                     } else {
                         getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0ebb51088c..2b9d792033 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -406,7 +406,7 @@
     <string name="settingsCancellationPeriodDescription">Avete la possibilità di annullare l’invio della vostra email fino a 30 secondi.</string>
     <string name="settingsCancellationPeriodTitle">Periodo di cancellazione dell’invio</string>
     <string name="settingsDataManagementDescription">È possibile personalizzare i dati di utilizzo e operativi che Infomaniak recupera per correggere i bug e migliorare l’applicazione. Entrambi gli strumenti sono ospitati e gestiti esclusivamente da noi.\n\nInfomaniak rispetta la vostra privacy: il codice sorgente di questa applicazione può essere verificato, le informazioni raccolte sono anonime e i vostri dati personali rimangono strettamente confidenziali e non vengono mai condivisi con terze parti.</string>
-    <string name="settingsDataManagementSourceCode">Vedi il codice sorgente</string>
+    <string name="settingsDataManagementSourceCode">Vedere il codice sorgente</string>
     <string name="settingsDataManagementTitle">Gestione dei dati</string>
     <string name="settingsDefault">Predefinito</string>
     <string name="settingsDelaySeconds">%d secondi</string>
@@ -428,7 +428,7 @@
     <string name="settingsMatomoDescription">Matomo è uno strumento di analisi ospitato e gestito esclusivamente da Infomaniak per capire come viene utilizzata l’applicazione.\n\nStudiando questi dati, il nostro team è in grado di migliorare continuamente l’interfaccia dell’applicazione.</string>
     <string name="settingsMatomoTitle">Matomo</string>
     <string name="settingsOptionAlways">Sempre</string>
-    <string name="settingsOptionAskMe">Chiedi</string>
+    <string name="settingsOptionAskMe">Chiedetemi</string>
     <string name="settingsOptionDarkTheme">Scuro</string>
     <string name="settingsOptionLightTheme">Chiaro</string>
     <string name="settingsOptionSystemTheme">Sistema</string>

From 070fea0e33d228430ef37775f32598a4e5a5cae8 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Tue, 14 May 2024 08:51:08 +0200
Subject: [PATCH 23/29] Add ThreadListAdapterCallback

Add ThreadListAdapter callback so now we don't have 8 arguments in invoke function of TheadListAdapter
---
 .../mail/ui/main/folder/ThreadListAdapter.kt  | 45 +++++---------
 .../main/folder/ThreadListAdapterCallback.kt  | 28 +++++++++
 .../mail/ui/main/folder/ThreadListFragment.kt | 59 ++++++++++---------
 .../mail/ui/main/folder/TwoPaneFragment.kt    |  4 +-
 .../mail/ui/main/search/SearchFragment.kt     | 30 +++++++---
 5 files changed, 96 insertions(+), 70 deletions(-)
 create mode 100644 app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapterCallback.kt

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 9ab8f6c46c..0106a4b370 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -47,7 +47,8 @@ import com.infomaniak.lib.core.utils.*
 import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
-import com.infomaniak.mail.data.LocalSettings.*
+import com.infomaniak.mail.data.LocalSettings.SwipeAction
+import com.infomaniak.mail.data.LocalSettings.ThreadDensity
 import com.infomaniak.mail.data.models.Folder.FolderRole
 import com.infomaniak.mail.data.models.correspondent.Recipient
 import com.infomaniak.mail.data.models.thread.Thread
@@ -88,16 +89,10 @@ class ThreadListAdapter @Inject constructor(
     private var swipingIsAuthorized: Boolean = true
     private var isLoadMoreDisplayed = false
 
-    private var onThreadClicked: ((thread: Thread) -> Unit)? = null
-    private var onFlushClicked: ((dialogTitle: String) -> Unit)? = null
-    private var onLoadMoreClicked: (() -> Unit)? = null
-
-    private var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? = null
-
     private var folderRole: FolderRole? = null
-    private var onSwipeFinished: (() -> Unit)? = null
     private var multiSelection: MultiSelectionListener<Thread>? = null
     private var isFolderNameVisible: Boolean = false
+    private var threadListAdapterCallback: ThreadListAdapterCallback? = null
 
     private var previousThreadClickedPosition: Int? = null
 
@@ -115,22 +110,14 @@ class ThreadListAdapter @Inject constructor(
 
     operator fun invoke(
         folderRole: FolderRole?,
-        onSwipeFinished: (() -> Unit)? = null,
+        threadListAdapterCallback: ThreadListAdapterCallback,
         multiSelection: MultiSelectionListener<Thread>? = null,
         isFolderNameVisible: Boolean = false,
-        onThreadClicked: ((thread: Thread) -> Unit),
-        onFlushClicked: ((dialogTitle: String) -> Unit)? = null,
-        onLoadMoreClicked: (() -> Unit)? = null,
-        onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? = null,
     ) {
         this.folderRole = folderRole
-        this.onSwipeFinished = onSwipeFinished
         this.multiSelection = multiSelection
         this.isFolderNameVisible = isFolderNameVisible
-        this.onThreadClicked = onThreadClicked
-        this.onFlushClicked = onFlushClicked
-        this.onLoadMoreClicked = onLoadMoreClicked
-        this.onPositionClickedChanged = onPositionClickedChanged
+        this.threadListAdapterCallback = threadListAdapterCallback
     }
 
     override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
@@ -304,7 +291,7 @@ class ThreadListAdapter @Inject constructor(
             toggleMultiSelectedThread(thread)
         } else {
             previousThreadClickedPosition?.let { previousPosition ->
-                onPositionClickedChanged?.invoke(
+                threadListAdapterCallback?.onPositionClickedChanged?.invoke(
                     position,
                     previousPosition
                 )
@@ -312,7 +299,7 @@ class ThreadListAdapter @Inject constructor(
 
             previousThreadClickedPosition = position
 
-            onThreadClicked?.invoke(thread)
+            threadListAdapterCallback?.onThreadClicked?.invoke(thread)
             // If the Thread is `onlyOneDraft`, we'll directly navigate to the NewMessageActivity.
             // It means that we won't go to the ThreadFragment, so there's no need to select anything.
             if (thread.uid != openedThreadUid && !thread.isOnlyOneDraft) selectNewThread(position, thread.uid)
@@ -331,15 +318,11 @@ class ThreadListAdapter @Inject constructor(
     }
 
     fun getNextThread(startingThreadIndex: Int, direction: Int): Pair<Thread, Int>? {
-        var currentIndexThread = startingThreadIndex
-        currentIndexThread += direction
-        while (currentIndexThread >= 0 && currentIndexThread <= dataSet.lastIndex) {
-            if (dataSet[currentIndexThread] is Thread) {
-                val thread = dataSet[currentIndexThread] as Thread
-                return thread to currentIndexThread
-            }
+        var currentThreadIndex = startingThreadIndex + direction
 
-            currentIndexThread += direction
+        while (currentThreadIndex >= 0 && currentThreadIndex <= dataSet.lastIndex) {
+            if (dataSet[currentThreadIndex] is Thread) return dataSet[currentThreadIndex] as Thread to currentThreadIndex
+            currentThreadIndex += direction
         }
         return null
     }
@@ -485,14 +468,14 @@ class ThreadListAdapter @Inject constructor(
         flushButton.apply {
             val buttonText = context.getString(buttonTextId)
             text = buttonText
-            setOnClickListener { onFlushClicked?.invoke(buttonText) }
+            setOnClickListener { threadListAdapterCallback?.onFlushClicked?.invoke(buttonText) }
         }
     }
 
     private fun ItemThreadLoadMoreButtonBinding.displayLoadMoreButton() {
         loadMoreButton.setOnClickListener {
             if (dataSet.last() is Unit) dataSet = dataSet.toMutableList().apply { removeLastOrNull() }
-            onLoadMoreClicked?.invoke()
+            threadListAdapterCallback?.onLoadMoreClicked?.invoke()
         }
     }
 
@@ -569,7 +552,7 @@ class ThreadListAdapter @Inject constructor(
 
     override fun onSwipeAnimationFinished(viewHolder: ThreadListViewHolder) {
         viewHolder.isSwipedOverHalf = false
-        onSwipeFinished?.invoke()
+        threadListAdapterCallback?.onSwipeFinished?.invoke()
         unblockOtherSwipes()
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapterCallback.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapterCallback.kt
new file mode 100644
index 0000000000..35f25022f1
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapterCallback.kt
@@ -0,0 +1,28 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2024 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.main.folder
+
+import com.infomaniak.mail.data.models.thread.Thread
+
+interface ThreadListAdapterCallback {
+    var onSwipeFinished: (() -> Unit)?
+    var onThreadClicked: ((thread: Thread) -> Unit)
+    var onFlushClicked: ((dialogTitle: String) -> Unit)?
+    var onLoadMoreClicked: (() -> Unit)?
+    var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)?
+}
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index fcbb86e067..e8ee77aa2c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -283,40 +283,43 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     }
 
     private fun setupAdapter() {
-
         threadListAdapter(
             folderRole = mainViewModel.currentFolder.value?.role,
-            onSwipeFinished = { threadListViewModel.isRecoveringFinished.value = true },
-            multiSelection = object : MultiSelectionListener<Thread> {
-                override var isEnabled by mainViewModel::isMultiSelectOn
-                override val selectedItems by mainViewModel::selectedThreads
-                override val publishSelectedItems = mainViewModel::publishSelectedItems
-            },
-            onThreadClicked = ::navigateToThread,
-            onFlushClicked = { dialogTitle ->
-                val trackerName = when {
-                    isCurrentFolderRole(FolderRole.TRASH) -> "emptyTrash"
-                    isCurrentFolderRole(FolderRole.DRAFT) -> "emptyDraft"
-                    isCurrentFolderRole(FolderRole.SPAM) -> "emptySpam"
-                    else -> null
-                }
+            threadListAdapterCallback = object : ThreadListAdapterCallback {
+                override var onSwipeFinished: (() -> Unit)? = { threadListViewModel.isRecoveringFinished.value = true }
+                override var onThreadClicked: (Thread) -> Unit = ::navigateToThread
+                override var onFlushClicked: ((dialogTitle: String) -> Unit)? = { dialogTitle ->
+                    val trackerName = when {
+                        isCurrentFolderRole(FolderRole.TRASH) -> "emptyTrash"
+                        isCurrentFolderRole(FolderRole.DRAFT) -> "emptyDraft"
+                        isCurrentFolderRole(FolderRole.SPAM) -> "emptySpam"
+                        else -> null
+                    }
 
-                trackerName?.let { trackThreadListEvent(it) }
+                    trackerName?.let { trackThreadListEvent(it) }
 
-                descriptionDialog.show(
-                    title = dialogTitle,
-                    description = getString(R.string.threadListEmptyFolderAlertDescription),
-                    onPositiveButtonClicked = {
-                        trackThreadListEvent("${trackerName}Confirm")
-                        mainViewModel.flushFolder()
-                    },
-                )
+                    descriptionDialog.show(
+                        title = dialogTitle,
+                        description = getString(R.string.threadListEmptyFolderAlertDescription),
+                        onPositiveButtonClicked = {
+                            trackThreadListEvent("${trackerName}Confirm")
+                            mainViewModel.flushFolder()
+                        },
+                    )
+                }
+                override var onLoadMoreClicked: (() -> Unit)? = {
+                    trackThreadListEvent("loadMore")
+                    mainViewModel.getOnePageOfOldMessages()
+                }
+                override var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? =
+                    ::updateAutoAdvanceNaturalThread
             },
-            onLoadMoreClicked = {
-                trackThreadListEvent("loadMore")
-                mainViewModel.getOnePageOfOldMessages()
+            multiSelection =
+            object : MultiSelectionListener<Thread> {
+                override var isEnabled by mainViewModel::isMultiSelectOn
+                override val selectedItems by mainViewModel::selectedThreads
+                override val publishSelectedItems = mainViewModel::publishSelectedItems
             },
-            onPositionClickedChanged = ::changeNaturalAdvanceModeByPosition
         )
 
         threadListAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
index 28ec94917c..a8e4359a88 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
@@ -221,8 +221,8 @@ abstract class TwoPaneFragment : Fragment() {
         setSystemBarsColors(statusBarColor = statusBarColor, navigationBarColor = null)
     }
 
-    protected fun changeNaturalAdvanceModeByPosition(currentPosition: Int, previousPosition: Int) {
-        localSettings.autoAdvanceIntelligentMode = if (currentPosition > previousPosition) {
+    protected fun updateAutoAdvanceNaturalThread(currentPosition: Int, previousPosition: Int) {
+        localSettings.autoAdvanceNaturalThread = if (currentPosition > previousPosition) {
             LocalSettings.AutoAdvanceMode.FOLLOWING_THREAD
         } else {
             LocalSettings.AutoAdvanceMode.PREVIOUS_THREAD
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
index 5d8e044f53..515f6f4851 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
@@ -45,10 +45,13 @@ import com.infomaniak.lib.core.utils.showKeyboard
 import com.infomaniak.mail.MatomoMail.SEARCH_DELETE_NAME
 import com.infomaniak.mail.MatomoMail.SEARCH_VALIDATE_NAME
 import com.infomaniak.mail.MatomoMail.trackSearchEvent
+import com.infomaniak.mail.MatomoMail.trackThreadListEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.Folder
+import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.data.models.thread.Thread.ThreadFilter
 import com.infomaniak.mail.databinding.FragmentSearchBinding
+import com.infomaniak.mail.ui.main.folder.ThreadListAdapterCallback
 import com.infomaniak.mail.ui.main.folder.TwoPaneFragment
 import com.infomaniak.mail.ui.main.search.SearchFolderAdapter.SearchFolderElement
 import com.infomaniak.mail.ui.main.thread.ThreadFragment
@@ -146,17 +149,26 @@ class SearchFragment : TwoPaneFragment() {
         threadListAdapter(
             folderRole = null,
             isFolderNameVisible = true,
-            onThreadClicked = { thread ->
-                with(searchViewModel) {
-                    if (!isLengthTooShort(currentSearchQuery)) history.value = currentSearchQuery
-                    binding.searchBar.searchTextInput.apply {
-                        hideKeyboard()
-                        clearFocus()
+            threadListAdapterCallback = object : ThreadListAdapterCallback {
+                override var onSwipeFinished: (() -> Unit)? = null
+                override var onThreadClicked: (Thread) -> Unit = { thread ->
+                    with(searchViewModel) {
+                        if (!isLengthTooShort(currentSearchQuery)) history.value = currentSearchQuery
+                        binding.searchBar.searchTextInput.apply {
+                            hideKeyboard()
+                            clearFocus()
+                        }
+                        navigateToThread(thread)
                     }
-                    navigateToThread(thread)
                 }
-            },
-            onPositionClickedChanged = ::changeNaturalAdvanceModeByPosition
+                override var onFlushClicked: ((dialogTitle: String) -> Unit)? = null
+                override var onLoadMoreClicked: (() -> Unit)? = {
+                    trackThreadListEvent("loadMore")
+                    mainViewModel.getOnePageOfOldMessages()
+                }
+                override var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? =
+                    ::updateAutoAdvanceNaturalThread
+            }
         )
 
         threadListAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY

From 4cd8825d1e21107e404b4c66b50681f8320702a8 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Wed, 15 May 2024 15:41:11 +0200
Subject: [PATCH 24/29] Apply suggestion from code review

---
 .../com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt  | 5 +----
 .../com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt | 3 +--
 .../com/infomaniak/mail/ui/main/thread/ThreadFragment.kt     | 4 ++--
 app/src/main/res/values-es/strings.xml                       | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 0106a4b370..af0ce6121d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -291,10 +291,7 @@ class ThreadListAdapter @Inject constructor(
             toggleMultiSelectedThread(thread)
         } else {
             previousThreadClickedPosition?.let { previousPosition ->
-                threadListAdapterCallback?.onPositionClickedChanged?.invoke(
-                    position,
-                    previousPosition
-                )
+                threadListAdapterCallback?.onPositionClickedChanged?.invoke(position, previousPosition)
             }
 
             previousThreadClickedPosition = position
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index e8ee77aa2c..7f264d257f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -314,8 +314,7 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
                 override var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? =
                     ::updateAutoAdvanceNaturalThread
             },
-            multiSelection =
-            object : MultiSelectionListener<Thread> {
+            multiSelection = object : MultiSelectionListener<Thread> {
                 override var isEnabled by mainViewModel::isMultiSelectOn
                 override val selectedItems by mainViewModel::selectedThreads
                 override val publishSelectedItems = mainViewModel::publishSelectedItems
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 3ae518acdb..1a17e642bf 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -147,7 +147,7 @@ class ThreadFragment : Fragment() {
         observeCurrentFolderName()
 
         observeThreadOpening()
-        observeAutoAdavance()
+        observeAutoAdvance()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -465,7 +465,7 @@ class ThreadFragment : Fragment() {
         }
     }
 
-    private fun observeAutoAdavance() {
+    private fun observeAutoAdvance() {
         mainViewModel.autoAdvanceThreadsUids.observe(viewLifecycleOwner) { listThreadsUids ->
             tryToAutoAdvance(listThreadsUids)
         }
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 520567713b..7f1934fdcd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -394,8 +394,8 @@
     <string name="settingsAuthorizeTracking">Autorizar el seguimiento</string>
     <string name="settingsAutoAdvanceDescription">Seleccione qué mostrar cuando se archiva o elimina un mensaje</string>
     <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar la siguiente conversación al archivar o borrar</string>
-    <string name="settingsAutoAdvanceFollowingThreadTitle">Siguiendo la conversación</string>
-    <string name="settingsAutoAdvanceListOfThreadsDescription">Mostrar lista de conversaciones al archivar o borrar</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Conversación siguiente</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Mostrar la lista de conversaciones al archivar o borrar</string>
     <string name="settingsAutoAdvanceListOfThreadsTitle">Lista de conversaciones</string>
     <string name="settingsAutoAdvanceNaturalThreadDescription">Repite la última acción realizada</string>
     <string name="settingsAutoAdvanceNaturalThreadHint">Selecciona automáticamente la conversación siguiente o anterior, en función de tu última interacción.</string>

From 9c5091c6c6856d9ded0771a03ae2bf327426ec10 Mon Sep 17 00:00:00 2001
From: Kevin Boulongne <kevin.boulongne@infomaniak.com>
Date: Tue, 21 May 2024 09:55:37 +0200
Subject: [PATCH 25/29] Format code

---
 .../com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt  | 2 +-
 .../com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt    | 5 +++--
 .../com/infomaniak/mail/ui/main/thread/ThreadFragment.kt     | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index af0ce6121d..5b1fdcd937 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -101,7 +101,6 @@ class ThreadListAdapter @Inject constructor(
         private set
     var openedThreadUid: String? = null
         private set
-
     //endregion
 
     init {
@@ -321,6 +320,7 @@ class ThreadListAdapter @Inject constructor(
             if (dataSet[currentThreadIndex] is Thread) return dataSet[currentThreadIndex] as Thread to currentThreadIndex
             currentThreadIndex += direction
         }
+
         return null
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
index a8e4359a88..cb97c7ce18 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
@@ -34,6 +34,7 @@ import com.infomaniak.mail.MatomoMail.OPEN_FROM_DRAFT_NAME
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
+import com.infomaniak.mail.data.LocalSettings.AutoAdvanceMode
 import com.infomaniak.mail.data.cache.mailboxContent.FolderController
 import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.ui.MainActivity
@@ -223,9 +224,9 @@ abstract class TwoPaneFragment : Fragment() {
 
     protected fun updateAutoAdvanceNaturalThread(currentPosition: Int, previousPosition: Int) {
         localSettings.autoAdvanceNaturalThread = if (currentPosition > previousPosition) {
-            LocalSettings.AutoAdvanceMode.FOLLOWING_THREAD
+            AutoAdvanceMode.FOLLOWING_THREAD
         } else {
-            LocalSettings.AutoAdvanceMode.PREVIOUS_THREAD
+            AutoAdvanceMode.PREVIOUS_THREAD
         }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 1a17e642bf..39b8befcd0 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -630,8 +630,7 @@ class ThreadFragment : Fragment() {
         twoPaneViewModel.navArgs.value = NavData(resId, args)
     }
 
-    private fun tryToAutoAdvance(listThreadUids: List<String>) =
-        with(twoPaneFragment.threadListAdapter) {
+    private fun tryToAutoAdvance(listThreadUids: List<String>) = with(twoPaneFragment.threadListAdapter) {
             if (!listThreadUids.contains(openedThreadUid)) return@with
 
             openedThreadPosition?.let {

From 43188443648d7c3be72b0c7dbc49d28bb2cc11d1 Mon Sep 17 00:00:00 2001
From: Kevin Boulongne <kevin.boulongne@infomaniak.com>
Date: Tue, 21 May 2024 09:55:48 +0200
Subject: [PATCH 26/29] Simplify `getNextThreadToOpenByPosition()` code

---
 .../mail/ui/main/thread/ThreadFragment.kt     | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 39b8befcd0..3f52f0523a 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -631,39 +631,43 @@ class ThreadFragment : Fragment() {
     }
 
     private fun tryToAutoAdvance(listThreadUids: List<String>) = with(twoPaneFragment.threadListAdapter) {
-            if (!listThreadUids.contains(openedThreadUid)) return@with
+        if (!listThreadUids.contains(openedThreadUid)) return@with
 
-            openedThreadPosition?.let {
-                val data = getNextThreadToOpenByPosition(it)
+        openedThreadPosition?.let {
+            val data = getNextThreadToOpenByPosition(it)
 
-                data?.let { (nextThread, index) ->
-                    if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
-                        selectNewThread(newPosition = index, nextThread.uid)
-                    }
-
-                    twoPaneFragment.navigateToThread(nextThread)
-                } ?: run {
-                    twoPaneViewModel.closeThread()
+            data?.let { (nextThread, index) ->
+                if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
+                    selectNewThread(newPosition = index, nextThread.uid)
                 }
+
+                twoPaneFragment.navigateToThread(nextThread)
+            } ?: run {
+                twoPaneViewModel.closeThread()
             }
         }
+    }
 
-    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int): Pair<Thread, Int>? =
-        with(twoPaneFragment.threadListAdapter) {
-            return when (localSettings.autoAdvanceMode) {
-                AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-                AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-                AutoAdvanceMode.THREADS_LIST -> null
-                AutoAdvanceMode.NATURAL_THREAD -> {
-                    if (localSettings.autoAdvanceNaturalThread == AutoAdvanceMode.PREVIOUS_THREAD) {
-                        getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-                    } else {
-                        getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-                    }
+    private fun getNextThreadToOpenByPosition(
+        startingThreadIndex: Int,
+    ): Pair<Thread, Int>? = with(twoPaneFragment.threadListAdapter) {
+
+        val direction = when (localSettings.autoAdvanceMode) {
+            AutoAdvanceMode.PREVIOUS_THREAD -> PREVIOUS_CHRONOLOGICAL_THREAD
+            AutoAdvanceMode.FOLLOWING_THREAD -> NEXT_CHRONOLOGICAL_THREAD
+            AutoAdvanceMode.THREADS_LIST -> null
+            AutoAdvanceMode.NATURAL_THREAD -> {
+                if (localSettings.autoAdvanceNaturalThread == AutoAdvanceMode.PREVIOUS_THREAD) {
+                    PREVIOUS_CHRONOLOGICAL_THREAD
+                } else {
+                    NEXT_CHRONOLOGICAL_THREAD
                 }
             }
         }
 
+        return direction?.let { getNextThread(startingThreadIndex, direction) }
+    }
+
     enum class HeaderState {
         ELEVATED,
         LOWERED,

From 096fb575860f1f9163c3e8e5b6966b3675a7c1b1 Mon Sep 17 00:00:00 2001
From: Kevin Boulongne <kevin.boulongne@infomaniak.com>
Date: Tue, 21 May 2024 09:56:50 +0200
Subject: [PATCH 27/29] Use existing `openedThreadPosition` instead of adding
 new `previousThreadClickedPosition`

---
 .../mail/ui/main/folder/ThreadListAdapter.kt          | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 5b1fdcd937..d9c2892cdd 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -94,8 +94,6 @@ class ThreadListAdapter @Inject constructor(
     private var isFolderNameVisible: Boolean = false
     private var threadListAdapterCallback: ThreadListAdapterCallback? = null
 
-    private var previousThreadClickedPosition: Int? = null
-
     //region Tablet mode
     var openedThreadPosition: Int? = null
         private set
@@ -289,12 +287,6 @@ class ThreadListAdapter @Inject constructor(
         if (multiSelection?.isEnabled == true) {
             toggleMultiSelectedThread(thread)
         } else {
-            previousThreadClickedPosition?.let { previousPosition ->
-                threadListAdapterCallback?.onPositionClickedChanged?.invoke(position, previousPosition)
-            }
-
-            previousThreadClickedPosition = position
-
             threadListAdapterCallback?.onThreadClicked?.invoke(thread)
             // If the Thread is `onlyOneDraft`, we'll directly navigate to the NewMessageActivity.
             // It means that we won't go to the ThreadFragment, so there's no need to select anything.
@@ -311,6 +303,9 @@ class ThreadListAdapter @Inject constructor(
 
         if (oldPosition != null && oldPosition < itemCount) notifyItemChanged(oldPosition, NotificationType.SELECTED_STATE)
         if (newPosition != null) notifyItemChanged(newPosition, NotificationType.SELECTED_STATE)
+        if (oldPosition != null && newPosition != null) {
+            threadListAdapterCallback?.onPositionClickedChanged?.invoke(newPosition, oldPosition)
+        }
     }
 
     fun getNextThread(startingThreadIndex: Int, direction: Int): Pair<Thread, Int>? {

From 22a3318e92da5599f1158e6d8ffd7607466c1f68 Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Tue, 21 May 2024 14:17:14 +0200
Subject: [PATCH 28/29] Correction english translation

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index abcdc6519f..8b01cf53c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -401,7 +401,7 @@
     <string name="settingsAutoAdvanceDescription">Select what to display when a message is archived or deleted</string>
     <string name="settingsAutoAdvanceFollowingThreadDescription">Display following thread when archiving or deleting</string>
     <string name="settingsAutoAdvanceFollowingThreadTitle">Following thread</string>
-    <string name="settingsAutoAdvanceListOfThreadsDescription">Display list of threads when archiving or deleting</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Display the list of threads when archiving or deleting</string>
     <string name="settingsAutoAdvanceListOfThreadsTitle">List of threads</string>
     <string name="settingsAutoAdvanceNaturalThreadDescription">Repeats the last action you performed</string>
     <string name="settingsAutoAdvanceNaturalThreadHint">Automatically selects the next or previous thread, depending on your last interaction.</string>

From b2d0e4151c63108cbd084b4437450b6feb4fec7b Mon Sep 17 00:00:00 2001
From: Kevin Boulongne <kevin.boulongne@infomaniak.com>
Date: Wed, 22 May 2024 10:03:19 +0200
Subject: [PATCH 29/29] Format code

---
 .../main/java/com/infomaniak/mail/data/api/ApiRepository.kt   | 2 --
 .../com/infomaniak/mail/data/models/signature/Signature.kt    | 1 -
 app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt     | 1 +
 .../java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt | 4 +---
 .../com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt     | 1 -
 .../main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt  | 2 +-
 app/src/main/java/com/infomaniak/mail/utils/Utils.kt          | 2 +-
 7 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt b/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
index 66aede05b0..3558ae0a7b 100644
--- a/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
@@ -60,8 +60,6 @@ import com.infomaniak.mail.ui.newMessage.AiViewModel.Shortcut
 import io.realm.kotlin.ext.copyFromRealm
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
 import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/signature/Signature.kt b/app/src/main/java/com/infomaniak/mail/data/models/signature/Signature.kt
index 1db4c0f71e..e1070e8619 100644
--- a/app/src/main/java/com/infomaniak/mail/data/models/signature/Signature.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/models/signature/Signature.kt
@@ -18,7 +18,6 @@
 package com.infomaniak.mail.data.models.signature
 
 import android.content.Context
-import com.infomaniak.lib.core.utils.context
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.utils.AccountUtils
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 25052f4018..96e95689a7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -846,6 +846,7 @@ class MainViewModel @Inject constructor(
             snackbarManager.postValue(appContext.getString(snackbarTitle))
         }
     }
+    //endregion
 
     //region BlockUser
     fun blockUser(message: Message) = viewModelScope.launch(ioCoroutineContext) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 3f52f0523a..6600535bce 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -466,9 +466,7 @@ class ThreadFragment : Fragment() {
     }
 
     private fun observeAutoAdvance() {
-        mainViewModel.autoAdvanceThreadsUids.observe(viewLifecycleOwner) { listThreadsUids ->
-            tryToAutoAdvance(listThreadsUids)
-        }
+        mainViewModel.autoAdvanceThreadsUids.observe(viewLifecycleOwner, ::tryToAutoAdvance)
     }
 
     private fun displayThreadView() = with(binding) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt
index 702cc0a43e..949d0f1c78 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt
@@ -22,7 +22,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ListAdapter
-import com.infomaniak.lib.core.utils.context
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.databinding.ItemSignatureBinding
diff --git a/app/src/main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt
index 3d0a7ac19a..f5f4f09a9e 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt
@@ -114,7 +114,7 @@ object LocalStorageUtils {
             val attachmentsUploadDir = getAttachmentUploadDir(context, draftLocalUuid, attachmentLocalUuid)
             attachmentsUploadDir.mkdirs()
             val hashedFileName = "${uri.toString().substringAfter("document/").hashCode()}_$fileName"
-            
+
             return@use getFileToUpload(context, uri, snackbarManager, attachmentsUploadDir, hashedFileName, inputStream)
         } ?: run {
             Sentry.withScope { scope ->
diff --git a/app/src/main/java/com/infomaniak/mail/utils/Utils.kt b/app/src/main/java/com/infomaniak/mail/utils/Utils.kt
index bf1817e2d8..f8bf194190 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/Utils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/Utils.kt
@@ -98,7 +98,7 @@ object Utils {
             addSource(liveData2) { postIfInit() }
         }
     }
-    
+
     fun openShortcutHelp(context: Context) {
         ShortcutManagerCompat.reportShortcutUsed(context, Shortcuts.SUPPORT.id)
         context.openUrl(BuildConfig.CHATBOT_URL)