|
|
@ -199,6 +199,7 @@ import java.util.Arrays;
|
|
|
|
import java.util.Calendar;
|
|
|
|
import java.util.Calendar;
|
|
|
|
import java.util.Collection;
|
|
|
|
import java.util.Collection;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.Collections;
|
|
|
|
|
|
|
|
import java.util.Comparator;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.HashMap;
|
|
|
|
import java.util.HashMap;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
@ -2661,6 +2662,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
|
|
|
|
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
|
|
|
|
Collections.sort(groups, collator);
|
|
|
|
Collections.sort(groups, collator);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Collections.sort(answers, new Comparator<EntityAnswer>() {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public int compare(EntityAnswer a1, EntityAnswer a2) {
|
|
|
|
|
|
|
|
if (!BuildConfig.DEBUG || a1.applied.equals(a2.applied))
|
|
|
|
|
|
|
|
return collator.compare(a1.name, a2.name);
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
return -a1.applied.compareTo(a2.applied);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
int order = 0;
|
|
|
|
int order = 0;
|
|
|
|
|
|
|
|
|
|
|
|
Map<String, SubMenu> map = new HashMap<>();
|
|
|
|
Map<String, SubMenu> map = new HashMap<>();
|
|
|
|