Simplify intrications

Author: KevinBoulongne

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

@@ -135,8 +135,8 @@ abstract class TwoPaneFragment : Fragment() {
             safeNavigateToNewMessageActivity(args = it.toBundle())
         }
 
-        navArgs.observe(viewLifecycleOwner) { (resId, args, className) ->
-            this@TwoPaneFragment.safeNavigate(resId = resId, args = args, currentClassName = className)
+        navArgs.observe(viewLifecycleOwner) { (resId, args) ->
+            safeNavigate(resId, args)
         }
     }
 

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

@@ -89,13 +89,8 @@ class TwoPaneViewModel @Inject constructor(
         )
     }
 
-    fun safeNavigate(@IdRes resId: Int, args: Bundle?, className: String? = null) {
-        navArgs.value = NavData(resId = resId, args = args, className = className)
-    }
-
     data class NavData(
         @IdRes val resId: Int,
-        val args: Bundle? = null,
-        val className: String?,
+        val args: Bundle,
     )
 }

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt

@@ -62,6 +62,7 @@ import com.infomaniak.mail.ui.MainViewModel
 import com.infomaniak.mail.ui.alertDialogs.*
 import com.infomaniak.mail.ui.main.folder.TwoPaneFragment
 import com.infomaniak.mail.ui.main.folder.TwoPaneViewModel
+import com.infomaniak.mail.ui.main.folder.TwoPaneViewModel.NavData
 import com.infomaniak.mail.ui.main.thread.ThreadAdapter.ContextMenuType
 import com.infomaniak.mail.ui.main.thread.ThreadViewModel.OpenThreadResult
 import com.infomaniak.mail.ui.main.thread.actions.AttachmentActionsBottomSheetDialogArgs
@@ -495,7 +496,7 @@ class ThreadFragment : Fragment() {
     private fun Message.navigateToActionsBottomSheet() {
         safeNavigate(
             resId = R.id.messageActionsBottomSheetDialog,
-            MessageActionsBottomSheetDialogArgs(
+            args = MessageActionsBottomSheetDialogArgs(
                 messageUid = uid,
                 threadUid = twoPaneViewModel.currentThreadUid.value ?: return,
                 isThemeTheSame = threadAdapter.isThemeTheSameMap[uid] ?: return,
@@ -579,8 +580,8 @@ class ThreadFragment : Fragment() {
 
     fun getAnchor(): View? = _binding?.quickActionBar
 
-    private fun safeNavigate(@IdRes resId: Int, args: Bundle? = null) {
-        twoPaneViewModel.safeNavigate(resId, args)
+    private fun safeNavigate(@IdRes resId: Int, args: Bundle) {
+        twoPaneViewModel.navArgs.value = NavData(resId, args)
     }
 
     enum class HeaderState {