refactor(MyKSuiteBlockSignature): Use the isFreeMailbox instead of my…

…KSuiteData
Infomaniak · Feb 19, 2025 · e51b979 · e51b979
1 parent 278bad7
commit e51b979
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/SignatureSettingAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/SignatureSettingAdapter.kt
@@ -26,10 +26,10 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.databinding.ItemSettingsSignatureBinding
 import com.infomaniak.mail.ui.main.settings.mailbox.SignatureSettingAdapter.SettingsSignatureViewHolder
-import com.infomaniak.mail.utils.MyKSuiteDataUtils
 
 class SignatureSettingAdapter(
     private val canManageSignature: Boolean,
+    private val isFreeMailbox: Boolean,
     private val onSignatureSelected: (Signature, Boolean) -> Unit,
 ) : Adapter<SettingsSignatureViewHolder>() {
 
@@ -47,7 +47,7 @@ class SignatureSettingAdapter(
         if (signature.isDefault) check() else uncheck()
         isEnabled = canManageSignature
 
-        val shouldBlockSignature = signature.isDummy && !signature.isDefault && MyKSuiteDataUtils.myKSuite?.isMyKSuite == true
+        val shouldBlockSignature = signature.isDummy && !signature.isDefault && isFreeMailbox
         setMyKSuiteChipVisibility(shouldBlockSignature)
 
         setOnClickListener { onSignatureSelected(signature, shouldBlockSignature) }

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/SignatureSettingFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/mailbox/SignatureSettingFragment.kt
@@ -23,17 +23,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
-import com.infomaniak.core.myksuite.ui.views.MyKSuiteUpgradeBottomSheetDialogArgs
 import com.infomaniak.lib.core.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.lib.core.utils.UtilsUi.openUrl
 import com.infomaniak.lib.core.utils.safeBinding
-import com.infomaniak.lib.core.utils.safeNavigate
 import com.infomaniak.mail.BuildConfig
-import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.mailbox.Mailbox
 import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.databinding.FragmentSignatureSettingBinding
+import com.infomaniak.mail.utils.MyKSuiteDataUtils.openMyKSuiteUpgradeBottomSheet
 import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import io.realm.kotlin.ext.copyFromRealm
@@ -70,6 +67,7 @@ class SignatureSettingFragment : Fragment() {
         binding.signatureList.adapter = SignatureSettingAdapter(
             canManageSignature = mailbox.permissions?.canManageSignatures ?: false,
             onSignatureSelected = ::onSignatureClicked,
+            isFreeMailbox = mailbox.isFreeMailbox,
         )
     }
 
@@ -87,8 +85,7 @@ class SignatureSettingFragment : Fragment() {
 
     private fun onSignatureClicked(signature: Signature, shouldBlockDummySignature: Boolean) = with(signatureSettingViewModel) {
         if (signature.isDummy && shouldBlockDummySignature) {
-            val args = MyKSuiteUpgradeBottomSheetDialogArgs(kSuiteApp = KSuiteApp.Mail)
-            safeNavigate(R.id.myKSuiteUpgradeBottomSheet, args = args.toBundle())
+            openMyKSuiteUpgradeBottomSheet()
             return@with
         }
 

diff --git a/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt
@@ -17,8 +17,13 @@
  */
 package com.infomaniak.mail.utils
 
+import androidx.fragment.app.Fragment
 import com.infomaniak.core.myksuite.ui.data.MyKSuiteData
 import com.infomaniak.core.myksuite.ui.data.MyKSuiteDataManager
+import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
+import com.infomaniak.core.myksuite.ui.views.MyKSuiteUpgradeBottomSheetDialogArgs
+import com.infomaniak.lib.core.utils.safeNavigate
+import com.infomaniak.mail.R
 import com.infomaniak.mail.data.cache.appSettings.AppSettingsController
 import com.infomaniak.mail.data.models.AppSettings
 
@@ -37,4 +42,9 @@ object MyKSuiteDataUtils : MyKSuiteDataManager() {
             field = myKSuiteData
             myKSuiteId = myKSuiteData?.id ?: AppSettings.DEFAULT_ID
         }
+
+    fun Fragment.openMyKSuiteUpgradeBottomSheet(currentClassName: String? = null) {
+        val args = MyKSuiteUpgradeBottomSheetDialogArgs(kSuiteApp = KSuiteApp.Mail)
+        safeNavigate(R.id.myKSuiteUpgradeBottomSheet, args.toBundle(), currentClassName = currentClassName)
+    }
 }