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

Change NotificationController to use dependency injection

Browse source
This commit is contained in:
cketti 2018-07-04 18:49:37 +02:00
parent 6640b91a96
commit 46f7b6e008
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,15 @@
package com.fsck.k9.notification
import android.support.v4.app.NotificationManagerCompat
import org.koin.dsl.module.applicationContext
val coreNotificationModule = applicationContext {
bean { NotificationController.newInstance(get()) }
bean { NotificationController(get(), get(), get(), get(), get()) }
bean { NotificationManagerCompat.from(get()) }
bean { NotificationHelper(get(), get()) }
bean { CertificateErrorNotifications(get(), get()) }
bean { AuthenticationErrorNotifications(get(), get()) }
bean { SyncNotifications(get(), get()) }
bean { SendFailedNotifications(get(), get()) }
bean { NewMailNotifications.newInstance(get(), get()) }
}

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

@ -1,12 +1,9 @@
package com.fsck.k9.notification;
import android.content.Context;
import android.os.Build;
import android.support.v4.app.NotificationManagerCompat;
import com.fsck.k9.Account;
import com.fsck.k9.DI;
import com.fsck.k9.controller.MessageReference;
import com.fsck.k9.mail.Folder;
import com.fsck.k9.mailstore.LocalMessage;
@ -20,12 +17,6 @@ public class NotificationController {
private final NewMailNotifications newMailNotifications;
public static NotificationController newInstance(Context context) {
Context appContext = context.getApplicationContext();
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(appContext);
return new NotificationController(appContext, notificationManager);
}
public static boolean platformSupportsExtendedNotifications() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
}
@ -35,14 +26,18 @@ public class NotificationController {
}
NotificationController(Context context, NotificationManagerCompat notificationManager) {
NotificationHelper notificationHelper = new NotificationHelper(context, notificationManager);
NotificationActionCreator actionBuilder = DI.get(NotificationActionCreator.class);
certificateErrorNotifications = new CertificateErrorNotifications(notificationHelper, actionBuilder);
authenticationErrorNotifications = new AuthenticationErrorNotifications(notificationHelper, actionBuilder);
syncNotifications = new SyncNotifications(notificationHelper, actionBuilder);
sendFailedNotifications = new SendFailedNotifications(notificationHelper, actionBuilder);
newMailNotifications = NewMailNotifications.newInstance(notificationHelper, actionBuilder);
NotificationController(
CertificateErrorNotifications certificateErrorNotifications,
AuthenticationErrorNotifications authenticationErrorNotifications,
SyncNotifications syncNotifications,
SendFailedNotifications sendFailedNotifications,
NewMailNotifications newMailNotifications
) {
this.certificateErrorNotifications = certificateErrorNotifications;
this.authenticationErrorNotifications = authenticationErrorNotifications;
this.syncNotifications = syncNotifications;
this.sendFailedNotifications = sendFailedNotifications;
this.newMailNotifications = newMailNotifications;
}
public void showCertificateErrorNotification(Account account, boolean incoming) {