moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 19:52:17 -05:00
Code Issues Releases Wiki Activity

Replaced references to K9.INBOX with account.getInboxFolderName()

Browse Source
This commit is contained in:
bitblaster 2011-04-05 02:10:11 -07:00 committed by Jesse Vincent
parent 50b906aef7
commit 680e2e4191
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/fsck/k9/activity/ChooseFolder.java
View File

@ -248,7 +248,8 @@ public class ChooseFolder extends K9ListActivity {
String name = folder.getName(); String name = folder.getName();
// Inbox needs to be compared case-insensitively // Inbox needs to be compared case-insensitively
if (hideCurrentFolder && (name.equals(mFolder) || (K9.INBOX.equalsIgnoreCase(mFolder) && K9.INBOX.equalsIgnoreCase(name)))) { if (hideCurrentFolder && (name.equals(mFolder) ||
(mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name)))) {
continue; continue;
} }
try { try {
@ -282,10 +283,10 @@ public class ChooseFolder extends K9ListActivity {
if (K9.FOLDER_NONE.equalsIgnoreCase(bName)) { if (K9.FOLDER_NONE.equalsIgnoreCase(bName)) {
return 1; return 1;
} }
if (K9.INBOX.equalsIgnoreCase(aName)) { if (mAccount.getInboxFolderName().equalsIgnoreCase(aName)) {
return -1; return -1;
} }
if (K9.INBOX.equalsIgnoreCase(bName)) { if (mAccount.getInboxFolderName().equalsIgnoreCase(bName)) {
return 1; return 1;
} }
@ -298,7 +299,7 @@ public class ChooseFolder extends K9ListActivity {
mAdapter.clear(); mAdapter.clear();
int position = 0; int position = 0;
for (String name : localFolders) { for (String name : localFolders) {
if (K9.INBOX.equalsIgnoreCase(name)) { if (mAccount.getInboxFolderName().equalsIgnoreCase(name)) {
mAdapter.add(getString(R.string.special_mailbox_name_inbox)); mAdapter.add(getString(R.string.special_mailbox_name_inbox));
heldInbox = name; heldInbox = name;
} else if (!K9.ERROR_FOLDER_NAME.equals(name) && !account.getOutboxFolderName().equals(name)) { } else if (!K9.ERROR_FOLDER_NAME.equals(name) && !account.getOutboxFolderName().equals(name)) {
@ -315,7 +316,7 @@ public class ChooseFolder extends K9ListActivity {
selectedFolder = position; selectedFolder = position;
} }
} else if (name.equals(mFolder) || } else if (name.equals(mFolder) ||
(K9.INBOX.equalsIgnoreCase(mFolder) && K9.INBOX.equalsIgnoreCase(name))) { (mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name))) {
selectedFolder = position; selectedFolder = position;
} }
position++; position++;