From 32901667496a84cec9c78d9d1613fbb44b0ce88f Mon Sep 17 00:00:00 2001 From: bitblaster Date: Tue, 5 Apr 2011 02:14:56 -0700 Subject: [PATCH] Replaced references to K9.INBOX with account.getInboxFolderName() and disabled the call to reverseTranslateFolder in case of WebDav account --- src/com/fsck/k9/activity/setup/AccountSettings.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index b5c4a54b4..c54f82cc4 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -700,7 +700,13 @@ public class AccountSettings extends K9PreferenceActivity { mAccount.setCryptoAutoSignature(mCryptoAutoSignature.isChecked()); mAccount.setLocalStorageProviderId(mLocalStorageProvider.getValue()); - mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue())); + // In webdav account we use the exact folder name also for inbox, + // since it varies because of internationalization + if(mAccount.getStoreUri().startsWith("webdav")) + mAccount.setAutoExpandFolderName(mAutoExpandFolder.getValue()); + else + mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue())); + mAccount.setArchiveFolderName(mArchiveFolder.getValue()); mAccount.setDraftsFolderName(mDraftsFolder.getValue()); mAccount.setSentFolderName(mSentFolder.getValue()); @@ -826,7 +832,7 @@ public class AccountSettings extends K9PreferenceActivity { } private String translateFolder(String in) { - if (K9.INBOX.equalsIgnoreCase(in)) { + if (mAccount.getInboxFolderName().equalsIgnoreCase(in)) { return getString(R.string.special_mailbox_name_inbox); } else { return in; @@ -835,7 +841,7 @@ public class AccountSettings extends K9PreferenceActivity { private String reverseTranslateFolder(String in) { if (getString(R.string.special_mailbox_name_inbox).equals(in)) { - return K9.INBOX; + return mAccount.getInboxFolderName(); } else { return in; }