Merge pull request #8566 from wmontwe/enable-funging-for-k9-full (51021994) · Commits · e / os / Mail

app-k9mail/badging/fullRelease-badging.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ uses-permission: name='android.permission.FOREGROUND_SERVICE_DATA_SYNC'
		uses-permission: name='android.permission.SCHEDULE_EXACT_ALARM'
		uses-permission: name='android.permission.USE_BIOMETRIC'
		uses-permission: name='android.permission.USE_FINGERPRINT'
		uses-permission: name='com.android.vending.BILLING'
		uses-permission: name='com.fsck.k9.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
		application-label:'K-9 Mail'
		application-label-ar:'بريد K-9'

app-k9mail/build.gradle.kts

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ dependencies {
		implementation(projects.core.featureflags)

		"fossImplementation"(projects.feature.funding.noop)
		"fullImplementation"(projects.feature.funding.noop)
		"fullImplementation"(projects.feature.funding.googleplay)
		implementation(projects.feature.migration.launcher.noop)
		implementation(projects.feature.onboarding.migration.noop)
		implementation(projects.feature.telemetry.noop)

app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -132,15 +132,28 @@ co.touchlab:stately-concurrent-collections-jvm:2.0.6
		co.touchlab:stately-concurrent-collections:2.0.6
		co.touchlab:stately-strict-jvm:2.0.6
		co.touchlab:stately-strict:2.0.6
		com.android.billingclient:billing-ktx:7.1.1
		com.android.billingclient:billing:7.1.1
		com.beetstra.jutf7:jutf7:1.0.0
		com.github.ByteHamster:SearchPreference:v2.3.0
		com.github.bumptech.glide:annotations:4.16.0
		com.github.bumptech.glide:disklrucache:4.16.0
		com.github.bumptech.glide:gifdecoder:4.16.0
		com.github.bumptech.glide:glide:4.16.0
		com.google.android.datatransport:transport-api:3.0.0
		com.google.android.datatransport:transport-backend-cct:3.1.8
		com.google.android.datatransport:transport-runtime:3.1.8
		com.google.android.flexbox:flexbox:3.0.0
		com.google.android.gms:play-services-base:18.5.0
		com.google.android.gms:play-services-basement:18.4.0
		com.google.android.gms:play-services-location:19.0.0
		com.google.android.gms:play-services-places-placereport:17.0.0
		com.google.android.gms:play-services-tasks:18.2.0
		com.google.android.material:material:1.12.0
		com.google.errorprone:error_prone_annotations:2.15.0
		com.google.firebase:firebase-encoders-json:18.0.0
		com.google.firebase:firebase-encoders-proto:16.0.0
		com.google.firebase:firebase-encoders:17.0.0
		com.google.guava:listenablefuture:1.0
		com.jakewharton.timber:timber:5.0.1
		com.jcraft:jzlib:1.0.7
		@@ -170,6 +183,7 @@ io.insert-koin:koin-compose-jvm:1.1.5
		io.insert-koin:koin-compose:1.1.5
		io.insert-koin:koin-core-jvm:3.5.6
		io.insert-koin:koin-core:3.5.6
		javax.inject:javax.inject:1
		net.jcip:jcip-annotations:1.0
		net.openid:appauth:0.11.1
		org.apache.commons:commons-lang3:3.7

app-thunderbird/src/main/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt

+1 −4

Original line number	Diff line number	Diff line
		@@ -2,12 +2,9 @@ package net.thunderbird.android.featureflag

		import app.k9mail.core.featureflag.FeatureFlag
		import app.k9mail.core.featureflag.FeatureFlagFactory
		import app.k9mail.core.featureflag.FeatureFlagKey

		class TbFeatureFlagFactory : FeatureFlagFactory {
		override fun createFeatureCatalog(): List<FeatureFlag> {
		return listOf(
		FeatureFlag(FeatureFlagKey("funding_google_play"), true),
		)
		return listOf()
		}
		}

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt

+8 −14

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
		import androidx.recyclerview.widget.LinearLayoutManager
		import androidx.recyclerview.widget.RecyclerView
		import app.k9mail.core.common.provider.BrandNameProvider
		import app.k9mail.core.featureflag.FeatureFlagKey
		import app.k9mail.core.featureflag.FeatureFlagProvider
		import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons
		import app.k9mail.feature.funding.api.FundingManager
		import app.k9mail.feature.funding.api.FundingType
		@@ -42,7 +40,6 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
		private val viewModel: SettingsViewModel by viewModel()
		private val fundingManager: FundingManager by inject()
		private val brandNameProvider: BrandNameProvider by inject()
		private val featureFlagProvider: FeatureFlagProvider by inject()

		private lateinit var itemAdapter: ItemAdapter<GenericItem>

		@@ -151,8 +148,6 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
		private fun SettingsListBuilder.addFunding() {
		when (fundingManager.getFundingType()) {
		FundingType.GOOGLE_PLAY -> {
		featureFlagProvider.provide(FeatureFlagKey("funding_google_play"))
		.onEnabled {
		addIntent(
		text = getString(R.string.settings_list_action_support, brandNameProvider.brandName),
		icon = Icons.Outlined.Favorite,
		@@ -162,7 +157,6 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
		),
		)
		}
		}

		FundingType.LINK -> {
		addUrlAction(