mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-14 16:10:39 +00:00
Code Issues Releases Wiki Activity

Revert "Fixed widget folder sort order"

Browse source 
This reverts commit 3093503590.
This commit is contained in:
M66B 2020-05-29 11:17:25 +02:00
parent f65c375a76
commit a2204094c7
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
View file

@ -34,12 +34,9 @@ import android.widget.Spinner;
import androidx.constraintlayout.widget.Group;
import androidx.preference.PreferenceManager;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
public class ActivityWidgetUnified extends ActivityBase {
private int appWidgetId;
@ -156,19 +153,8 @@ public class ActivityWidgetUnified extends ActivityBase {
DB db = DB.getInstance(context);
List<TupleFolderEx> folders = db.folder().getFoldersEx(account);
if (folders != null) {
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
Collections.sort(folders, new Comparator<TupleFolderEx>() {
@Override
public int compare(TupleFolderEx o1, TupleFolderEx o2) {
return collator.compare(o1.name, o2.name);
}
});
}
if (folders != null && folders.size() > 0)
Collections.sort(folders, folders.get(0).getComparator(context));
return folders;
}