Simplify logic in ActivityListener.getActionInProgressOperation()

This commit is contained in:
cketti 2017-08-29 18:12:58 +02:00
parent 349b7bbcee
commit 1b364755df

View file

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