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

Commit 93be25bf authored by cketti's avatar cketti
Browse files

Make sure ActivityListener.getOperation() never returns null

parent 0878de59

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

+4 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public class ActivityListener extends MessagingListener { 
    }



    public String getOperation(Context context, DateFormat timeFormat){

        String operation = null;

        String operation;

        String progress = null;

        if (mLoadingAccountDescription  != null

                || mSendingAccountDescription != null
@@ -61,6 +61,8 @@ public class ActivityListener extends MessagingListener { 
                operation = context.getString(R.string.status_processing_account, mProcessingAccountDescription,

                                              mProcessingCommandTitle != null ? mProcessingCommandTitle : "",

                                              progress);

            } else {

                operation = "";

            }

        } else {

            long nextPollTime = MailService.getNextPollTime();