Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 9b11cb64 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #8157 from thunderbird/remove_push_folder_class 

Remove folder push class
parents 32cf76ee 550693fa

core/mail/folder/api/src/main/kotlin/app/k9mail/core/mail/folder/api/FolderDetails.kt

+1 −1
Original line number Diff line number Diff line
@@ -9,5 +9,5 @@ data class FolderDetails( 
    val syncClass: FolderClass,

    val displayClass: FolderClass,

    val isNotificationsEnabled: Boolean,

    val pushClass: FolderClass,

    val isPushEnabled: Boolean,

)

legacy/common/src/main/java/com/fsck/k9/account/AccountCreator.kt

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import app.k9mail.feature.account.common.domain.entity.SpecialFolderOption 
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.legacy.account.Account.FolderMode

import app.k9mail.legacy.account.Account.SpecialFolderSelection

import com.fsck.k9.Core

import com.fsck.k9.Preferences
@@ -67,7 +66,6 @@ class AccountCreator( 
        newAccount.automaticCheckIntervalMinutes = account.options.checkFrequencyInMinutes

        newAccount.displayCount = account.options.messageDisplayCount



        newAccount.folderPushMode = FolderMode.NONE

        newAccount.deletePolicy = DeletePolicyHelper.getDefaultDeletePolicy(newAccount.incomingServerSettings.type)

        newAccount.chipColor = accountColorPicker.pickColor()

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

+1 −5
Original line number Diff line number Diff line 
package com.fsck.k9.controller.push



import app.k9mail.legacy.account.Account

import app.k9mail.legacy.account.Account.FolderMode

import app.k9mail.legacy.mailstore.FolderRepository

import com.fsck.k9.Preferences

import com.fsck.k9.backend.BackendManager

import com.fsck.k9.backend.api.BackendPusher

import com.fsck.k9.backend.api.BackendPusherCallback
@@ -18,7 +16,6 @@ import timber.log.Timber 
internal class AccountPushController(

    private val backendManager: BackendManager,

    private val messagingController: MessagingController,

    private val preferences: Preferences,

    private val folderRepository: FolderRepository,

    backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,

    private val account: Account,
@@ -96,7 +93,6 @@ internal class AccountPushController( 
    }



    private fun disablePush() {

        account.folderPushMode = FolderMode.NONE

        preferences.saveAccount(account)

        folderRepository.setPushDisabled(account)

    }

}

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

+0 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ package com.fsck.k9.controller.push 


import app.k9mail.legacy.account.Account

import app.k9mail.legacy.mailstore.FolderRepository

import com.fsck.k9.Preferences

import com.fsck.k9.backend.BackendManager

import com.fsck.k9.controller.MessagingController
@@ -10,13 +9,11 @@ internal class AccountPushControllerFactory( 
    private val backendManager: BackendManager,

    private val messagingController: MessagingController,

    private val folderRepository: FolderRepository,

    private val preferences: Preferences,

) {

    fun create(account: Account): AccountPushController {

        return AccountPushController(

            backendManager,

            messagingController,

            preferences,

            folderRepository,

            account = account,

        )

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

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ internal val controllerPushModule = module { 
            backendManager = get(),

            messagingController = get(),

            folderRepository = get(),

            preferences = get(),

        )

    }

    single {
@@ -26,6 +25,7 @@ internal val controllerPushModule = module { 
            pushNotificationManager = get(),

            connectivityManager = get(),

            accountPushControllerFactory = get(),

            folderRepository = get(),

        )

    }