mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle subscriptions when renaming/deleting folders

This commit is contained in:
M66B 2019-09-09 08:35:29 +02:00
parent 3e080e0c9c
commit cbdb089477
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/Core.java
View File

@ -810,10 +810,11 @@ class Core {
if (folder.tbc != null) { if (folder.tbc != null) {
Log.i(folder.name + " creating"); Log.i(folder.name + " creating");
Folder ifolder = istore.getFolder(folder.name); Folder ifolder = istore.getFolder(folder.name);
if (!ifolder.exists()) if (!ifolder.exists()) {
ifolder.create(Folder.HOLDS_MESSAGES); ifolder.create(Folder.HOLDS_MESSAGES);
if (subscribed_only) if (subscribed_only)
ifolder.setSubscribed(true); ifolder.setSubscribed(true);
}
db.folder().resetFolderTbc(folder.id); db.folder().resetFolderTbc(folder.id);
local.put(folder.name, folder); local.put(folder.name, folder);
sync_folders = true; sync_folders = true;
@ -822,7 +823,11 @@ class Core {
Log.i(folder.name + " rename into " + folder.rename); Log.i(folder.name + " rename into " + folder.rename);
Folder ifolder = istore.getFolder(folder.name); Folder ifolder = istore.getFolder(folder.name);
if (ifolder.exists()) { if (ifolder.exists()) {
// https://tools.ietf.org/html/rfc3501#section-6.3.9
boolean subscribed = ifolder.isSubscribed();
ifolder.setSubscribed(false);
ifolder.renameTo(istore.getFolder(folder.rename)); ifolder.renameTo(istore.getFolder(folder.rename));
ifolder.setSubscribed(subscribed);
db.folder().renameFolder(folder.account, folder.name, folder.rename); db.folder().renameFolder(folder.account, folder.name, folder.rename);
folder.name = folder.rename; folder.name = folder.rename;
} }
@ -832,8 +837,10 @@ class Core {
} else if (folder.tbd != null && folder.tbd) { } else if (folder.tbd != null && folder.tbd) {
Log.i(folder.name + " deleting"); Log.i(folder.name + " deleting");
Folder ifolder = istore.getFolder(folder.name); Folder ifolder = istore.getFolder(folder.name);
if (ifolder.exists()) if (ifolder.exists()) {
ifolder.setSubscribed(false);
ifolder.delete(false); ifolder.delete(false);
}
db.folder().deleteFolder(folder.id); db.folder().deleteFolder(folder.id);
sync_folders = true; sync_folders = true;