fix(notifications): respect dedicated notification avatar setting

Closes #10750.

Per @rafaeltonholo's review: MessageListPreferencesManager controls
avatars on the message list, not in notifications. A user may want
avatars in one place but not the other.

Adds a new isShowContactPictureInNotification field on
NotificationPreference, persists it via NotificationPreferenceManager,
and reads it from SingleMessageNotificationCreator.setAvatar(). Adds a
matching toggle in general settings.

Defaults to true to preserve current behavior. Pattern mirrors commit
8dfa32e.

Author: mvanhorn

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/notification/NotificationPreference.kt

@@ -12,6 +12,7 @@ val NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_ORDER = NotificationActionTo
 const val NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_CUTOFF = 3
 const val NOTIFICATION_PREFERENCE_MAX_MESSAGE_ACTIONS_SHOWN = 3
 const val NOTIFICATION_PREFERENCE_DEFAULT_IS_SUMMARY_DELETE_ACTION_ENABLED = true
+const val NOTIFICATION_PREFERENCE_DEFAULT_IS_SHOW_CONTACT_PICTURE_IN_NOTIFICATION = true
 val NOTIFICATION_PREFERENCE_DEFAULT_QUICK_DELETE_BEHAVIOUR = NotificationQuickDelete.ALWAYS
 val NOTIFICATION_PREFERENCE_DEFAULT_LOCK_SCREEN_NOTIFICATION_VISIBILITY = LockScreenNotificationVisibility.MESSAGE_COUNT
 
@@ -24,6 +25,8 @@ data class NotificationPreference(
     val messageActionsOrder: List<String> = NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_ORDER,
     val messageActionsCutoff: Int = NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_CUTOFF,
     val isSummaryDeleteActionEnabled: Boolean = NOTIFICATION_PREFERENCE_DEFAULT_IS_SUMMARY_DELETE_ACTION_ENABLED,
+    val isShowContactPictureInNotification: Boolean =
+        NOTIFICATION_PREFERENCE_DEFAULT_IS_SHOW_CONTACT_PICTURE_IN_NOTIFICATION,
     val notificationQuickDeleteBehaviour: NotificationQuickDelete =
         NOTIFICATION_PREFERENCE_DEFAULT_QUICK_DELETE_BEHAVIOUR,
     val lockScreenNotificationVisibility: LockScreenNotificationVisibility =

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/notification/NotificationPreferenceManager.kt

@@ -9,6 +9,7 @@ const val KEY_NOTIFICATION_DURING_QUIET_TIME_ENABLED = "notificationDuringQuietT
 const val KEY_MESSAGE_ACTIONS_ORDER = "messageActionsOrder"
 const val KEY_MESSAGE_ACTIONS_CUTOFF = "messageActionsCutoff"
 const val KEY_IS_SUMMARY_DELETE_ACTION_ENABLED = "isSummaryDeleteActionEnabled"
+const val KEY_SHOW_CONTACT_PICTURE_IN_NOTIFICATION = "showContactPictureInNotification"
 
 const val KEY_NOTIFICATION_QUICK_DELETE_BEHAVIOUR = "notificationQuickDelete"
 const val KEY_LOCK_SCREEN_NOTIFICATION_VISIBILITY = "lockScreenNotificationVisibility"

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/notification/DefaultNotificationPreferenceManager.kt

@@ -77,6 +77,10 @@ class DefaultNotificationPreferenceManager(
                 defValue = NOTIFICATION_PREFERENCE_DEFAULT_MESSAGE_ACTIONS_CUTOFF,
             ),
             isSummaryDeleteActionEnabled = isSummaryDeleteActionEnabled,
+            isShowContactPictureInNotification = storage.getBoolean(
+                key = KEY_SHOW_CONTACT_PICTURE_IN_NOTIFICATION,
+                defValue = NOTIFICATION_PREFERENCE_DEFAULT_IS_SHOW_CONTACT_PICTURE_IN_NOTIFICATION,
+            ),
             notificationQuickDeleteBehaviour = notificationQuickDeleteBehaviour,
             lockScreenNotificationVisibility = storage.getEnumOrDefault(
                 key = KEY_LOCK_SCREEN_NOTIFICATION_VISIBILITY,
@@ -125,6 +129,10 @@ class DefaultNotificationPreferenceManager(
                 )
                 storageEditor.putInt(KEY_MESSAGE_ACTIONS_CUTOFF, config.messageActionsCutoff)
                 storageEditor.putBoolean(KEY_IS_SUMMARY_DELETE_ACTION_ENABLED, config.isSummaryDeleteActionEnabled)
+                storageEditor.putBoolean(
+                    KEY_SHOW_CONTACT_PICTURE_IN_NOTIFICATION,
+                    config.isShowContactPictureInNotification,
+                )
                 storageEditor.putEnum(
                     KEY_NOTIFICATION_QUICK_DELETE_BEHAVIOUR,
                     config.notificationQuickDeleteBehaviour,

legacy/core/src/main/java/com/fsck/k9/notification/CoreNotificationKoinModule.kt

@@ -112,6 +112,7 @@ val coreNotificationModule = module {
             actionCreator = get(),
             resourceProvider = get(),
             lockScreenNotificationCreator = get(),
+            notificationPreferenceManager = get(),
             application = androidApplication(),
         )
     }

legacy/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt

@@ -10,13 +10,15 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import net.thunderbird.core.logging.legacy.Log
+import net.thunderbird.core.preference.notification.NotificationPreferenceManager
 import androidx.core.app.NotificationCompat.Builder as NotificationBuilder
 
 internal class SingleMessageNotificationCreator(
     private val notificationHelper: NotificationHelper,
     private val actionCreator: NotificationActionCreator,
     private val resourceProvider: NotificationResourceProvider,
     private val lockScreenNotificationCreator: LockScreenNotificationCreator,
+    private val notificationPreferenceManager: NotificationPreferenceManager,
     private val application: Application,
 ) {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
@@ -63,6 +65,8 @@ internal class SingleMessageNotificationCreator(
     }
 
     private suspend fun NotificationBuilder.setAvatar(content: NotificationContent) = apply {
+        if (!notificationPreferenceManager.getConfig().isShowContactPictureInNotification) return@apply
+
         resourceProvider.avatar(content.sender)?.let {
             setLargeIcon(IconCompat.createWithAdaptiveBitmap(it).toIcon(application))
         }

legacy/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationCreatorTest.kt

@@ -0,0 +1,155 @@
+package com.fsck.k9.notification
+
+import android.app.Application
+import android.app.Notification
+import android.app.PendingIntent
+import android.graphics.Bitmap
+import androidx.core.app.NotificationCompat
+import androidx.test.core.app.ApplicationProvider
+import app.k9mail.legacy.message.controller.MessageReference
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import com.fsck.k9.mail.Address
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.runTest
+import net.thunderbird.core.android.account.LegacyAccountDto
+import net.thunderbird.core.android.testing.MockHelper.mockBuilder
+import net.thunderbird.core.android.testing.RobolectricTest
+import net.thunderbird.core.preference.notification.NotificationPreference
+import net.thunderbird.core.preference.notification.NotificationPreferenceManager
+import net.thunderbird.core.testing.coroutines.MainDispatcherHelper
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+
+class SingleMessageNotificationCreatorTest : RobolectricTest() {
+    private val mainDispatcher = MainDispatcherHelper(UnconfinedTestDispatcher())
+    private val notificationPreferenceManager = FakeNotificationPreferenceManager()
+    private val resourceProvider = TestAvatarNotificationResourceProvider()
+    private val notification = mock<Notification>()
+    private val builder = mockBuilder<NotificationCompat.Builder> {
+        on { build() } doReturn notification
+    }
+
+    private lateinit var testSubject: SingleMessageNotificationCreator
+
+    @Before
+    fun setUp() {
+        mainDispatcher.setUp()
+        testSubject = SingleMessageNotificationCreator(
+            notificationHelper = createNotificationHelper(),
+            actionCreator = createNotificationActionCreator(),
+            resourceProvider = resourceProvider,
+            lockScreenNotificationCreator = mock(),
+            notificationPreferenceManager = notificationPreferenceManager,
+            application = ApplicationProvider.getApplicationContext<Application>(),
+        )
+    }
+
+    @After
+    fun tearDown() {
+        mainDispatcher.tearDown()
+    }
+
+    @Test
+    fun `create notification looks up avatar when notification contact pictures are enabled`() = runTest {
+        notificationPreferenceManager.setShowContactPictureInNotification(true)
+
+        testSubject.createSingleNotification(
+            baseNotificationData = createBaseNotificationData(),
+            singleNotificationData = createSingleNotificationData(),
+        ).join()
+
+        assertThat(resourceProvider.avatarCalls).isEqualTo(1)
+    }
+
+    @Test
+    fun `create notification skips avatar lookup when notification contact pictures are disabled`() = runTest {
+        notificationPreferenceManager.setShowContactPictureInNotification(false)
+
+        testSubject.createSingleNotification(
+            baseNotificationData = createBaseNotificationData(),
+            singleNotificationData = createSingleNotificationData(),
+        ).join()
+
+        assertThat(resourceProvider.avatarCalls).isEqualTo(0)
+    }
+
+    private fun createNotificationHelper(): NotificationHelper {
+        return mock {
+            on { createNotificationBuilder(any(), any()) } doReturn builder
+        }
+    }
+
+    private fun createNotificationActionCreator(): NotificationActionCreator {
+        val pendingIntent = mock<PendingIntent>()
+        return mock {
+            on { createViewMessagePendingIntent(any()) } doReturn pendingIntent
+            on { createDismissMessagePendingIntent(any()) } doReturn pendingIntent
+        }
+    }
+
+    private fun createBaseNotificationData(): BaseNotificationData {
+        return BaseNotificationData(
+            account = LegacyAccountDto("00000000-0000-0000-0000-000000000000"),
+            accountName = "Account name",
+            groupKey = "group",
+            color = 0,
+            newMessagesCount = 1,
+            lockScreenNotificationData = LockScreenNotificationData.None,
+            appearance = NotificationAppearance(
+                ringtone = null,
+                vibrationPattern = null,
+                ledColor = null,
+            ),
+        )
+    }
+
+    private fun createSingleNotificationData(): SingleNotificationData {
+        return SingleNotificationData(
+            notificationId = 23,
+            isSilent = true,
+            timestamp = 9000,
+            content = NotificationContent(
+                messageReference = MessageReference("account", 1, "uid"),
+                sender = Address("alice@example.com", "Alice"),
+                subject = "Subject",
+                preview = "Preview",
+                summary = "Summary",
+            ),
+            actions = emptyList(),
+            wearActions = emptyList(),
+            addLockScreenNotification = false,
+        )
+    }
+
+    private class TestAvatarNotificationResourceProvider :
+        NotificationResourceProvider by TestNotificationResourceProvider() {
+        var avatarCalls = 0
+
+        override suspend fun avatar(address: Address): Bitmap? {
+            avatarCalls += 1
+            return Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
+        }
+    }
+
+    private class FakeNotificationPreferenceManager : NotificationPreferenceManager {
+        private val prefs = MutableStateFlow(NotificationPreference())
+
+        override fun save(config: NotificationPreference) = Unit
+
+        override fun getConfig(): NotificationPreference = prefs.value
+
+        override fun getConfigFlow(): Flow<NotificationPreference> = prefs
+
+        fun setShowContactPictureInNotification(isEnabled: Boolean) {
+            prefs.update { it.copy(isShowContactPictureInNotification = isEnabled) }
+        }
+    }
+}

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

@@ -61,6 +61,7 @@ class GeneralSettingsDataStore(
             "quiet_time_enabled" -> notificationSettings.isQuietTimeEnabled
             "disable_notifications_during_quiet_time" -> !notificationSettings.isNotificationDuringQuietTimeEnabled
             "notification_summary_delete" -> notificationSettings.isSummaryDeleteActionEnabled
+            "notification_show_contact_picture" -> notificationSettings.isShowContactPictureInNotification
             "privacy_hide_useragent" -> privacySettings.isHideUserAgent
             "privacy_hide_timezone" -> privacySettings.isHideTimeZone
             "debug_logging" -> debuggingSettings.isDebugLoggingEnabled
@@ -103,6 +104,10 @@ class GeneralSettingsDataStore(
             "quiet_time_enabled" -> setIsQuietTimeEnabled(isQuietTimeEnabled = value)
             "disable_notifications_during_quiet_time" -> setIsNotificationDuringQuietTimeEnabled(!value)
             "notification_summary_delete" -> setIsSummaryDeleteActionEnabled(isSummaryDeleteActionEnabled = value)
+            "notification_show_contact_picture" -> setIsShowContactPictureInNotification(
+                isShowContactPictureInNotification = value,
+            )
+
             "privacy_hide_useragent" -> setIsHideUserAgent(isHideUserAgent = value)
             "privacy_hide_timezone" -> setIsHideTimeZone(isHideTimeZone = value)
             "debug_logging" -> setIsDebugLoggingEnabled(isDebugLoggingEnabled = value)
@@ -670,6 +675,17 @@ class GeneralSettingsDataStore(
         }
     }
 
+    private fun setIsShowContactPictureInNotification(isShowContactPictureInNotification: Boolean) {
+        skipSaveSettings = true
+        generalSettingsManager.update { settings ->
+            settings.copy(
+                notification = settings.notification.copy(
+                    isShowContactPictureInNotification = isShowContactPictureInNotification,
+                ),
+            )
+        }
+    }
+
     private fun setIsHideTimeZone(isHideTimeZone: Boolean) {
         skipSaveSettings = true
         generalSettingsManager.update { settings ->

legacy/ui/legacy/src/main/res/values/strings.xml

@@ -145,6 +145,8 @@
     <string name="notification_actions_settings_summary">Choose which actions appear in email notifications</string>
     <string name="notification_summary_delete_title">Show Delete on multi-message notifications</string>
     <string name="notification_summary_delete_summary">Adds a Delete action to notifications that summarize multiple new messages</string>
+    <string name="notification_show_contact_picture_title">Show contact pictures in notifications</string>
+    <string name="notification_show_contact_picture_summary">Display sender avatars in new message notifications</string>
     <string name="notification_actions_settings_description">Reorder notification actions.</string>
     <string name="notification_actions_cutoff_description">Shown actions cutoff</string>
     <string name="notification_actions_cutoff_state">Actions above this line are shown in the notification</string>

legacy/ui/legacy/src/main/res/xml/general_settings.xml

@@ -505,6 +505,12 @@
             android:summary="@string/notification_summary_delete_summary"
             />
 
+        <SwitchPreferenceCompat
+            android:key="notification_show_contact_picture"
+            android:title="@string/notification_show_contact_picture_title"
+            android:summary="@string/notification_show_contact_picture_summary"
+            />
+
     </PreferenceScreen>
 
     <PreferenceScreen