moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Make sure ActivityListener.getOperation() never returns null

This commit is contained in:
cketti 2012-09-14 01:28:52 +02:00
parent 0878de5936
commit 93be25bf37
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/fsck/k9/activity/ActivityListener.java
View File

@ -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();