Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee8dd311 authored by cketti's avatar cketti
Browse files

Pass Contacts via constructor into MessagingController

parent 1d2509e9

k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java

+7 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import android.os.Build; 
import android.os.PowerManager;

import android.os.Process;

import android.os.SystemClock;

import android.provider.ContactsContract;

import android.support.annotation.VisibleForTesting;

import android.util.Log;
@@ -153,6 +152,7 @@ public class MessagingController implements Runnable { 


    private final Context context;

    private final NotificationController notificationController;

    private final Contacts contacts;

    private volatile boolean stopped = false;



    private static final Set<Flag> SYNC_FLAGS = EnumSet.of(Flag.SEEN, Flag.FLAGGED, Flag.ANSWERED, Flag.FORWARDED);
@@ -211,9 +211,11 @@ public class MessagingController implements Runnable { 




    @VisibleForTesting

    MessagingController(Context context, NotificationController notificationController) {

    MessagingController(Context context, NotificationController notificationController, Contacts contacts) {

        this.context = context;

        this.notificationController = notificationController;

        this.contacts = contacts;



        mThread = new Thread(this);

        mThread.setName("MessagingController");

        mThread.start();
@@ -233,7 +235,8 @@ public class MessagingController implements Runnable { 
        if (inst == null) {

            Context appContext = context.getApplicationContext();

            NotificationController notificationController = NotificationController.newInstance(appContext);

            inst = new MessagingController(appContext, notificationController);

            Contacts contacts = Contacts.getInstance(context);

            inst = new MessagingController(appContext, notificationController, contacts);

        }

        return inst;

    }
@@ -4315,7 +4318,7 @@ public class MessagingController implements Runnable { 
            return false;

        }



        if (account.isNotifyContactsMailOnly() && !Contacts.getInstance(context).containsContact(message.getFrom())) {

        if (account.isNotifyContactsMailOnly() && !contacts.containsContact(message.getFrom())) {

            return false;

        }

k9mail/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java

+4 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ import java.lang.reflect.Field; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.Date;

import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.Set;
@@ -14,6 +13,7 @@ import android.content.Context; 
import com.fsck.k9.Account;

import com.fsck.k9.AccountStats;

import com.fsck.k9.Preferences;

import com.fsck.k9.helper.Contacts;

import com.fsck.k9.mail.FetchProfile;

import com.fsck.k9.mail.Flag;

import com.fsck.k9.mail.Folder;
@@ -49,7 +49,6 @@ import static org.mockito.Matchers.anyInt; 
import static org.mockito.Matchers.anySet;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.isNull;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doAnswer;
@@ -70,6 +69,8 @@ public class MessagingControllerTest { 


    private MessagingController controller;

    @Mock

    private Contacts contacts;

    @Mock

    private Account account;

    @Mock

    private AccountStats accountStats;
@@ -119,7 +120,7 @@ public class MessagingControllerTest { 
        MockitoAnnotations.initMocks(this);

        appContext = ShadowApplication.getInstance().getApplicationContext();



        controller = new MessagingController(appContext, notificationController);

        controller = new MessagingController(appContext, notificationController, contacts);



        configureAccount();

        configureLocalStore();