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

Fixed recreating folder

This commit is contained in:
M66B 2019-05-25 16:21:25 +02:00
parent 7497acf5ed
commit 35ed2e5187
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -772,22 +772,6 @@ class Core {
Log.i("Start sync folders account=" + account.name);
// Get default folder
Folder defaultFolder = istore.getDefaultFolder();
char separator = defaultFolder.getSeparator();
EntityLog.log(context, account.name + " folder separator=" + separator);
// Get remote folders
Folder[] ifolders = (subscribed_only
? defaultFolder.listSubscribed("*")
: defaultFolder.list("*"));
if (subscribed_only && ifolders.length == 0) {
Log.i("No subscribed folders");
ifolders = defaultFolder.list("*");
}
Log.i("Remote folder count=" + ifolders.length + " separator=" + separator);
// Get folder names
List<String> names = new ArrayList<>();
for (EntityFolder folder : db.folder().getFolders(account.id))
@ -808,6 +792,22 @@ class Core {
names.add(folder.name);
Log.i("Local folder count=" + names.size());
// Get default folder
Folder defaultFolder = istore.getDefaultFolder();
char separator = defaultFolder.getSeparator();
EntityLog.log(context, account.name + " folder separator=" + separator);
// Get remote folders
Folder[] ifolders = (subscribed_only
? defaultFolder.listSubscribed("*")
: defaultFolder.list("*"));
if (subscribed_only && ifolders.length == 0) {
Log.i("No subscribed folders");
ifolders = defaultFolder.list("*");
}
Log.i("Remote folder count=" + ifolders.length + " separator=" + separator);
Map<String, EntityFolder> nameFolder = new HashMap<>();
Map<String, List<EntityFolder>> parentFolders = new HashMap<>();
for (Folder ifolder : ifolders) {