Skip to content

fix(notifications): respect showContactPicture setting for notification avatars #10786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvanhorn wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −0
Open

fix(notifications): respect showContactPicture setting for notification avatars #10786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions legacy/core/src/main/java/com/fsck/k9/notification/CoreNotificationKoinModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ val coreNotificationModule = module {
actionCreator = get(),
resourceProvider = get(),
lockScreenNotificationCreator = get(),
messageListPreferencesManager = get(),
application = androidApplication(),
)
}
Expand Down
4 changes: 4 additions & 0 deletions legacy/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.display.visualSettings.message.list.MessageListPreferencesManager
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 messageListPreferencesManager: MessageListPreferencesManager,
private val application: Application,
) {
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
Expand Down Expand Up @@ -63,6 +65,8 @@ internal class SingleMessageNotificationCreator(
}

private suspend fun NotificationBuilder.setAvatar(content: NotificationContent) = apply {
if (!messageListPreferencesManager.getConfig().isShowContactPicture) return@apply

resourceProvider.avatar(content.sender)?.let {
setLargeIcon(IconCompat.createWithAdaptiveBitmap(it).toIcon(application))
}
Expand Down
Loading