moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-08-13 17:03:48 -04:00
Code Issues Releases Wiki Activity

Make sure ActivityListener.getOperation() never returns null

Browse Source
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

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

@ -30,7 +30,7 @@ public class ActivityListener extends MessagingListener {
} }
public String getOperation(Context context, DateFormat timeFormat){ public String getOperation(Context context, DateFormat timeFormat){
String operation = null; String operation;
String progress = null; String progress = null;
if (mLoadingAccountDescription != null if (mLoadingAccountDescription != null
|| mSendingAccountDescription != null || mSendingAccountDescription != null
@ -61,6 +61,8 @@ public class ActivityListener extends MessagingListener {
operation = context.getString(R.string.status_processing_account, mProcessingAccountDescription, operation = context.getString(R.string.status_processing_account, mProcessingAccountDescription,
mProcessingCommandTitle != null ? mProcessingCommandTitle : "", mProcessingCommandTitle != null ? mProcessingCommandTitle : "",
progress); progress);
} else {
operation = "";
} }
} else { } else {
long nextPollTime = MailService.getNextPollTime(); long nextPollTime = MailService.getNextPollTime();