am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev

* commit '0b693a05565dd953d35e0ec4489d7669d6d2a7e6':
  Fix subfolders of the inbox.
This commit is contained in:
Martin Hibdon 2014-11-02 15:32:44 +00:00 committed by Android Git Automerger
commit 5ae1599a83

View File

@ -321,6 +321,11 @@ public class ImapStore extends Store {
String parentPath = null; String parentPath = null;
if (delimiterIdx != -1) { if (delimiterIdx != -1) {
parentPath = path.substring(0, delimiterIdx); parentPath = path.substring(0, delimiterIdx);
if (ImapConstants.INBOX.equalsIgnoreCase(parentPath)) {
// The Inbox is added as a special case, and always in all caps. In reality,
// it might not be in all caps, this folder's parent path might have mixed case.
parentPath = ImapConstants.INBOX;
}
final ImapFolder parentFolder = mailboxes.get(parentPath); final ImapFolder parentFolder = mailboxes.get(parentPath);
final Mailbox parentMailbox = (parentFolder == null) ? null : parentFolder.mMailbox; final Mailbox parentMailbox = (parentFolder == null) ? null : parentFolder.mMailbox;
if (parentMailbox != null) { if (parentMailbox != null) {