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

Unverified Commit dd7033cb authored by Rafael Tonholo's avatar Rafael Tonholo Committed by GitHub
Browse files

Merge pull request #9158 from rafaeltonholo/fix/7062/swipe-gesture-archive-when-folder-not-set 

Enable creating Archive folder when swipe action is archive and account doesn't have one.
parents 5039f7bd addaab03

app-k9mail/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ dependencies { 
    implementation(projects.core.ui.compose.theme2.k9mail)

    implementation(projects.core.ui.legacy.theme2.k9mail)

    implementation(projects.feature.launcher)

    implementation(projects.feature.mail.message.list)



    implementation(projects.legacy.core)

    implementation(projects.legacy.ui.legacy)

app-k9mail/src/main/kotlin/app/k9mail/feature/FeatureModule.kt

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import app.k9mail.feature.migration.launcher.featureMigrationModule 
import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

import net.thunderbird.feature.account.settings.featureAccountSettingsModule

import net.thunderbird.feature.mail.message.list.featureMessageListModule

import org.koin.dsl.module



val featureModule = module {
@@ -14,6 +15,7 @@ val featureModule = module { 
    includes(featureFundingModule)

    includes(onboardingMigrationModule)

    includes(featureMigrationModule)

    includes(featureMessageListModule)



    single<FundingSettings> { K9FundingSettings() }

}

app-k9mail/src/test/kotlin/app/k9mail/DependencyInjectionTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ import com.fsck.k9.ui.changelog.ChangelogViewModel 
import com.fsck.k9.view.K9WebViewClient

import com.fsck.k9.view.MessageWebView

import net.openid.appauth.AppAuthConfiguration

import net.thunderbird.core.preference.storage.Storage

import net.thunderbird.feature.account.AccountId

import net.thunderbird.feature.mail.message.list.ui.dialog.SetupArchiveFolderDialogContract

import org.junit.Test

import org.koin.core.annotation.KoinExperimentalAPI

import org.koin.test.verify.definition
@@ -45,6 +47,7 @@ class DependencyInjectionTest { 
                InteractionMode::class,

                NotificationManager::class,

                Resources::class,

                Storage::class,

            ),

            injections = injectedParameters(

                definition<AccountRemoverWorker>(WorkerParameters::class),
@@ -53,6 +56,7 @@ class DependencyInjectionTest { 
                definition<K9WebViewClient>(AttachmentResolver::class, MessageWebView.OnPageFinishedListener::class),

                definition<MailSyncWorker>(WorkerParameters::class),

                definition<OpenPgpApiManager>(LifecycleOwner::class),

                definition<SetupArchiveFolderDialogContract.ViewModel>(SetupArchiveFolderDialogContract.State::class),

            ),

        )

    }

app-thunderbird/build.gradle.kts

+9 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ android { 
        resources {

            excludes += listOf(

                "META-INF/*.kotlin_module",

                "META-INF/*.version",

                "kotlin/**",

                "DebugProbesKt.bin",

            )
@@ -193,6 +192,14 @@ android { 
    }

}



androidComponents {

    onVariants(selector().withBuildType("release")) { variant ->

        variant.packaging.resources.excludes.addAll(

            "META-INF/*.version",

        )

    }

}



// Initialize placeholders for the product flavor and build type combinations needed for dependency declarations.

// They are required to avoid "Unresolved configuration" errors.

val fullDebugImplementation by configurations.creating
@@ -212,6 +219,7 @@ dependencies { 
    implementation(projects.core.featureflag)



    implementation(projects.feature.account.settings.impl)

    implementation(projects.feature.mail.message.list)



    implementation(projects.feature.widget.messageList)

    implementation(projects.feature.widget.messageListGlance)

app-thunderbird/src/main/kotlin/net/thunderbird/android/feature/FeatureModule.kt

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import app.k9mail.feature.migration.launcher.featureMigrationModule 
import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

import net.thunderbird.feature.account.settings.featureAccountSettingsModule

import net.thunderbird.feature.mail.message.list.featureMessageListModule

import org.koin.dsl.module



internal val featureModule = module {
@@ -14,6 +15,7 @@ internal val featureModule = module { 
    includes(featureFundingModule)

    includes(onboardingMigrationModule)

    includes(featureMigrationModule)

    includes(featureMessageListModule)



    single<FundingSettings> { TbFundingSettings() }

}