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

Commit cecfe3fb authored by Vincent Breitmoser's avatar Vincent Breitmoser Committed by GitHub
Browse files

Merge pull request #2291 from k9mail/messaging_listener_cleanup 

Clean up MessagingListener
parents aaa43e67 82f3c67f

k9mail/src/main/java/com/fsck/k9/K9.java

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.fsck.k9.Account.SortType; 
import com.fsck.k9.activity.MessageCompose;

import com.fsck.k9.activity.UpgradeDatabases;

import com.fsck.k9.controller.MessagingController;

import com.fsck.k9.controller.MessagingListener;

import com.fsck.k9.controller.SimpleMessagingListener;

import com.fsck.k9.mail.Address;

import com.fsck.k9.mail.K9MailLib;

import com.fsck.k9.mail.Message;
@@ -553,7 +553,7 @@ public class K9 extends Application { 
        setServicesEnabled(this);

        registerReceivers();



        MessagingController.getInstance(this).addListener(new MessagingListener() {

        MessagingController.getInstance(this).addListener(new SimpleMessagingListener() {

            private void broadcastIntent(String action, Account account, String folder, Message message) {

                Uri uri = Uri.parse("email://messages/" + account.getAccountNumber() + "/" + Uri.encode(folder) + "/" + Uri.encode(message.getUid()));

                Intent intent = new Intent(action, uri);

k9mail/src/main/java/com/fsck/k9/activity/ActivityListener.java

+2 −2
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ import com.fsck.k9.Account; 
import com.fsck.k9.AccountStats;

import com.fsck.k9.K9;

import com.fsck.k9.R;

import com.fsck.k9.controller.MessagingListener;

import com.fsck.k9.controller.SimpleMessagingListener;

import com.fsck.k9.service.MailService;



public class ActivityListener extends MessagingListener {

public class ActivityListener extends SimpleMessagingListener {

    private Account mAccount = null;

    private String mLoadingFolderName = null;

    private String mLoadingHeaderFolderName = null;

k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.fsck.k9.Preferences; 
import com.fsck.k9.R;

import com.fsck.k9.controller.MessagingController;

import com.fsck.k9.controller.MessagingListener;

import com.fsck.k9.controller.SimpleMessagingListener;

import com.fsck.k9.mail.Folder;

import com.fsck.k9.mailstore.LocalFolder;
@@ -241,7 +242,7 @@ public class ChooseFolder extends K9ListActivity { 
        MessagingController.getInstance(getApplication()).listFolders(mAccount, false, mListener);

    }



    private MessagingListener mListener = new MessagingListener() {

    private MessagingListener mListener = new SimpleMessagingListener() {

        @Override

        public void listFoldersStarted(Account account) {

            if (!account.equals(mAccount)) {

k9mail/src/main/java/com/fsck/k9/activity/FolderList.java

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.fsck.k9.activity.setup.FolderSettings; 
import com.fsck.k9.activity.setup.Prefs;

import com.fsck.k9.controller.MessagingController;

import com.fsck.k9.controller.MessagingListener;

import com.fsck.k9.controller.SimpleMessagingListener;

import com.fsck.k9.helper.SizeFormatter;

import com.fsck.k9.mail.power.TracingPowerManager;

import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
@@ -210,7 +211,7 @@ public class FolderList extends K9ListActivity { 
        final TracingWakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "FolderList checkMail");

        wakeLock.setReferenceCounted(false);

        wakeLock.acquire(K9.WAKE_LOCK_TIMEOUT);

        MessagingListener listener = new MessagingListener() {

        MessagingListener listener = new SimpleMessagingListener() {

            @Override

            public void synchronizeMailboxFinished(Account account, String folder, int totalMessagesInMailbox, int numNewMessages) {

                if (!account.equals(mAccount)) {

k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java

+2 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import com.fsck.k9.activity.compose.SaveMessageTask; 
import com.fsck.k9.activity.misc.Attachment;

import com.fsck.k9.controller.MessagingController;

import com.fsck.k9.controller.MessagingListener;

import com.fsck.k9.controller.SimpleMessagingListener;

import com.fsck.k9.fragment.ProgressDialogFragment;

import com.fsck.k9.fragment.ProgressDialogFragment.CancelListener;

import com.fsck.k9.helper.Contacts;
@@ -1588,7 +1589,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, 
    };



    // TODO We miss callbacks for this listener if they happens while we are paused!

    public MessagingListener messagingListener = new MessagingListener() {

    public MessagingListener messagingListener = new SimpleMessagingListener() {



        @Override

        public void messageUidChanged(Account account, String folder, String oldUid, String newUid) {