feat(account creation): Added use cases for finding a folder by the folder type and enabling push with the folder ID and account information.

Author: dani-zilla

app-common/src/main/kotlin/net/thunderbird/app/common/account/AccountCreator.kt

@@ -7,6 +7,9 @@ import app.k9mail.feature.account.common.domain.entity.SpecialFolderSettings
 import app.k9mail.feature.account.setup.AccountSetupExternalContract
 import app.k9mail.feature.account.setup.AccountSetupExternalContract.AccountCreator.AccountCreatorResult
 import app.k9mail.feature.account.setup.domain.usecase.GetSpecialFolderOptions
+import app.k9mail.legacy.mailstore.MessageStoreManager
+import app.k9mail.legacy.mailstore.domain.GetFolderIdsForTypeUseCase
+import app.k9mail.legacy.mailstore.domain.SetPushForFolderUseCase
 import com.fsck.k9.Core
 import com.fsck.k9.Preferences
 import com.fsck.k9.account.DeletePolicyProvider
@@ -48,6 +51,8 @@ internal class AccountCreator(
     private val avatarMonogramCreator: AvatarMonogramCreator,
     private val unifiedInboxConfigurator: UnifiedInboxConfigurator,
     private val featureFlagProvider: FeatureFlagProvider,
+    private val getFolderIdsForTypeUseCase: GetFolderIdsForTypeUseCase,
+    private val setPushForFolderUseCase: SetPushForFolderUseCase,
     private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : AccountSetupExternalContract.AccountCreator {
 
@@ -114,19 +119,12 @@ internal class AccountCreator(
         featureFlagProvider.provide(GeneratedFeatureFlagKey.PUSH_ENABLED_ON_INBOX_BY_DEFAULT)
             .onEnabled {
                 // The AccountCreator is only called when not importing settings.
-                // We can update inbox push here by default.
-                // TODO Get Inbox folderDetails, then updateFolderSettings
-                // TODO make a use case for getting a folder's settings by type
-                val inboxFolderID: Long? =
-                    messagingController.getMessageStore(newAccount).getFolders(true) { folderDetails ->
-                        if (folderDetails.type == FolderType.INBOX) {
-                            folderDetails.id
-                        } else {
-                            null
-                        }
-                    }.firstOrNull()
-                if (inboxFolderID != null) {
-                    messagingController.getMessageStore(newAccount).setPushEnabled(inboxFolderID, true)
+                // We can update inbox push here by default, as it's always a new account.
+                getFolderIdsForTypeUseCase(
+                    newAccount.uuid,
+                    FolderType.INBOX
+                ).firstOrNull()?.let { inboxFolderId ->
+                    setPushForFolderUseCase(accountUuid = newAccount.uuid, folderId = inboxFolderId, enabled = true)
                 }
             }
 

app-common/src/main/kotlin/net/thunderbird/app/common/account/AppCommonAccountModule.kt

@@ -92,6 +92,8 @@ internal val appCommonAccountModule = module {
             avatarMonogramCreator = get(),
             unifiedInboxConfigurator = get(),
             featureFlagProvider = get(),
+            getFolderIdsForTypeUseCase = get(),
+            setPushForFolderUseCase = get(),
         )
     }
 }

legacy/core/src/main/java/com/fsck/k9/controller/KoinModule.kt

@@ -2,6 +2,8 @@ package com.fsck.k9.controller
 
 import android.content.Context
 import app.k9mail.legacy.mailstore.MessageStoreManager
+import app.k9mail.legacy.mailstore.domain.GetFolderIdsForTypeUseCase
+import app.k9mail.legacy.mailstore.domain.SetPushForFolderUseCase
 import app.k9mail.legacy.message.controller.MessageCountsProvider
 import app.k9mail.legacy.message.controller.MessagingControllerRegistry
 import com.fsck.k9.Preferences
@@ -60,4 +62,16 @@ val controllerModule = module {
             outboxFolderManager = get(),
         )
     }
+
+    single<GetFolderIdsForTypeUseCase> {
+        GetFolderIdsForTypeUseCase(
+            messageStoreManager = get(),
+        )
+    }
+
+    single<SetPushForFolderUseCase> {
+        SetPushForFolderUseCase(
+            messageStoreManager = get(),
+        )
+    }
 }

legacy/mailstore/src/main/java/app/k9mail/legacy/mailstore/domain/GetFolderIdsForTypeUseCase.kt

@@ -0,0 +1,22 @@
+package app.k9mail.legacy.mailstore.domain
+
+import app.k9mail.legacy.mailstore.MessageStoreManager
+import com.fsck.k9.mail.FolderType
+
+class GetFolderIdsForTypeUseCase(
+    private val messageStoreManager: MessageStoreManager,
+) {
+    operator fun invoke(
+        accountUuid: String,
+        folderType: FolderType,
+    ): List<Long?> {
+        return messageStoreManager.getMessageStore(accountUuid)
+            .getFolders(true) { folderDetails ->
+                if (folderDetails.type == folderType) {
+                    folderDetails.id
+                } else {
+                    null
+                }
+            }
+    }
+}

legacy/mailstore/src/main/java/app/k9mail/legacy/mailstore/domain/SetPushForFolderUseCase.kt

@@ -0,0 +1,11 @@
+package app.k9mail.legacy.mailstore.domain
+
+import app.k9mail.legacy.mailstore.MessageStoreManager
+
+class SetPushForFolderUseCase(
+    private val messageStoreManager: MessageStoreManager,
+) {
+    operator fun invoke(accountUuid: String, folderId: Long, enabled: Boolean) {
+        messageStoreManager.getMessageStore(accountUuid).setPushEnabled(folderId, enabled)
+    }
+}