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

Prevent folder add/delete loop

This commit is contained in:
M66B 2018-12-06 14:23:27 +01:00
parent 4831177e47
commit 02365af96b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -804,7 +804,7 @@ public class ServiceSynchronize extends LifecycleService {
public void folderRenamed(FolderEvent e) {
try {
wlAccount.acquire();
Log.i(Helper.TAG, "Folder renamed=" + e.getFolder());
Log.i(Helper.TAG, "Folder renamed=" + e.getFolder().getFullName());
String old = e.getFolder().getFullName();
String name = e.getNewFolder().getFullName();
@ -822,6 +822,9 @@ public class ServiceSynchronize extends LifecycleService {
try {
wlAccount.acquire();
Log.i(Helper.TAG, "Folder deleted=" + e.getFolder().getFullName());
EntityFolder folder = db.folder().getFolderByName(account.id, e.getFolder().getFullName());
if (folder != null)
db.folder().setFolderTbd(folder.id);
reload(ServiceSynchronize.this, "folder deleted");
} finally {
wlAccount.release();
@ -1800,7 +1803,8 @@ public class ServiceSynchronize extends LifecycleService {
names.add(folder.name);
else {
IMAPFolder ifolder = (IMAPFolder) istore.getFolder(folder.name);
ifolder.delete(false);
if (ifolder.exists())
ifolder.delete(false);
db.folder().deleteFolder(folder.id);
}
Log.i(Helper.TAG, "Local folder count=" + names.size());