From ae287ff6339b034cd100a55097c7a82d13ac9aaf Mon Sep 17 00:00:00 2001
From: NicolasBourdin88 <nicolas.bourdin@infomaniak.com>
Date: Mon, 6 May 2024 14:45:52 +0200
Subject: [PATCH] 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 a97de926549..e140dc3b45f 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 ecdd7a06421..f8ed1596c88 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 4646159938a..9ead6e1bace 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 7af3b69b2e8..7787e295e0a 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 ef387adabcc..9a1edb23590 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
@@ -160,8 +160,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
@@ -321,21 +321,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)
@@ -350,18 +350,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 c2758d3629a..05510025b41 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
@@ -419,10 +420,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
                 return shouldKeepItem
             }
         }
-
-        mainViewModel.threadUidToDeleteOrArchive.observe(viewLifecycleOwner) {
-            threadListAdapter.openThreadByPosition(localSettings.autoAdvanceMode, it)
-        }
     }
 
     /**
@@ -636,6 +633,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 d8ceaab82ea..36d4242d3c6 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -322,35 +322,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"