Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-03 07:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sort folders on display name

Browse Source
This commit is contained in:
M66B
2018-12-22 15:13:52 +00:00
parent 94eb9af995
commit aa3e4774e0
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,7 +395,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
List<EntityFolder> folders = new ArrayList<>();
folders.addAll(_folders);
EntityFolder.sort(folders);
EntityFolder.sort(context, folders);
all.clear();
for (EntityFolder folder : folders)

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

@@ -1503,7 +1503,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
!EntityFolder.JUNK.equals(folder.type))
targets.add(folder);
EntityFolder.sort(targets);
EntityFolder.sort(context, targets);
return targets;
}

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

@@ -259,7 +259,7 @@ public class EntityFolder implements Serializable {
return folder;
}
static void sort(List<EntityFolder> folders) {
static void sort(final Context context, List<EntityFolder> folders) {
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
@@ -274,9 +274,9 @@ public class EntityFolder implements Serializable {
int c = -f1.synchronize.compareTo(f2.synchronize);
if (c != 0)
return c;
return collator.compare(
f1.name == null ? "" : f1.name,
f2.name == null ? "" : f2.name);
String name1 = f1.getDisplayName(context);
String name2 = f2.getDisplayName(context);
return collator.compare(name1, name2);
}
});
}

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

@@ -1154,7 +1154,7 @@ public class FragmentAccount extends FragmentEx {
}
private void setFolders(List<EntityFolder> folders) {
EntityFolder.sort(folders);
EntityFolder.sort(getContext(), folders);
EntityFolder none = new EntityFolder();
none.name = "";

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

@@ -836,7 +836,7 @@ public class FragmentIdentity extends FragmentEx {
result.identity = db.identity().getIdentity(iid);
result.folders = db.folder().getFolders(aid);
EntityFolder.sort(result.folders);
EntityFolder.sort(context, result.folders);
return result;
}

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

@@ -1079,7 +1079,7 @@ public class FragmentMessages extends FragmentEx {
(fid < 0 ? !folder.unified : !folder.id.equals(fid)))
targets.add(folder);
EntityFolder.sort(targets);
EntityFolder.sort(context, targets);
return targets;
}