|
|
@ -2992,9 +2992,6 @@ class Core {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
db.beginTransaction();
|
|
|
|
db.beginTransaction();
|
|
|
|
|
|
|
|
|
|
|
|
if (EntityFolder.INBOX.equals(type)) // Case insensitive
|
|
|
|
|
|
|
|
folder = db.folder().getFolderByType(account.id, type);
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
folder = db.folder().getFolderByName(account.id, fullName);
|
|
|
|
folder = db.folder().getFolderByName(account.id, fullName);
|
|
|
|
if (folder == null) {
|
|
|
|
if (folder == null) {
|
|
|
|
EntityFolder parent = null;
|
|
|
|
EntityFolder parent = null;
|
|
|
@ -3039,12 +3036,6 @@ class Core {
|
|
|
|
if (!Objects.equals(type, folder.type))
|
|
|
|
if (!Objects.equals(type, folder.type))
|
|
|
|
EntityLog.log(context, "Folder name=" + folder.name + " type old=" + folder.type + " new=" + type);
|
|
|
|
EntityLog.log(context, "Folder name=" + folder.name + " type old=" + folder.type + " new=" + type);
|
|
|
|
|
|
|
|
|
|
|
|
if (EntityFolder.INBOX.equals(folder.type) &&
|
|
|
|
|
|
|
|
!Objects.equals(fullName, folder.name)) {
|
|
|
|
|
|
|
|
folder.name = fullName;
|
|
|
|
|
|
|
|
db.folder().setFolderName(folder.id, folder.name);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
folder.namespace = ifolder.first.getFullName();
|
|
|
|
folder.namespace = ifolder.first.getFullName();
|
|
|
|
folder.separator = ifolder.first.getSeparator();
|
|
|
|
folder.separator = ifolder.first.getSeparator();
|
|
|
|
db.folder().setFolderNamespace(folder.id, folder.namespace, folder.separator);
|
|
|
|
db.folder().setFolderNamespace(folder.id, folder.namespace, folder.separator);
|
|
|
|