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

Merge pull request #5812 from k9mail/fix_vibrate_on_notification

Browse source 
Only set vibration pattern if vibration is enabled
This commit is contained in:
cketti 2021-12-07 20:23:40 +01:00 committed by GitHub
commit f042e2babd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt
View file

@ -46,7 +46,8 @@ internal class BaseNotificationDataCreator {
private fun createNotificationAppearance(account: Account): NotificationAppearance {
return with(account.notificationSetting) {
NotificationAppearance(ringtone = ringtone, vibrationPattern = vibration, ledColor = ledColor)
val vibrationPattern = if (isVibrateEnabled) vibration else null
NotificationAppearance(ringtone, vibrationPattern, ledColor)
}
}
}

2
app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt
View file

@ -148,6 +148,7 @@ class BaseNotificationDataCreatorTest {
@Test
fun `vibration pattern`() {
account.notificationSetting.isVibrateEnabled = true
account.notificationSetting.vibratePattern = 3
account.notificationSetting.vibrateTimes = 2
val notificationData = createNotificationData()
@ -192,7 +193,6 @@ class BaseNotificationDataCreatorTest {
return Account("00000000-0000-4000-0000-000000000000").apply {
description = "account name"
identities = listOf(Identity())
notificationSetting.vibrateTimes = 1
}
}
}

1
app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt
View file

@ -338,7 +338,6 @@ class NewMailNotificationManagerTest {
return Account(ACCOUNT_UUID).apply {
description = ACCOUNT_NAME
chipColor = ACCOUNT_COLOR
notificationSetting.vibrateTimes = 1
}
}