Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-03 19:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed folder sort order

Browse Source
This commit is contained in:
M66B
2019-06-28 09:46:18 +02:00
parent 851ead228c
commit 7ecfd7a788
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/EntityFolder.java
View File

@@ -413,6 +413,9 @@ public class EntityFolder extends EntityOrder implements Serializable {
if (c != 0)
return c;
if (context == null)
return collator.compare(f1.name, f2.name);
String name1 = f1.getDisplayName(context);
String name2 = f2.getDisplayName(context);
return collator.compare(name1, name2);

4
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@@ -617,7 +617,7 @@ public class FragmentAccount extends FragmentBase {
altJunk.type = EntityFolder.JUNK;
if (result.folders.size() > 0)
Collections.sort(result.folders, result.folders.get(0).getComparator(context));
Collections.sort(result.folders, result.folders.get(0).getComparator(null));
}
return result;
@@ -1221,7 +1221,7 @@ public class FragmentAccount extends FragmentBase {
List<EntityFolder> folders = db.folder().getFolders(account);
if (folders != null && folders.size() > 0)
Collections.sort(folders, folders.get(0).getComparator(context));
Collections.sort(folders, folders.get(0).getComparator(null));
return folders;
}

5
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -621,7 +621,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
for (EntityAccount account : accounts) {
List<EntityFolder> folders = db.folder().getFolders(account.id);
if (folders.size() > 0)
Collections.sort(folders, folders.get(0).getComparator(context));
Collections.sort(folders, folders.get(0).getComparator(null));
result.put(account, folders);
}
@@ -640,7 +640,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
.addSubMenu(Menu.NONE, 0, order++, account.name);
int sorder = 1;
for (EntityFolder folder : result.get(account)) {
MenuItem item = smenu.add(Menu.NONE, 1, sorder++, folder.getDisplayName(getContext()));
MenuItem item = smenu.add(Menu.NONE, 1, sorder++,
Helper.localizeFolderName(getContext(), folder.name));
item.setIntent(new Intent().putExtra("target", folder.id));
}
}

2
app/src/main/java/eu/faircode/email/FragmentRule.java
View File

@@ -380,7 +380,7 @@ public class FragmentRule extends FragmentBase {
data.folders = new ArrayList<>();
if (data.folders.size() > 0)
Collections.sort(data.folders, data.folders.get(0).getComparator(context));
Collections.sort(data.folders, data.folders.get(0).getComparator(null));
data.identities = db.identity().getIdentities(aid);
data.answers = db.answer().getAnswers(false);