Merge pull request #9864 from shamim-emon/fix-issue-9463

Fix: Unified Account is still displayed on TB application even if there is only one account

Author: asoucar

legacy/core/src/main/java/com/fsck/k9/preferences/UnifiedInboxConfigurator.kt

@@ -5,23 +5,31 @@ import net.thunderbird.core.preference.GeneralSettingsManager
 import net.thunderbird.core.preference.update
 
 /**
- * Configures the unified inbox after an account has been added.
+ * Configures the unified inbox based on the number of accounts:
+ * - If there is exactly 1 account → unified inbox is disabled.
+ * - If there are exactly 2 accounts → unified inbox is enabled.
+ * - For all other cases → no change is made.
  */
 class UnifiedInboxConfigurator(
     private val accountManager: LegacyAccountDtoManager,
     private val generalSettingsManager: GeneralSettingsManager,
 ) {
     fun configureUnifiedInbox() {
-        if (accountManager.getAccounts().size == 2) {
-            generalSettingsManager.update { settings ->
-                settings.copy(
-                    display = settings.display.copy(
-                        inboxSettings = settings.display.inboxSettings.copy(
-                            isShowUnifiedInbox = true,
-                        ),
+        when (accountManager.getAccounts().size) {
+            1 -> updateUnifiedInbox(false)
+            2 -> updateUnifiedInbox(true)
+            else -> Unit
+        }
+    }
+    private fun updateUnifiedInbox(isShowUnifiedInbox: Boolean) {
+        generalSettingsManager.update { settings ->
+            settings.copy(
+                display = settings.display.copy(
+                    inboxSettings = settings.display.inboxSettings.copy(
+                        isShowUnifiedInbox = isShowUnifiedInbox,
                     ),
-                )
-            }
+                ),
+            )
         }
     }
 }

legacy/core/src/test/java/com/fsck/k9/UnifiedInboxConfiguratorTest.kt

@@ -67,6 +67,18 @@ class UnifiedInboxConfiguratorTest {
         assertThat(generalSettingsManager.getConfig().display.inboxSettings.isShowUnifiedInbox).isEqualTo(true)
     }
 
+    @Test
+    fun `configureUnifiedInbox should disable unified inbox when there is only one account`() {
+        // Given
+        `when`(accountManager.getAccounts()).thenReturn(listOf(mock()))
+
+        // When
+        configurator.configureUnifiedInbox()
+
+        // Then
+        assertThat(generalSettingsManager.getConfig().display.inboxSettings.isShowUnifiedInbox).isEqualTo(false)
+    }
+
     @Test
     fun `configureUnifiedInbox should not enable unified inbox when there are less than two accounts`() {
         // Given

legacy/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt

@@ -6,6 +6,7 @@ import com.fsck.k9.Preferences
 import com.fsck.k9.backend.BackendManager
 import com.fsck.k9.controller.MessagingController
 import com.fsck.k9.mailstore.LocalStoreProvider
+import com.fsck.k9.preferences.UnifiedInboxConfigurator
 import net.thunderbird.core.android.account.LegacyAccountDto
 import net.thunderbird.core.logging.legacy.Log
 
@@ -18,6 +19,7 @@ class AccountRemover(
     private val backendManager: BackendManager,
     private val localKeyStoreManager: LocalKeyStoreManager,
     private val preferences: Preferences,
+    private val unifiedInboxConfigurator: UnifiedInboxConfigurator,
 ) {
 
     fun removeAccount(accountUuid: String) {
@@ -38,6 +40,7 @@ class AccountRemover(
 
         removeCertificates(account)
         Core.setServicesEnabled()
+        unifiedInboxConfigurator.configureUnifiedInbox()
 
         Log.v("Finished removing account '%s'.", accountName)
     }

legacy/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt

@@ -11,6 +11,7 @@ val accountModule = module {
             backendManager = get(),
             localKeyStoreManager = get(),
             preferences = get(),
+            unifiedInboxConfigurator = get(),
         )
     }
     factory { BackgroundAccountRemover(get()) }