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

Rename SendFailedNotifications to SendFailedNotificationController

Browse source
This commit is contained in:
cketti 2021-10-14 17:22:51 +02:00
parent 05a75b898e
commit f48ff91af8
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
View file

@ -29,7 +29,7 @@ val coreNotificationModule = module {
single { CertificateErrorNotificationController(get(), get(), get()) }
single { AuthenticationErrorNotificationController(get(), get(), get()) }
single { SyncNotifications(get(), get(), get()) }
single { SendFailedNotifications(get(), get(), get()) }
single { SendFailedNotificationController(get(), get(), get()) }
single { NewMailNotifications(get(), get(), get(), get()) }
single { NotificationContentCreator(get(), get()) }
single { SingleMessageNotifications(get(), get(), get(), get()) }

6
app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
View file

@ -9,7 +9,7 @@ class NotificationController internal constructor(
private val certificateErrorNotificationController: CertificateErrorNotificationController,
private val authenticationErrorNotificationController: AuthenticationErrorNotificationController,
private val syncNotifications: SyncNotifications,
private val sendFailedNotifications: SendFailedNotifications,
private val sendFailedNotificationController: SendFailedNotificationController,
private val newMailNotifications: NewMailNotifications
) {
fun showCertificateErrorNotification(account: Account, incoming: Boolean) {
@ -37,11 +37,11 @@ class NotificationController internal constructor(
}
fun showSendFailedNotification(account: Account, exception: Exception) {
sendFailedNotifications.showSendFailedNotification(account, exception)
sendFailedNotificationController.showSendFailedNotification(account, exception)
}
fun clearSendFailedNotification(account: Account) {
sendFailedNotifications.clearSendFailedNotification(account)
sendFailedNotificationController.clearSendFailedNotification(account)
}
fun showFetchingMailNotification(account: Account, folder: LocalFolder) {

2
app/core/src/main/java/com/fsck/k9/notification/SendFailedNotifications.kt → app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
View file

@ -5,7 +5,7 @@ import androidx.core.app.NotificationManagerCompat
import com.fsck.k9.Account
import com.fsck.k9.helper.ExceptionHelper
internal class SendFailedNotifications(
internal class SendFailedNotificationController(
private val notificationHelper: NotificationHelper,
private val actionBuilder: NotificationActionCreator,
private val resourceProvider: NotificationResourceProvider

8
app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationsTest.kt → app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
View file

@ -18,7 +18,7 @@ import org.mockito.kotlin.mock
private const val ACCOUNT_NUMBER = 1
private const val ACCOUNT_NAME = "TestAccount"
class SendFailedNotificationsTest : RobolectricTest() {
class SendFailedNotificationControllerTest : RobolectricTest() {
private val resourceProvider: NotificationResourceProvider = TestNotificationResourceProvider()
private val notification = mock<Notification>()
private val notificationManager = mock<NotificationManagerCompat>()
@ -26,7 +26,7 @@ class SendFailedNotificationsTest : RobolectricTest() {
private val account = createFakeAccount()
private val contentIntent = mock<PendingIntent>()
private val notificationId = NotificationIds.getSendFailedNotificationId(account)
private val sendFailedNotifications = SendFailedNotifications(
private val controller = SendFailedNotificationController(
notificationHelper = createFakeNotificationHelper(notificationManager, builder),
actionBuilder = createActionBuilder(contentIntent),
resourceProvider = resourceProvider
@ -36,7 +36,7 @@ class SendFailedNotificationsTest : RobolectricTest() {
fun testShowSendFailedNotification() {
val exception = Exception()
sendFailedNotifications.showSendFailedNotification(account, exception)
controller.showSendFailedNotification(account, exception)
verify(notificationManager).notify(notificationId, notification)
verify(builder).setSmallIcon(resourceProvider.iconWarning)
@ -49,7 +49,7 @@ class SendFailedNotificationsTest : RobolectricTest() {
@Test
fun testClearSendFailedNotification() {
sendFailedNotifications.clearSendFailedNotification(account)
controller.clearSendFailedNotification(account)
verify(notificationManager).cancel(notificationId)
}