mirror of
https://github.com/moparisthebest/k-9
synced 2024-12-25 09:08:49 -05:00
Added mInboxFolderName and mOutboxFolderName fields
This commit is contained in:
parent
0174988d27
commit
50b906aef7
@ -80,11 +80,13 @@ public class Account implements BaseAccount {
|
|||||||
private long mLatestOldMessageSeenTime;
|
private long mLatestOldMessageSeenTime;
|
||||||
private boolean mNotifyNewMail;
|
private boolean mNotifyNewMail;
|
||||||
private boolean mNotifySelfNewMail;
|
private boolean mNotifySelfNewMail;
|
||||||
|
private String mInboxFolderName;
|
||||||
private String mDraftsFolderName;
|
private String mDraftsFolderName;
|
||||||
private String mSentFolderName;
|
private String mSentFolderName;
|
||||||
private String mTrashFolderName;
|
private String mTrashFolderName;
|
||||||
private String mArchiveFolderName;
|
private String mArchiveFolderName;
|
||||||
private String mSpamFolderName;
|
private String mSpamFolderName;
|
||||||
|
private String mOutboxFolderName;
|
||||||
private String mAutoExpandFolderName;
|
private String mAutoExpandFolderName;
|
||||||
private FolderMode mFolderDisplayMode;
|
private FolderMode mFolderDisplayMode;
|
||||||
private FolderMode mFolderSyncMode;
|
private FolderMode mFolderSyncMode;
|
||||||
@ -180,7 +182,8 @@ public class Account implements BaseAccount {
|
|||||||
mEnableMoveButtons = false;
|
mEnableMoveButtons = false;
|
||||||
mIsSignatureBeforeQuotedText = false;
|
mIsSignatureBeforeQuotedText = false;
|
||||||
mExpungePolicy = EXPUNGE_IMMEDIATELY;
|
mExpungePolicy = EXPUNGE_IMMEDIATELY;
|
||||||
mAutoExpandFolderName = "INBOX";
|
mAutoExpandFolderName = K9.INBOX;
|
||||||
|
mInboxFolderName = K9.INBOX;
|
||||||
mMaxPushFolders = 10;
|
mMaxPushFolders = 10;
|
||||||
mChipColor = (new Random()).nextInt(0xffffff) + 0xff000000;
|
mChipColor = (new Random()).nextInt(0xffffff) + 0xff000000;
|
||||||
goToUnreadMessageSearch = false;
|
goToUnreadMessageSearch = false;
|
||||||
@ -246,11 +249,13 @@ public class Account implements BaseAccount {
|
|||||||
mNotifySelfNewMail = prefs.getBoolean(mUuid + ".notifySelfNewMail", true);
|
mNotifySelfNewMail = prefs.getBoolean(mUuid + ".notifySelfNewMail", true);
|
||||||
mNotifySync = prefs.getBoolean(mUuid + ".notifyMailCheck", false);
|
mNotifySync = prefs.getBoolean(mUuid + ".notifyMailCheck", false);
|
||||||
mDeletePolicy = prefs.getInt(mUuid + ".deletePolicy", 0);
|
mDeletePolicy = prefs.getInt(mUuid + ".deletePolicy", 0);
|
||||||
|
mInboxFolderName = prefs.getString(mUuid + ".inboxFolderName", K9.INBOX);
|
||||||
mDraftsFolderName = prefs.getString(mUuid + ".draftsFolderName", "Drafts");
|
mDraftsFolderName = prefs.getString(mUuid + ".draftsFolderName", "Drafts");
|
||||||
mSentFolderName = prefs.getString(mUuid + ".sentFolderName", "Sent");
|
mSentFolderName = prefs.getString(mUuid + ".sentFolderName", "Sent");
|
||||||
mTrashFolderName = prefs.getString(mUuid + ".trashFolderName", "Trash");
|
mTrashFolderName = prefs.getString(mUuid + ".trashFolderName", "Trash");
|
||||||
mArchiveFolderName = prefs.getString(mUuid + ".archiveFolderName", "Archive");
|
mArchiveFolderName = prefs.getString(mUuid + ".archiveFolderName", "Archive");
|
||||||
mSpamFolderName = prefs.getString(mUuid + ".spamFolderName", "Spam");
|
mSpamFolderName = prefs.getString(mUuid + ".spamFolderName", "Spam");
|
||||||
|
mOutboxFolderName = prefs.getString(mUuid + ".outboxFolderName", "Outbox");
|
||||||
mExpungePolicy = prefs.getString(mUuid + ".expungePolicy", EXPUNGE_IMMEDIATELY);
|
mExpungePolicy = prefs.getString(mUuid + ".expungePolicy", EXPUNGE_IMMEDIATELY);
|
||||||
mSyncRemoteDeletions = prefs.getBoolean(mUuid + ".syncRemoteDeletions", true);
|
mSyncRemoteDeletions = prefs.getBoolean(mUuid + ".syncRemoteDeletions", true);
|
||||||
|
|
||||||
@ -270,8 +275,7 @@ public class Account implements BaseAccount {
|
|||||||
compressionMap.put(type, useCompression);
|
compressionMap.put(type, useCompression);
|
||||||
}
|
}
|
||||||
|
|
||||||
mAutoExpandFolderName = prefs.getString(mUuid + ".autoExpandFolderName",
|
mAutoExpandFolderName = prefs.getString(mUuid + ".autoExpandFolderName", K9.INBOX);
|
||||||
"INBOX");
|
|
||||||
|
|
||||||
mAccountNumber = prefs.getInt(mUuid + ".accountNumber", 0);
|
mAccountNumber = prefs.getInt(mUuid + ".accountNumber", 0);
|
||||||
|
|
||||||
@ -394,6 +398,7 @@ public class Account implements BaseAccount {
|
|||||||
editor.remove(mUuid + ".trashFolderName");
|
editor.remove(mUuid + ".trashFolderName");
|
||||||
editor.remove(mUuid + ".archiveFolderName");
|
editor.remove(mUuid + ".archiveFolderName");
|
||||||
editor.remove(mUuid + ".spamFolderName");
|
editor.remove(mUuid + ".spamFolderName");
|
||||||
|
editor.remove(mUuid + ".outboxFolderName");
|
||||||
editor.remove(mUuid + ".autoExpandFolderName");
|
editor.remove(mUuid + ".autoExpandFolderName");
|
||||||
editor.remove(mUuid + ".accountNumber");
|
editor.remove(mUuid + ".accountNumber");
|
||||||
editor.remove(mUuid + ".vibrate");
|
editor.remove(mUuid + ".vibrate");
|
||||||
@ -485,11 +490,13 @@ public class Account implements BaseAccount {
|
|||||||
editor.putBoolean(mUuid + ".notifySelfNewMail", mNotifySelfNewMail);
|
editor.putBoolean(mUuid + ".notifySelfNewMail", mNotifySelfNewMail);
|
||||||
editor.putBoolean(mUuid + ".notifyMailCheck", mNotifySync);
|
editor.putBoolean(mUuid + ".notifyMailCheck", mNotifySync);
|
||||||
editor.putInt(mUuid + ".deletePolicy", mDeletePolicy);
|
editor.putInt(mUuid + ".deletePolicy", mDeletePolicy);
|
||||||
|
editor.putString(mUuid + ".inboxFolderName", mInboxFolderName);
|
||||||
editor.putString(mUuid + ".draftsFolderName", mDraftsFolderName);
|
editor.putString(mUuid + ".draftsFolderName", mDraftsFolderName);
|
||||||
editor.putString(mUuid + ".sentFolderName", mSentFolderName);
|
editor.putString(mUuid + ".sentFolderName", mSentFolderName);
|
||||||
editor.putString(mUuid + ".trashFolderName", mTrashFolderName);
|
editor.putString(mUuid + ".trashFolderName", mTrashFolderName);
|
||||||
editor.putString(mUuid + ".archiveFolderName", mArchiveFolderName);
|
editor.putString(mUuid + ".archiveFolderName", mArchiveFolderName);
|
||||||
editor.putString(mUuid + ".spamFolderName", mSpamFolderName);
|
editor.putString(mUuid + ".spamFolderName", mSpamFolderName);
|
||||||
|
editor.putString(mUuid + ".outboxFolderName", mOutboxFolderName);
|
||||||
editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName);
|
editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName);
|
||||||
editor.putInt(mUuid + ".accountNumber", mAccountNumber);
|
editor.putInt(mUuid + ".accountNumber", mAccountNumber);
|
||||||
editor.putString(mUuid + ".hideButtonsEnum", mScrollMessageViewButtons.name());
|
editor.putString(mUuid + ".hideButtonsEnum", mScrollMessageViewButtons.name());
|
||||||
@ -762,7 +769,7 @@ public class Account implements BaseAccount {
|
|||||||
|
|
||||||
|
|
||||||
public boolean isSpecialFolder(String folderName) {
|
public boolean isSpecialFolder(String folderName) {
|
||||||
if (folderName != null && (folderName.equalsIgnoreCase(K9.INBOX) ||
|
if (folderName != null && (folderName.equalsIgnoreCase(getInboxFolderName()) ||
|
||||||
folderName.equals(getTrashFolderName()) ||
|
folderName.equals(getTrashFolderName()) ||
|
||||||
folderName.equals(getDraftsFolderName()) ||
|
folderName.equals(getDraftsFolderName()) ||
|
||||||
folderName.equals(getArchiveFolderName()) ||
|
folderName.equals(getArchiveFolderName()) ||
|
||||||
@ -824,7 +831,11 @@ public class Account implements BaseAccount {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public synchronized String getOutboxFolderName() {
|
public synchronized String getOutboxFolderName() {
|
||||||
return K9.OUTBOX;
|
return mOutboxFolderName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized void setOutboxFolderName(String outboxFolderName) {
|
||||||
|
mOutboxFolderName = outboxFolderName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized String getAutoExpandFolderName() {
|
public synchronized String getAutoExpandFolderName() {
|
||||||
@ -1303,6 +1314,15 @@ public class Account implements BaseAccount {
|
|||||||
public void setCryptoAutoSignature(boolean cryptoAutoSignature) {
|
public void setCryptoAutoSignature(boolean cryptoAutoSignature) {
|
||||||
mCryptoAutoSignature = cryptoAutoSignature;
|
mCryptoAutoSignature = cryptoAutoSignature;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getInboxFolderName() {
|
||||||
|
return mInboxFolderName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setInboxFolderName(String mInboxFolderName) {
|
||||||
|
this.mInboxFolderName = mInboxFolderName;
|
||||||
|
}
|
||||||
|
|
||||||
public synchronized boolean syncRemoteDeletions() {
|
public synchronized boolean syncRemoteDeletions() {
|
||||||
return mSyncRemoteDeletions;
|
return mSyncRemoteDeletions;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user