|
|
@ -1019,6 +1019,8 @@ class Core {
|
|
|
|
throw new FolderNotFoundException();
|
|
|
|
throw new FolderNotFoundException();
|
|
|
|
if (folder.id.equals(target.id))
|
|
|
|
if (folder.id.equals(target.id))
|
|
|
|
throw new IllegalArgumentException("self");
|
|
|
|
throw new IllegalArgumentException("self");
|
|
|
|
|
|
|
|
if (!target.selectable)
|
|
|
|
|
|
|
|
throw new IllegalArgumentException("not selectable");
|
|
|
|
|
|
|
|
|
|
|
|
// De-classify
|
|
|
|
// De-classify
|
|
|
|
for (EntityMessage message : messages)
|
|
|
|
for (EntityMessage message : messages)
|
|
|
@ -1910,6 +1912,8 @@ class Core {
|
|
|
|
Log.i("Delete local count=" + local.size());
|
|
|
|
Log.i("Delete local count=" + local.size());
|
|
|
|
for (String name : local.keySet()) {
|
|
|
|
for (String name : local.keySet()) {
|
|
|
|
EntityFolder folder = local.get(name);
|
|
|
|
EntityFolder folder = local.get(name);
|
|
|
|
|
|
|
|
if (EntityFolder.INBOX.equals(name) && !folder.selectable)
|
|
|
|
|
|
|
|
continue;
|
|
|
|
List<EntityFolder> childs = parentFolders.get(name);
|
|
|
|
List<EntityFolder> childs = parentFolders.get(name);
|
|
|
|
if (EntityFolder.USER.equals(folder.type) ||
|
|
|
|
if (EntityFolder.USER.equals(folder.type) ||
|
|
|
|
childs == null || childs.size() == 0) {
|
|
|
|
childs == null || childs.size() == 0) {
|
|
|
|