mirror of https://github.com/M66B/FairEmail.git
Remove folder prefixes only
This commit is contained in:
parent
2135d9bfa5
commit
02fe5b839b
|
@ -791,19 +791,11 @@ class Core {
|
||||||
if (folder.subscribed == null || !folder.subscribed.equals(subscribed))
|
if (folder.subscribed == null || !folder.subscribed.equals(subscribed))
|
||||||
db.folder().setFolderSubscribed(folder.id, subscribed.get(ifolder));
|
db.folder().setFolderSubscribed(folder.id, subscribed.get(ifolder));
|
||||||
|
|
||||||
if (folder.display == null) {
|
if (folder.display == null && display != null) {
|
||||||
if (display != null) {
|
|
||||||
db.folder().setFolderDisplay(folder.id, display);
|
db.folder().setFolderDisplay(folder.id, display);
|
||||||
EntityLog.log(context, account.name + ":" + folder.name +
|
EntityLog.log(context, account.name + ":" + folder.name +
|
||||||
" removed prefix display=" + display + " separator=" + separator);
|
" removed prefix display=" + display + " separator=" + separator);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if (account.prefix == null && folder.name.endsWith(separator + folder.display)) {
|
|
||||||
db.folder().setFolderDisplay(folder.id, null);
|
|
||||||
EntityLog.log(context, account.name + ":" + folder.name +
|
|
||||||
" restored prefix display=" + folder.display + " separator=" + separator);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compatibility
|
// Compatibility
|
||||||
if ("Inbox_sub".equals(folder.type))
|
if ("Inbox_sub".equals(folder.type))
|
||||||
|
|
Loading…
Reference in New Issue