wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5936 from k9mail/notification_channel

Browse source 
Use account settings when creating the NotificationChannel for messages
This commit is contained in:
cketti 2022-03-01 17:41:34 +01:00 committed by GitHub
commit 64e46e275b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt
View file

@ -116,16 +116,15 @@ class NotificationChannelManager(
@RequiresApi(api = Build.VERSION_CODES.O)
private fun getChannelMessages(account: Account): NotificationChannel {
val channelName = resourceProvider.messagesChannelName
val channelDescription = resourceProvider.messagesChannelDescription
val channelId = getChannelIdFor(account, ChannelType.MESSAGES)
val importance = NotificationManager.IMPORTANCE_DEFAULT
val channelGroupId = account.uuid
val messagesChannel = NotificationChannel(channelId, channelName, importance)
messagesChannel.description = channelDescription
messagesChannel.group = channelGroupId
return NotificationChannel(channelId, channelName, importance).apply {
description = resourceProvider.messagesChannelDescription
group = account.uuid
return messagesChannel
setPropertiesFrom(account)
}
}
@RequiresApi(api = Build.VERSION_CODES.O)
@ -189,7 +188,7 @@ class NotificationChannelManager(
group = account.uuid
copyPropertiesFrom(oldNotificationChannel)
copyPropertiesFrom(account)
setPropertiesFrom(account)
}
Timber.v("Recreating NotificationChannel(%s => %s)", oldChannelId, newChannelId)
@ -226,7 +225,7 @@ class NotificationChannelManager(
}
@RequiresApi(Build.VERSION_CODES.O)
private fun NotificationChannel.copyPropertiesFrom(account: Account) {
private fun NotificationChannel.setPropertiesFrom(account: Account) {
val notificationSettings = account.notificationSettings
if (notificationSettings.isRingEnabled) {