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

Skip setting folder display name

This commit is contained in:
M66B 2019-09-17 10:47:36 +02:00
parent 233cf8d52a
commit 8ad6d7bb33
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -902,16 +902,12 @@ class Core {
for (Folder ifolder : ifolders) {
String fullName = ifolder.getFullName();
String[] name = fullName.split(Pattern.quote(Character.toString(separator)));
String childName = name[name.length - 1];
boolean subscribed = subscription.contains(fullName);
String[] attr = ((IMAPFolder) ifolder).getAttributes();
String type = EntityFolder.getType(attr, fullName, false);
boolean selectable = !Arrays.asList(attr).contains("\\Noselect") &&
((ifolder.getType() & IMAPFolder.HOLDS_MESSAGES) != 0);
if (EntityFolder.INBOX.equals(type) || fullName.equals(childName))
childName = null;
Log.i(account.name + ":" + fullName + " subscribed=" + subscribed +
" type=" + type + " attrs=" + TextUtils.join(" ", attr));
@ -927,7 +923,6 @@ class Core {
folder = new EntityFolder();
folder.account = account.id;
folder.name = fullName;
folder.display = childName;
folder.type = (EntityFolder.SYSTEM.equals(type) ? type : EntityFolder.USER);
folder.synchronize = false;
folder.subscribed = subscribed;
@ -943,9 +938,6 @@ class Core {
if (folder.subscribed == null || !folder.subscribed.equals(subscribed))
db.folder().setFolderSubscribed(folder.id, subscribed);
if (folder.display == null && childName != null)
db.folder().setFolderDisplay(folder.id, childName);
// Compatibility
if (EntityFolder.USER.equals(folder.type) && EntityFolder.SYSTEM.equals(type))
db.folder().setFolderType(folder.id, type);