mirror of
https://github.com/moparisthebest/k-9
synced 2024-12-24 08:38:51 -05:00
Get rid of constant K9.OUTBOX
Use Account.getOutboxFolderName() instead (still hardcoded, though)
This commit is contained in:
parent
f4931a3167
commit
8e1c4acef9
@ -38,6 +38,11 @@ public class Account implements BaseAccount {
|
||||
*/
|
||||
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_MANUALLY = "EXPUNGE_MANUALLY";
|
||||
public static final String EXPUNGE_ON_POLL = "EXPUNGE_ON_POLL";
|
||||
@ -832,7 +837,7 @@ public class Account implements BaseAccount {
|
||||
}
|
||||
|
||||
public synchronized String getOutboxFolderName() {
|
||||
return K9.OUTBOX;
|
||||
return OUTBOX;
|
||||
}
|
||||
|
||||
public synchronized String getAutoExpandFolderName() {
|
||||
|
@ -144,12 +144,6 @@ public class K9 extends Application {
|
||||
public static boolean ENABLE_ERROR_FOLDER = true;
|
||||
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 mConfirmDelete = false;
|
||||
|
@ -398,7 +398,7 @@ public class ImapStore extends Store {
|
||||
|
||||
if (folder.equalsIgnoreCase(mAccount.getInboxFolderName())) {
|
||||
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
|
||||
* outbox. Until we have a good plan to deal with this situation
|
||||
|
Loading…
Reference in New Issue
Block a user