ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use "Inbox" rather than "INBOX" for, well, "inbox"

Browse Source 
Bug: 6366703
Change-Id: If9a43513990802203431ecbbcd96247b2db8e93f
This commit is contained in:
Marc Blank 2012-04-29 20:14:48 -07:00
parent 6a7d10e1c3
commit c75cd15c96
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
email2/src/com/android/email/mail/store/ImapStore.java
View File

@ -26,6 +26,7 @@ import android.util.Log;
import com.android.email.LegacyConversions; import com.android.email.LegacyConversions;
import com.android.email.Preferences; import com.android.email.Preferences;
import com.android.email.R;
import com.android.email.VendorPolicyLoader; import com.android.email.VendorPolicyLoader;
import com.android.email.mail.Store; import com.android.email.mail.Store;
import com.android.email.mail.Transport; import com.android.email.mail.Transport;
@ -418,8 +419,9 @@ public class ImapStore extends Store {
mailboxes.put(folderName, folder); mailboxes.put(folderName, folder);
} }
} }
String inboxName = mContext.getString(R.string.mailbox_name_display_inbox);
Folder newFolder = Folder newFolder =
addMailbox(mContext, mAccount.mId, ImapConstants.INBOX, '\0', true /*selectable*/); addMailbox(mContext, mAccount.mId, inboxName, '\0', true /*selectable*/);
mailboxes.put(ImapConstants.INBOX, (ImapFolder)newFolder); mailboxes.put(ImapConstants.INBOX, (ImapFolder)newFolder);
createHierarchy(mailboxes); createHierarchy(mailboxes);
saveMailboxList(mContext, mailboxes); saveMailboxList(mContext, mailboxes);

7
email2/src/com/android/email/mail/store/Pop3Store.java
View File

@ -160,8 +160,9 @@ public class Pop3Store extends Store {
@Override @Override
public Folder[] updateFolders() { public Folder[] updateFolders() {
Mailbox mailbox = Mailbox.getMailboxForPath(mContext, mAccount.mId, POP3_MAILBOX_NAME); String inboxName = mContext.getString(R.string.mailbox_name_display_inbox);
updateMailbox(mailbox, mAccount.mId, POP3_MAILBOX_NAME, '\0', true, Mailbox.TYPE_INBOX); Mailbox mailbox = Mailbox.getMailboxForPath(mContext, mAccount.mId, inboxName);
updateMailbox(mailbox, mAccount.mId, inboxName, '\0', true, Mailbox.TYPE_INBOX);
// Force the parent key to be "no mailbox" for the mail POP3 mailbox // Force the parent key to be "no mailbox" for the mail POP3 mailbox
mailbox.mParentKey = Mailbox.NO_MAILBOX; mailbox.mParentKey = Mailbox.NO_MAILBOX;
if (mailbox.isSaved()) { if (mailbox.isSaved()) {
@ -178,7 +179,7 @@ public class Pop3Store extends Store {
} }
} }
return new Folder[] { getFolder(POP3_MAILBOX_NAME) }; return new Folder[] { getFolder(inboxName) };
} }