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

Commit 4626eeed authored by Philipp Kewisch's avatar Philipp Kewisch
Browse files

Uplift changes from main to beta for 8.0b5 (again)

parents fee5f2aa d256ff51

app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt

+2 −8
Original line number Diff line number Diff line
@@ -8,10 +8,7 @@ import app.k9mail.core.featureflag.FeatureFlagFactory 
import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider

import app.k9mail.dev.developmentModuleAdditions

import app.k9mail.feature.funding.featureFundingModule

import app.k9mail.feature.migration.launcher.featureMigrationModule

import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

import app.k9mail.feature.featureModule

import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity

import app.k9mail.featureflag.K9FeatureFlagFactory

import app.k9mail.provider.K9AppNameProvider
@@ -31,10 +28,7 @@ import org.koin.dsl.module 


val appModule = module {

    includes(appWidgetModule)

    includes(telemetryModule)

    includes(featureFundingModule)

    includes(onboardingMigrationModule)

    includes(featureMigrationModule)

    includes(featureModule)



    single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }

    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
package app.k9mail.feature



import app.k9mail.feature.funding.api.FundingSettings

import app.k9mail.feature.funding.featureFundingModule

import app.k9mail.feature.migration.launcher.featureMigrationModule

import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

import com.fsck.k9.feature.featureLauncherModule

import org.koin.dsl.module



val featureModule = module {

    includes(featureLauncherModule)

    includes(telemetryModule)

    includes(featureFundingModule)

    includes(onboardingMigrationModule)

    includes(featureMigrationModule)



    single<FundingSettings> { K9FundingSettings() }

}

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

0 → 100644
+27 −0
Original line number Diff line number Diff line 
package app.k9mail.feature



import app.k9mail.feature.funding.api.FundingSettings

import com.fsck.k9.K9



class K9FundingSettings : FundingSettings {

    override fun getReminderReferenceTimestamp(): Long = K9.fundingReminderReferenceTimestamp



    override fun setReminderReferenceTimestamp(timestamp: Long) {

        K9.fundingReminderReferenceTimestamp = timestamp

        K9.saveSettingsAsync()

    }



    override fun getReminderShownTimestamp() = K9.fundingReminderShownTimestamp



    override fun setReminderShownTimestamp(timestamp: Long) {

        K9.fundingReminderShownTimestamp = timestamp

        K9.saveSettingsAsync()

    }



    override fun getActivityCounterInMillis(): Long = K9.fundingActivityCounterInMillis



    override fun setActivityCounterInMillis(activeTime: Long) {

        K9.fundingActivityCounterInMillis = activeTime

        K9.saveSettingsAsync()

    }

}

app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt

+2 −8
Original line number Diff line number Diff line
@@ -6,16 +6,13 @@ import app.k9mail.core.common.provider.BrandNameProvider 
import app.k9mail.core.featureflag.FeatureFlagFactory

import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider

import app.k9mail.feature.funding.featureFundingModule

import app.k9mail.feature.migration.launcher.featureMigrationModule

import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity

import com.fsck.k9.AppConfig

import com.fsck.k9.activity.MessageCompose

import com.fsck.k9.preferences.FilePrefixProvider

import net.thunderbird.android.auth.TbOAuthConfigurationFactory

import net.thunderbird.android.dev.developmentModuleAdditions

import net.thunderbird.android.feature.featureModule

import net.thunderbird.android.featureflag.TbFeatureFlagFactory

import net.thunderbird.android.provider.TbAppNameProvider

import net.thunderbird.android.provider.TbFeatureThemeProvider
@@ -30,10 +27,7 @@ import org.koin.dsl.module 


val appModule = module {

    includes(appWidgetModule)

    includes(telemetryModule)

    includes(featureFundingModule)

    includes(onboardingMigrationModule)

    includes(featureMigrationModule)

    includes(featureModule)



    single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }

    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
package net.thunderbird.android.feature



import app.k9mail.feature.funding.api.FundingSettings

import app.k9mail.feature.funding.featureFundingModule

import app.k9mail.feature.migration.launcher.featureMigrationModule

import app.k9mail.feature.onboarding.migration.onboardingMigrationModule

import app.k9mail.feature.telemetry.telemetryModule

import com.fsck.k9.feature.featureLauncherModule

import org.koin.dsl.module



val featureModule = module {

    includes(featureLauncherModule)

    includes(telemetryModule)

    includes(featureFundingModule)

    includes(onboardingMigrationModule)

    includes(featureMigrationModule)



    single<FundingSettings> { TbFundingSettings() }

}