moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-17 21:32:26 -05:00
Code Issues Releases Wiki Activity

Get rid of constant K9.OUTBOX

Browse Source 
Use Account.getOutboxFolderName() instead (still hardcoded, though)
This commit is contained in:
cketti 2011-05-08 02:22:38 +02:00
parent f4931a3167
commit 8e1c4acef9
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/fsck/k9/Account.java
View File

@ -38,6 +38,11 @@ public class Account implements BaseAccount {
*/ */
public static final String INBOX = "INBOX"; public static final String INBOX = "INBOX";
/**
* This local folder is used to store messages to be sent.
*/
public static final String OUTBOX = "OUTBOX";
public static final String EXPUNGE_IMMEDIATELY = "EXPUNGE_IMMEDIATELY"; public static final String EXPUNGE_IMMEDIATELY = "EXPUNGE_IMMEDIATELY";
public static final String EXPUNGE_MANUALLY = "EXPUNGE_MANUALLY"; public static final String EXPUNGE_MANUALLY = "EXPUNGE_MANUALLY";
public static final String EXPUNGE_ON_POLL = "EXPUNGE_ON_POLL"; public static final String EXPUNGE_ON_POLL = "EXPUNGE_ON_POLL";
@ -832,7 +837,7 @@ public class Account implements BaseAccount {
} }
public synchronized String getOutboxFolderName() { public synchronized String getOutboxFolderName() {
return K9.OUTBOX; return OUTBOX;
} }
public synchronized String getAutoExpandFolderName() { public synchronized String getAutoExpandFolderName() {

6
src/com/fsck/k9/K9.java
View File

@ -144,12 +144,6 @@ public class K9 extends Application {
public static boolean ENABLE_ERROR_FOLDER = true; public static boolean ENABLE_ERROR_FOLDER = true;
public static String ERROR_FOLDER_NAME = "K9mail-errors"; public static String ERROR_FOLDER_NAME = "K9mail-errors";
/**
* This local folder is used to store messages to be sent.
*/
public static final String OUTBOX = "OUTBOX";
private static boolean mAnimations = true; private static boolean mAnimations = true;
private static boolean mConfirmDelete = false; private static boolean mConfirmDelete = false;

2
src/com/fsck/k9/mail/store/ImapStore.java
View File

@ -398,7 +398,7 @@ public class ImapStore extends Store {
if (folder.equalsIgnoreCase(mAccount.getInboxFolderName())) { if (folder.equalsIgnoreCase(mAccount.getInboxFolderName())) {
continue; continue;
} else if (folder.equalsIgnoreCase(K9.OUTBOX)) { } else if (folder.equals(mAccount.getOutboxFolderName())) {
/* /*
* There is a folder on the server with the same name as our local * There is a folder on the server with the same name as our local
* outbox. Until we have a good plan to deal with this situation * outbox. Until we have a good plan to deal with this situation