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

Remove folder prefixes only

This commit is contained in:
M66B 2019-05-05 20:13:30 +02:00
parent 2135d9bfa5
commit 02fe5b839b
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -791,18 +791,10 @@ class Core {
if (folder.subscribed == null || !folder.subscribed.equals(subscribed))
db.folder().setFolderSubscribed(folder.id, subscribed.get(ifolder));
if (folder.display == null) {
if (display != null) {
db.folder().setFolderDisplay(folder.id, display);
EntityLog.log(context, account.name + ":" + folder.name +
" 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);
}
if (folder.display == null && display != null) {
db.folder().setFolderDisplay(folder.id, display);
EntityLog.log(context, account.name + ":" + folder.name +
" removed prefix display=" + display + " separator=" + separator);
}
// Compatibility