Change email notifications Default value to On behind feature flag

shamim-emon · shamim-emon · commit adbf298e648b · 2025-03-26T15:57:30.000+06:00
diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts
@@ -11,5 +11,7 @@ dependencies {
 
     implementation(projects.legacy.account)
 
+    implementation(projects.core.featureflags)
+
     implementation(projects.feature.migration.provider)
 }
diff --git a/app-common/src/main/kotlin/net/thunderbird/app/common/AppCommonModule.kt b/app-common/src/main/kotlin/net/thunderbird/app/common/AppCommonModule.kt
@@ -1,8 +1,10 @@
 package net.thunderbird.app.common
 
+import app.k9mail.legacy.account.AccountDefaultsProvider
+import net.thunderbird.app.common.account.CommonAccountDefaultsProvider
 import org.koin.core.module.Module
 import org.koin.dsl.module
 
 val appCommonModule: Module = module {
-    // add common dependencies here
+    single<AccountDefaultsProvider> { CommonAccountDefaultsProvider(featureFlagProvider = get()) }
 }
diff --git a/app-common/src/main/kotlin/net/thunderbird/app/common/account/CommonAccountDefaultsProvider.kt b/app-common/src/main/kotlin/net/thunderbird/app/common/account/CommonAccountDefaultsProvider.kt
@@ -0,0 +1,27 @@
+package net.thunderbird.app.common.account
+
+import app.k9mail.core.featureflag.FeatureFlagProvider
+import app.k9mail.core.featureflag.toFeatureFlagKey
+import app.k9mail.legacy.account.Account
+import app.k9mail.legacy.account.AccountDefaultsProvider
+
+class CommonAccountDefaultsProvider(
+    private val featureFlagProvider: FeatureFlagProvider,
+) : AccountDefaultsProvider {
+
+    override fun applyDefaults(account: Account) {
+        account.isNotifyNewMail = featureFlagProvider.provide(
+            "email_notification_default".toFeatureFlagKey(),
+        ).whenEnabledOrNot(
+            onEnabled = { true },
+            onDisabledOrUnavailable = { false },
+        )
+
+        account.isNotifySelfNewMail = featureFlagProvider.provide(
+            "email_notification_default".toFeatureFlagKey(),
+        ).whenEnabledOrNot(
+            onEnabled = { true },
+            onDisabledOrUnavailable = { false },
+        )
+    }
+}
diff --git a/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt b/app-k9mail/src/debug/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt
@@ -10,6 +10,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true),
             FeatureFlag("new_account_settings".toFeatureFlagKey(), enabled = true),
             FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true),
+            FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true),
         )
     }
 }
diff --git a/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt b/app-k9mail/src/release/kotlin/app/k9mail/featureflag/K9FeatureFlagFactory.kt
@@ -10,6 +10,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = false),
             FeatureFlag("new_account_settings".toFeatureFlagKey(), enabled = false),
             FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = false),
+            FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = false),
         )
     }
 }
diff --git a/app-thunderbird/src/beta/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/beta/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
@@ -13,6 +13,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true),
             FeatureFlag("new_account_settings".toFeatureFlagKey(), enabled = false),
             FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true),
+            FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true),
         )
     }
 }
diff --git a/app-thunderbird/src/daily/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/daily/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
@@ -13,6 +13,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true),
             FeatureFlag("new_account_settings".toFeatureFlagKey(), enabled = false),
             FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true),
+            FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true),
         )
     }
 }
diff --git a/app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/debug/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
@@ -13,6 +13,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true),
             FeatureFlag("new_account_settings".toFeatureFlagKey(), enabled = true),
             FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true),
+            FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true),
         )
     }
 }
diff --git a/app-thunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt b/app-thunderbird/src/release/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt
@@ -13,6 +13,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
             FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = false),
             FeatureFlag("new_account_settings".toFeatureFlagKey(), enabled = false),
             FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = false),
+            FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = false),
         )
     }
 }
diff --git a/feature/navigation/drawer/build.gradle.kts b/feature/navigation/drawer/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     implementation(projects.legacy.message)
     implementation(projects.legacy.search)
     implementation(projects.legacy.ui.folder)
+    implementation(projects.core.featureflags)
 
     testImplementation(projects.core.ui.compose.testing)
 }
diff --git a/legacy/account/src/main/java/app/k9mail/legacy/account/AccountDefaultsProvider.kt b/legacy/account/src/main/java/app/k9mail/legacy/account/AccountDefaultsProvider.kt
@@ -0,0 +1,5 @@
+package app.k9mail.legacy.account
+
+fun interface AccountDefaultsProvider {
+    fun applyDefaults(account: Account)
+}
diff --git a/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt b/legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
@@ -53,7 +53,6 @@ class AccountPreferenceSerializer(
                 displayCount = K9.DEFAULT_VISIBLE_LIMIT
             }
             isNotifyNewMail = storage.getBoolean("$accountUuid.notifyNewMail", false)
-
             folderNotifyNewMailMode = getEnumStringPref<FolderMode>(
                 storage,
                 "$accountUuid.folderNotifyNewMailMode",
diff --git a/legacy/core/src/main/java/com/fsck/k9/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/KoinModule.kt
@@ -21,6 +21,7 @@ val mainModule = module {
             storagePersister = get(),
             localStoreProvider = get(),
             accountPreferenceSerializer = get(),
+            accountDefaultsProvider = get(),
         )
     }
     single { get<Context>().resources }
diff --git a/legacy/core/src/main/java/com/fsck/k9/Preferences.kt b/legacy/core/src/main/java/com/fsck/k9/Preferences.kt
@@ -3,6 +3,7 @@ package com.fsck.k9
 import androidx.annotation.GuardedBy
 import androidx.annotation.RestrictTo
 import app.k9mail.legacy.account.Account
+import app.k9mail.legacy.account.AccountDefaultsProvider
 import app.k9mail.legacy.account.AccountManager
 import app.k9mail.legacy.account.AccountRemovedListener
 import app.k9mail.legacy.account.AccountsChangeListener
@@ -27,11 +28,13 @@ import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.flowOn
 import timber.log.Timber
 
+@Suppress("MaxLineLength")
 class Preferences internal constructor(
     private val storagePersister: StoragePersister,
     private val localStoreProvider: LocalStoreProvider,
     private val accountPreferenceSerializer: AccountPreferenceSerializer,
     private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
+    private val accountDefaultsProvider: AccountDefaultsProvider,
 ) : AccountManager {
     private val accountLock = Any()
     private val storageLock = Any()
@@ -87,6 +90,7 @@ class Preferences internal constructor(
 
                     accounts[uuid] = account
                     accountsInOrder.add(account)
+                    accountDefaultsProvider.applyDefaults(account)
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,7 @@ dependencies {`
`11`	`11`
`12`	`12`	`implementation(projects.legacy.account)`
`13`	`13`
	`14`	`+ implementation(projects.core.featureflags)`
	`15`	`+`
`14`	`16`	`implementation(projects.feature.migration.provider)`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ class K9FeatureFlagFactory : FeatureFlagFactory {`
`10`	`10`	`FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true),`
`11`	`11`	`FeatureFlag("new_account_settings".toFeatureFlagKey(), enabled = true),`
`12`	`12`	`FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true),`
	`13`	`+ FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true),`
`13`	`14`	`)`
`14`	`15`	`}`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {`
`13`	`13`	`FeatureFlag("archive_marks_as_read".toFeatureFlagKey(), enabled = true),`
`14`	`14`	`FeatureFlag("new_account_settings".toFeatureFlagKey(), enabled = false),`
`15`	`15`	`FeatureFlag("disable_font_size_config".toFeatureFlagKey(), enabled = true),`
	`16`	`+ FeatureFlag("email_notification_default".toFeatureFlagKey(), enabled = true),`
`16`	`17`	`)`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ dependencies {`
`20`	`20`	`implementation(projects.legacy.message)`
`21`	`21`	`implementation(projects.legacy.search)`
`22`	`22`	`implementation(projects.legacy.ui.folder)`
	`23`	`+ implementation(projects.core.featureflags)`
`23`	`24`
`24`	`25`	`testImplementation(projects.core.ui.compose.testing)`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ class AccountPreferenceSerializer(`
`53`	`53`	`displayCount = K9.DEFAULT_VISIBLE_LIMIT`
`54`	`54`	`}`
`55`	`55`	`isNotifyNewMail = storage.getBoolean("$accountUuid.notifyNewMail", false)`
`56`		`-`
`57`	`56`	`folderNotifyNewMailMode = getEnumStringPref<FolderMode>(`
`58`	`57`	`storage,`
`59`	`58`	`"$accountUuid.folderNotifyNewMailMode",`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ val mainModule = module {`
`21`	`21`	`storagePersister = get(),`
`22`	`22`	`localStoreProvider = get(),`
`23`	`23`	`accountPreferenceSerializer = get(),`
	`24`	`+ accountDefaultsProvider = get(),`
`24`	`25`	`)`
`25`	`26`	`}`
`26`	`27`	`single { get<Context>().resources }`