wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify logic in ActivityListener.getActionInProgressOperation()

Browse source
This commit is contained in:
cketti 2017-08-29 18:12:58 +02:00
parent 349b7bbcee
commit 1b364755df
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
k9mail/src/main/java/com/fsck/k9/activity/ActivityListener.java
View file

@ -83,13 +83,14 @@ public class ActivityListener extends SimpleMessagingListener {
} else { } else {
displayName = loadingFolderName; displayName = loadingFolderName;
} }
if (account != null && account.getInboxFolderName() != null &&
account.getInboxFolderName().equalsIgnoreCase(displayName)) { if (account != null) {
if (displayName.equalsIgnoreCase(account.getInboxFolderName())) {
displayName = context.getString(R.string.special_mailbox_name_inbox); displayName = context.getString(R.string.special_mailbox_name_inbox);
} else if (account != null && account.getOutboxFolderName() != null && } else if (displayName.equalsIgnoreCase(account.getOutboxFolderName())) {
account.getOutboxFolderName().equals(displayName)) {
displayName = context.getString(R.string.special_mailbox_name_outbox); displayName = context.getString(R.string.special_mailbox_name_outbox);
} }
}
if (loadingHeaderFolderName != null) { if (loadingHeaderFolderName != null) {
return context.getString(R.string.status_loading_account_folder_headers, return context.getString(R.string.status_loading_account_folder_headers,