Removed special folder case

Some providers make all folders subfolder of the inbox
This commit is contained in:
M66B
2018-12-22 14:57:01 +00:00
parent 2b7c572ce2
commit 94eb9af995
3 changed files with 3 additions and 9 deletions

View File

@@ -1949,10 +1949,6 @@ public class ServiceSynchronize extends LifecycleService {
}
}
// Special case
if (type == null && fullName.startsWith("INBOX" + separator))
type = EntityFolder.INBOX_SUB;
if (selectable) {
int level = EntityFolder.getLevel(separator, fullName);
EntityFolder folder = db.folder().getFolderByName(account.id, fullName);
@@ -1971,8 +1967,9 @@ public class ServiceSynchronize extends LifecycleService {
} else {
Log.i(Helper.TAG, folder.name + " exists");
db.folder().setFolderLevel(folder.id, level);
if (EntityFolder.USER.equals(folder.type) &&
(EntityFolder.INBOX_SUB.equals(type) || EntityFolder.SYSTEM.equals(type)))
if ("Inbox_sub".equals(folder.type))
db.folder().setFolderType(folder.id, EntityFolder.USER);
else if (EntityFolder.USER.equals(folder.type) && EntityFolder.SYSTEM.equals(type))
db.folder().setFolderType(folder.id, type);
}
}