mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 12:12:15 +02:00
Code

Add FeatureFlagFactory to K9 app and use the flag in MessageList

Browse Source
This commit is contained in:
Wolf-Martell Montwé 2023-06-30 14:50:00 +02:00
parent cfee354370
commit c781e7032d
No known key found for this signature in database
GPG Key ID: 6D45B21512ACBF72
5 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/k9mail/build.gradle.kts
View File

@ -17,6 +17,7 @@ dependencies {
implementation(projects.backend.pop3)
debugImplementation(projects.backend.demo)
implementation(projects.core.featureflags)
implementation(projects.feature.launcher)
// TODO remove account setup dependency

10
app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt
View File

@ -1,6 +1,9 @@
package com.fsck.k9
import app.k9mail.core.common.oauth.OAuthConfigurationFactory
import app.k9mail.core.featureflag.FeatureFlagFactory
import app.k9mail.core.featureflag.FeatureFlagProvider
import app.k9mail.core.featureflag.InMemoryFeatureFlagProvider
import app.k9mail.ui.widget.list.messageListWidgetModule
import com.fsck.k9.account.newAccountModule
import com.fsck.k9.auth.AppOAuthConfigurationFactory
@ -9,6 +12,7 @@ import com.fsck.k9.controller.ControllerExtension
import com.fsck.k9.crypto.EncryptionExtractor
import com.fsck.k9.crypto.openpgp.OpenPgpEncryptionExtractor
import com.fsck.k9.feature.featureModule
import com.fsck.k9.featureflag.InMemoryFeatureFlagFactory
import com.fsck.k9.notification.notificationModule
import com.fsck.k9.preferences.K9StoragePersister
import com.fsck.k9.preferences.StoragePersister
@ -33,6 +37,12 @@ private val mainAppModule = module {
single<EncryptionExtractor> { OpenPgpEncryptionExtractor.newInstance() }
single<StoragePersister> { K9StoragePersister(get()) }
single<OAuthConfigurationFactory> { AppOAuthConfigurationFactory() }
single<FeatureFlagFactory> { InMemoryFeatureFlagFactory() }
single<FeatureFlagProvider> {
InMemoryFeatureFlagProvider(
featureFlagFactory = get(),
)
}
}
val appModules = listOf(

13
app/k9mail/src/main/java/com/fsck/k9/featureflag/InMemoryFeatureFlagFactory.kt Normal file
View File

@ -0,0 +1,13 @@
package com.fsck.k9.featureflag
import app.k9mail.core.featureflag.FeatureFlag
import app.k9mail.core.featureflag.FeatureFlagFactory
import app.k9mail.core.featureflag.FeatureFlagKey
class InMemoryFeatureFlagFactory : FeatureFlagFactory {
override fun createFeatureCatalog(): List<FeatureFlag> {
return listOf(
FeatureFlag(FeatureFlagKey("new_onboarding"), false),
)
}
}

1
app/ui/legacy/build.gradle.kts
View File

@ -11,6 +11,7 @@ dependencies {
implementation(projects.mail.common)
implementation(projects.uiUtils.toolbarBottomSheet)
implementation(projects.core.featureflags)
implementation(projects.feature.launcher)
// TODO: Remove AccountOauth dependency
implementation(projects.feature.account.oauth)

11
app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
View File

@ -28,6 +28,8 @@ import androidx.fragment.app.commit
import androidx.fragment.app.commitNow
import app.k9mail.core.android.common.contact.CachingRepository
import app.k9mail.core.android.common.contact.ContactRepository
import app.k9mail.core.featureflag.FeatureFlagKey
import app.k9mail.core.featureflag.FeatureFlagProvider
import app.k9mail.feature.launcher.FeatureLauncherActivity
import com.fsck.k9.Account
import com.fsck.k9.K9
@ -92,6 +94,7 @@ open class MessageList :
private val generalSettingsManager: GeneralSettingsManager by inject()
private val messagingController: MessagingController by inject()
private val contactRepository: ContactRepository by inject()
private val featureFlagProvider: FeatureFlagProvider by inject()
private val permissionUiHelper: PermissionUiHelper = K9PermissionUiHelper(this)
@ -154,10 +157,12 @@ open class MessageList :
deleteIncompleteAccounts(accounts)
val hasAccountSetup = accounts.any { it.isFinishedSetup }
if (!hasAccountSetup) {
val useNewOnboarding = false
if (useNewOnboarding) {
featureFlagProvider.provide(FeatureFlagKey("new_onboarding")).onEnabled {
FeatureLauncherActivity.launchOnboarding(this)
} else {
}.onDisabled {
OnboardingActivity.launch(this)
}.onUnavailable {
Timber.d("Feature flag 'new_onboarding' is unavailable, falling back to old onboarding")
OnboardingActivity.launch(this)
}
finish()