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

Create public versions for sync/sending notifications

Browse source 
When Android is configured to not show sensitive notification content, we no longer display account and folder names on the lock screen.
This commit is contained in:
cketti 2021-12-08 01:58:30 +01:00
parent 5d6f0fe8f5
commit 725c32ea0c
2 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
View file

@ -1,5 +1,6 @@
package com.fsck.k9.notification
import android.app.Notification
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import com.fsck.k9.Account
@ -32,7 +33,7 @@ internal class SyncNotificationController(
.setContentTitle(title)
.setContentText(accountName)
.setContentIntent(showMessageListPendingIntent)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setPublicVersion(createSendingLockScreenNotification(account))
if (NOTIFICATION_LED_WHILE_SYNCING) {
notificationHelper.configureNotification(
@ -77,7 +78,7 @@ internal class SyncNotificationController(
.setContentTitle(title)
.setContentText(text)
.setContentIntent(showMessageListPendingIntent)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setPublicVersion(createFetchingMailLockScreenNotification(account))
.setCategory(NotificationCompat.CATEGORY_SERVICE)
if (NOTIFICATION_LED_WHILE_SYNCING) {
@ -106,7 +107,7 @@ internal class SyncNotificationController(
.setOngoing(true)
.setContentTitle(title)
.setContentText(text)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setPublicVersion(createFetchingMailLockScreenNotification(account))
.setCategory(NotificationCompat.CATEGORY_SERVICE)
if (NOTIFICATION_LED_WHILE_SYNCING) {
@ -128,6 +129,24 @@ internal class SyncNotificationController(
notificationManager.cancel(notificationId)
}
private fun createSendingLockScreenNotification(account: Account): Notification {
return notificationHelper
.createNotificationBuilder(account, NotificationChannelManager.ChannelType.MISCELLANEOUS)
.setSmallIcon(resourceProvider.iconSendingMail)
.setWhen(System.currentTimeMillis())
.setContentTitle(resourceProvider.sendingMailTitle())
.build()
}
private fun createFetchingMailLockScreenNotification(account: Account): Notification {
return notificationHelper
.createNotificationBuilder(account, NotificationChannelManager.ChannelType.MISCELLANEOUS)
.setSmallIcon(resourceProvider.iconCheckingMail)
.setWhen(System.currentTimeMillis())
.setContentTitle(resourceProvider.checkingMailTitle())
.build()
}
private val notificationManager: NotificationManagerCompat
get() = notificationHelper.getNotificationManager()
}

25
app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt
View file

@ -18,6 +18,7 @@ import org.mockito.kotlin.any
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.never
private const val ACCOUNT_NUMBER = 1
private const val ACCOUNT_NAME = "TestAccount"
@ -27,12 +28,14 @@ private const val FOLDER_NAME = "Inbox"
class SyncNotificationControllerTest : RobolectricTest() {
private val resourceProvider: NotificationResourceProvider = TestNotificationResourceProvider()
private val notification = mock<Notification>()
private val lockScreenNotification = mock<Notification>()
private val notificationManager = mock<NotificationManagerCompat>()
private val builder = createFakeNotificationBuilder(notification)
private val lockScreenNotificationBuilder = createFakeNotificationBuilder(lockScreenNotification)
private val account = createFakeAccount()
private val contentIntent = mock<PendingIntent>()
private val controller = SyncNotificationController(
notificationHelper = createFakeNotificationHelper(notificationManager, builder),
notificationHelper = createFakeNotificationHelper(notificationManager, builder, lockScreenNotificationBuilder),
actionBuilder = createActionBuilder(contentIntent),
resourceProvider = resourceProvider
)
@ -49,7 +52,10 @@ class SyncNotificationControllerTest : RobolectricTest() {
verify(builder).setContentTitle("Sending mail")
verify(builder).setContentText(ACCOUNT_NAME)
verify(builder).setContentIntent(contentIntent)
verify(builder).setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
verify(builder).setPublicVersion(lockScreenNotification)
verify(lockScreenNotificationBuilder).setContentTitle("Sending mail")
verify(lockScreenNotificationBuilder, never()).setContentText(any())
verify(lockScreenNotificationBuilder, never()).setTicker(any())
}
@Test
@ -74,7 +80,10 @@ class SyncNotificationControllerTest : RobolectricTest() {
verify(builder).setContentTitle("Checking mail")
verify(builder).setContentText("$ACCOUNT_NAME:$FOLDER_NAME")
verify(builder).setContentIntent(contentIntent)
verify(builder).setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
verify(builder).setPublicVersion(lockScreenNotification)
verify(lockScreenNotificationBuilder).setContentTitle("Checking mail")
verify(lockScreenNotificationBuilder, never()).setContentText(any())
verify(lockScreenNotificationBuilder, never()).setTicker(any())
}
@Test
@ -87,7 +96,10 @@ class SyncNotificationControllerTest : RobolectricTest() {
verify(builder).setSmallIcon(resourceProvider.iconCheckingMail)
verify(builder).setContentTitle("Checking mail")
verify(builder).setContentText(ACCOUNT_NAME)
verify(builder).setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
verify(builder).setPublicVersion(lockScreenNotification)
verify(lockScreenNotificationBuilder).setContentTitle("Checking mail")
verify(lockScreenNotificationBuilder, never()).setContentText(any())
verify(lockScreenNotificationBuilder, never()).setTicker(any())
}
@Test
@ -107,12 +119,13 @@ class SyncNotificationControllerTest : RobolectricTest() {
private fun createFakeNotificationHelper(
notificationManager: NotificationManagerCompat,
builder: NotificationCompat.Builder
notificationBuilder: NotificationCompat.Builder,
lockScreenNotificationBuilder: NotificationCompat.Builder
): NotificationHelper {
return mock {
on { getContext() } doReturn ApplicationProvider.getApplicationContext()
on { getNotificationManager() } doReturn notificationManager
on { createNotificationBuilder(any(), any()) } doReturn builder
on { createNotificationBuilder(any(), any()) }.doReturn(notificationBuilder, lockScreenNotificationBuilder)
on { getAccountName(any()) } doReturn ACCOUNT_NAME
}
}