Clean ThreadListAdapterCallback code

Author: KevinBoulongne

.idea/codeStyles/Project.xml

@@ -1047,16 +1047,16 @@ class MainViewModel @Inject constructor(
         snackbarManager.postValue(appContext.getString(snackbarTitleRes))
     }
 
-    private fun threadHasOnlyOneMessageLeftInCurrentFolder(threadUid: String): Boolean {
-        val folderId = currentFolderId ?: return false
-        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())
     }
 
+    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

app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt

@@ -21,8 +21,8 @@ import com.infomaniak.mail.data.models.thread.Thread
 
 interface ThreadListAdapterCallback {
     var onSwipeFinished: (() -> Unit)?
-    var onThreadClicked: ((thread: Thread) -> Unit)
+    var onThreadClicked: (thread: Thread) -> Unit
     var onFlushClicked: ((dialogTitle: String) -> Unit)?
-    var onLoadMoreClicked: (() -> Unit)?
-    var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)?
+    var onLoadMoreClicked: () -> Unit
+    var onPositionClickedChanged: (position: Int, previousPosition: Int) -> Unit
 }

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapterCallback.kt

@@ -286,8 +286,11 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         threadListAdapter(
             folderRole = mainViewModel.currentFolder.value?.role,
             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"
@@ -307,12 +310,13 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
                         },
                     )
                 }
-                override var onLoadMoreClicked: (() -> Unit)? = {
+
+                override var onLoadMoreClicked: () -> Unit = {
                     trackThreadListEvent("loadMore")
                     mainViewModel.getOnePageOfOldMessages()
                 }
-                override var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? =
-                    ::updateAutoAdvanceNaturalThread
+
+                override var onPositionClickedChanged: (Int, Int) -> Unit = ::updateAutoAdvanceNaturalThread
             },
             multiSelection = object : MultiSelectionListener<Thread> {
                 override var isEnabled by mainViewModel::isMultiSelectOn

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt

@@ -150,7 +150,9 @@ class SearchFragment : TwoPaneFragment() {
             folderRole = null,
             isFolderNameVisible = true,
             threadListAdapterCallback = object : ThreadListAdapterCallback {
+
                 override var onSwipeFinished: (() -> Unit)? = null
+
                 override var onThreadClicked: (Thread) -> Unit = { thread ->
                     with(searchViewModel) {
                         if (!isLengthTooShort(currentSearchQuery)) history.value = currentSearchQuery
@@ -161,14 +163,16 @@ class SearchFragment : TwoPaneFragment() {
                         navigateToThread(thread)
                     }
                 }
-                override var onFlushClicked: ((dialogTitle: String) -> Unit)? = null
-                override var onLoadMoreClicked: (() -> Unit)? = {
+
+                override var onFlushClicked: ((String) -> Unit)? = null
+
+                override var onLoadMoreClicked: () -> Unit = {
                     trackThreadListEvent("loadMore")
                     mainViewModel.getOnePageOfOldMessages()
                 }
-                override var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? =
-                    ::updateAutoAdvanceNaturalThread
-            }
+
+                override var onPositionClickedChanged: (Int, Int) -> Unit = ::updateAutoAdvanceNaturalThread
+            },
         )
 
         threadListAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY