From 93be25bf375a409527baf1d2c196848d7c383b65 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Fri, 14 Sep 2012 01:28:52 +0200
Subject: [PATCH] Make sure ActivityListener.getOperation() never returns null

---
 src/com/fsck/k9/activity/ActivityListener.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/fsck/k9/activity/ActivityListener.java b/src/com/fsck/k9/activity/ActivityListener.java
index 329a64677..24ebd19ee 100644
--- a/src/com/fsck/k9/activity/ActivityListener.java
+++ b/src/com/fsck/k9/activity/ActivityListener.java
@@ -23,14 +23,14 @@ public class ActivityListener extends MessagingListener {
 
 
     public String formatHeader(Context context, String activityPrefix, int unreadMessageCount, DateFormat timeFormat) {
-	String operation = getOperation(context, timeFormat);
+    String operation = getOperation(context, timeFormat);
         return context.getString(R.string.activity_header_format, activityPrefix,
                                  (unreadMessageCount > 0 ? context.getString(R.string.activity_unread_count, unreadMessageCount) : ""),
                                  operation);
     }
 
     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();