feat(notifications): navigate to edit sever settings when action is UpdateIncomingServerSettings or UpdateOutgoingServerSettings

rafaeltonholo · rafaeltonholo · commit a86115b8512c · 2025-09-16T08:28:40.000-03:00
diff --git a/feature/debug-settings/src/main/kotlin/net/thunderbird/feature/debug/settings/notification/DebugNotificationSectionViewModel.kt b/feature/debug-settings/src/main/kotlin/net/thunderbird/feature/debug/settings/notification/DebugNotificationSectionViewModel.kt
@@ -204,12 +204,14 @@ internal class DebugNotificationSectionViewModel(
             isIncomingServerError = true,
             accountUuid = selectedAccount.uuid,
             accountDisplayName = accountDisplay,
+            accountNumber = 0,
         )
 
         CertificateErrorNotification::class -> CertificateErrorNotification(
             isIncomingServerError = true,
             accountUuid = selectedAccount.uuid,
             accountDisplayName = accountDisplay,
+            accountNumber = 0,
         )
 
         FailedToCreateNotification::class -> FailedToCreateNotification(
@@ -218,6 +220,7 @@ internal class DebugNotificationSectionViewModel(
                 isIncomingServerError = true,
                 accountUuid = selectedAccount.uuid,
                 accountDisplayName = accountDisplay,
+                accountNumber = 0,
             ),
         )
 
diff --git a/feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/AuthenticationErrorNotification.kt b/feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/AuthenticationErrorNotification.kt
@@ -21,19 +21,22 @@ import org.jetbrains.compose.resources.getString
 data class AuthenticationErrorNotification private constructor(
     val isIncomingServerError: Boolean,
     override val accountUuid: String,
+    val accountNumber: Int,
     override val title: String,
     override val contentText: String?,
     override val channel: NotificationChannel,
     override val icon: NotificationIcon = NotificationIcons.AuthenticationError,
 ) : AppNotification(), SystemNotification, InAppNotification {
     override val severity: NotificationSeverity = NotificationSeverity.Fatal
-    override val actions: Set<NotificationAction> = setOf(
-        if (isIncomingServerError) {
-            NotificationAction.UpdateIncomingServerSettings(accountUuid)
+    override val actions: Set<NotificationAction> = buildSet {
+        val action = if (isIncomingServerError) {
+            NotificationAction.UpdateIncomingServerSettings(accountUuid, accountNumber)
         } else {
-            NotificationAction.UpdateOutgoingServerSettings(accountUuid)
-        },
-    )
+            NotificationAction.UpdateOutgoingServerSettings(accountUuid, accountNumber)
+        }
+        add(action)
+        add(NotificationAction.Tap(override = action))
+    }
     override val inAppNotificationStyle = inAppNotificationStyle { bannerInline() }
 
     override fun asLockscreenNotification(): SystemNotification.LockscreenNotification =
@@ -52,10 +55,12 @@ data class AuthenticationErrorNotification private constructor(
         suspend operator fun invoke(
             accountUuid: String,
             accountDisplayName: String,
+            accountNumber: Int,
             isIncomingServerError: Boolean,
         ): AuthenticationErrorNotification = AuthenticationErrorNotification(
             isIncomingServerError = isIncomingServerError,
             accountUuid = accountUuid,
+            accountNumber = accountNumber,
             title = getString(resource = Res.string.notification_authentication_error_title),
             contentText = getString(
                 resource = Res.string.notification_authentication_error_text,
diff --git a/feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/CertificateErrorNotification.kt b/feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/content/CertificateErrorNotification.kt
@@ -22,6 +22,7 @@ import org.jetbrains.compose.resources.getString
 data class CertificateErrorNotification private constructor(
     val isIncomingServerError: Boolean,
     override val accountUuid: String,
+    val accountNumber: Int,
     override val title: String,
     override val contentText: String,
     val lockScreenTitle: String,
@@ -31,9 +32,9 @@ data class CertificateErrorNotification private constructor(
     override val severity: NotificationSeverity = NotificationSeverity.Fatal
     override val actions: Set<NotificationAction> = setOf(
         if (isIncomingServerError) {
-            NotificationAction.UpdateIncomingServerSettings(accountUuid)
+            NotificationAction.UpdateIncomingServerSettings(accountUuid, accountNumber)
         } else {
-            NotificationAction.UpdateOutgoingServerSettings(accountUuid)
+            NotificationAction.UpdateOutgoingServerSettings(accountUuid, accountNumber)
         },
     )
 
@@ -53,10 +54,12 @@ data class CertificateErrorNotification private constructor(
         suspend operator fun invoke(
             accountUuid: String,
             accountDisplayName: String,
+            accountNumber: Int,
             isIncomingServerError: Boolean,
         ): CertificateErrorNotification = CertificateErrorNotification(
             isIncomingServerError = isIncomingServerError,
             accountUuid = accountUuid,
+            accountNumber = accountNumber,
             title = getString(resource = Res.string.notification_certificate_error_title, accountDisplayName),
             lockScreenTitle = getString(resource = Res.string.notification_certificate_error_public),
             contentText = getString(resource = Res.string.notification_certificate_error_text),
diff --git a/feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/ui/action/NotificationAction.kt b/feature/notification/api/src/commonMain/kotlin/net/thunderbird/feature/notification/api/ui/action/NotificationAction.kt
@@ -95,15 +95,15 @@ sealed class NotificationAction {
     /**
      * Action to prompt the user to update server settings, typically when authentication fails.
      */
-    data class UpdateIncomingServerSettings(val accountUuid: String) : NotificationAction() {
+    data class UpdateIncomingServerSettings(val accountUuid: String, val accountNumber: Int) : NotificationAction() {
         override val icon: NotificationIcon = NotificationActionIcons.UpdateServerSettings
         override val titleResource: StringResource = Res.string.notification_action_update_server_settings
     }
 
     /**
      * Action to prompt the user to update server settings, typically when authentication fails.
      */
-    data class UpdateOutgoingServerSettings(val accountUuid: String) : NotificationAction() {
+    data class UpdateOutgoingServerSettings(val accountUuid: String, val accountNumber: Int) : NotificationAction() {
         override val icon: NotificationIcon = NotificationActionIcons.UpdateServerSettings
         override val titleResource: StringResource = Res.string.notification_action_update_server_settings
     }
diff --git a/feature/notification/impl/build.gradle.kts b/feature/notification/impl/build.gradle.kts
@@ -16,6 +16,10 @@ kotlin {
             implementation(projects.core.logging.testing)
             implementation(projects.feature.notification.testing)
         }
+        androidMain.dependencies {
+            // should split feature.launcher into api/impl?
+            implementation(projects.feature.launcher)
+        }
         androidUnitTest.dependencies {
             implementation(libs.androidx.test.core)
             implementation(libs.mockito.core)
diff --git a/feature/notification/impl/src/androidMain/kotlin/net/thunderbird/feature/notification/impl/inject/NotificationModule.android.kt b/feature/notification/impl/src/androidMain/kotlin/net/thunderbird/feature/notification/impl/inject/NotificationModule.android.kt
@@ -5,6 +5,7 @@ import net.thunderbird.feature.notification.api.receiver.NotificationNotifier
 import net.thunderbird.feature.notification.impl.intent.action.AlarmPermissionMissingNotificationTapActionIntentCreator
 import net.thunderbird.feature.notification.impl.intent.action.DefaultNotificationActionIntentCreator
 import net.thunderbird.feature.notification.impl.intent.action.NotificationActionIntentCreator
+import net.thunderbird.feature.notification.impl.intent.action.UpdateServerSettingsNotificationActionIntentCreator
 import net.thunderbird.feature.notification.impl.receiver.AndroidSystemNotificationNotifier
 import net.thunderbird.feature.notification.impl.receiver.SystemNotificationNotifier
 import net.thunderbird.feature.notification.impl.ui.action.DefaultSystemNotificationActionCreator
@@ -22,6 +23,10 @@ internal actual val platformFeatureNotificationModule: Module = module {
                 context = androidApplication(),
                 logger = get(),
             ),
+            UpdateServerSettingsNotificationActionIntentCreator(
+                context = androidApplication(),
+                logger = get(),
+            ),
             // The Default implementation must always be the last.
             DefaultNotificationActionIntentCreator(
                 logger = get(),
diff --git a/feature/notification/impl/src/androidMain/kotlin/net/thunderbird/feature/notification/impl/intent/action/UpdateServerSettingsNotificationActionIntentCreator.kt b/feature/notification/impl/src/androidMain/kotlin/net/thunderbird/feature/notification/impl/intent/action/UpdateServerSettingsNotificationActionIntentCreator.kt
@@ -0,0 +1,58 @@
+package net.thunderbird.feature.notification.impl.intent.action
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.PendingIntentCompat
+import app.k9mail.feature.launcher.FeatureLauncherActivity
+import app.k9mail.feature.launcher.FeatureLauncherTarget
+import net.thunderbird.core.logging.Logger
+import net.thunderbird.feature.notification.api.content.AuthenticationErrorNotification
+import net.thunderbird.feature.notification.api.content.Notification
+import net.thunderbird.feature.notification.api.ui.action.NotificationAction
+
+private const val TAG = "UpdateServerSettingsNotificationActionIntentCreator"
+
+class UpdateServerSettingsNotificationActionIntentCreator(
+    private val context: Context,
+    private val logger: Logger,
+) : NotificationActionIntentCreator<AuthenticationErrorNotification, NotificationAction> {
+    override fun accept(notification: Notification, action: NotificationAction): Boolean =
+        notification is AuthenticationErrorNotification &&
+            (
+                action is NotificationAction.UpdateIncomingServerSettings ||
+                    action is NotificationAction.UpdateOutgoingServerSettings
+                )
+
+    override fun create(
+        notification: AuthenticationErrorNotification,
+        action: NotificationAction,
+    ): PendingIntent? {
+        logger.debug(TAG) { "create() called with: notification = $notification, action = $action" }
+        val (accountNumber, intent) = when (action) {
+            is NotificationAction.UpdateIncomingServerSettings -> {
+                action.accountNumber to FeatureLauncherActivity.getIntent(
+                    context = context,
+                    target = FeatureLauncherTarget.AccountEditIncomingSettings(action.accountUuid),
+                )
+            }
+
+            is NotificationAction.UpdateOutgoingServerSettings -> {
+                action.accountNumber to FeatureLauncherActivity.getIntent(
+                    context = context,
+                    target = FeatureLauncherTarget.AccountEditOutgoingSettings(action.accountUuid),
+                )
+            }
+
+            else -> error("Unsupported action: $action")
+        }
+
+        return PendingIntentCompat.getActivity(
+            context,
+            accountNumber,
+            intent,
+            FLAG_UPDATE_CURRENT,
+            false,
+        )
+    }
+}
diff --git a/feature/notification/impl/src/androidUnitTest/kotlin/net/thunderbird/feature/notification/impl/intent/action/DefaultNotificationActionIntentCreatorTest.kt b/feature/notification/impl/src/androidUnitTest/kotlin/net/thunderbird/feature/notification/impl/intent/action/DefaultNotificationActionIntentCreatorTest.kt
@@ -40,7 +40,8 @@ class DefaultNotificationActionIntentCreatorTest {
             NotificationAction.Delete,
             NotificationAction.MarkAsSpam,
             NotificationAction.Archive,
-            NotificationAction.UpdateServerSettings,
+            NotificationAction.UpdateIncomingServerSettings("uuid", 1),
+            NotificationAction.UpdateOutgoingServerSettings("uuid", 1),
             NotificationAction.Retry,
             NotificationAction.CustomAction(title = "Custom Action 1"),
             NotificationAction.CustomAction(title = "Custom Action 2"),
diff --git a/legacy/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/legacy/core/src/main/java/com/fsck/k9/controller/MessagingController.java
@@ -710,6 +710,7 @@ public void handleAuthenticationFailure(LegacyAccountDto account, boolean incomi
                     AuthenticationErrorNotification.Companion.invoke(
                         account.getUuid(),
                         account.getDisplayName(),
+                        account.getAccountNumber(),
                         incoming,
                         continuation
                     )

Original file line number	Diff line number	Diff line change
`@@ -204,12 +204,14 @@ internal class DebugNotificationSectionViewModel(`
`204`	`204`	`isIncomingServerError = true,`
`205`	`205`	`accountUuid = selectedAccount.uuid,`
`206`	`206`	`accountDisplayName = accountDisplay,`
	`207`	`+ accountNumber = 0,`
`207`	`208`	`)`
`208`	`209`
`209`	`210`	`CertificateErrorNotification::class -> CertificateErrorNotification(`
`210`	`211`	`isIncomingServerError = true,`
`211`	`212`	`accountUuid = selectedAccount.uuid,`
`212`	`213`	`accountDisplayName = accountDisplay,`
	`214`	`+ accountNumber = 0,`
`213`	`215`	`)`
`214`	`216`
`215`	`217`	`FailedToCreateNotification::class -> FailedToCreateNotification(`
`@@ -218,6 +220,7 @@ internal class DebugNotificationSectionViewModel(`
`218`	`220`	`isIncomingServerError = true,`
`219`	`221`	`accountUuid = selectedAccount.uuid,`
`220`	`222`	`accountDisplayName = accountDisplay,`
	`223`	`+ accountNumber = 0,`
`221`	`224`	`),`
`222`	`225`	`)`
`223`	`226`
Original file line number	Diff line number	Diff line change
`@@ -710,6 +710,7 @@ public void handleAuthenticationFailure(LegacyAccountDto account, boolean incomi`
`710`	`710`	`AuthenticationErrorNotification.Companion.invoke(`
`711`	`711`	`account.getUuid(),`
`712`	`712`	`account.getDisplayName(),`
	`713`	`+ account.getAccountNumber(),`
`713`	`714`	`incoming,`
`714`	`715`	`continuation`
`715`	`716`	`)`