Search: sort bookmarks by name/JID

tinelix · Oct 22, 2019 · f396fa9 · f396fa9
1 parent b28e961
commit f396fa9
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/org/yaxim/androidclient/list/EntityListLoader.java b/src/org/yaxim/androidclient/list/EntityListLoader.java
@@ -25,6 +25,9 @@
 import org.yaxim.androidclient.util.StatusMode;
 import org.yaxim.androidclient.util.XMPPHelper;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Locale;
@@ -53,6 +56,19 @@ void loadBookmarksOrThrow(XMPPConnection c) throws Exception {
 		List<BookmarkedConference> list = BookmarkManager.getBookmarkManager(c).getBookmarkedConferences();
 		if (isCancelled())
 			return;
+		/* make a mutable array of the response, sort by name */
+		list = new ArrayList<>(list);
+		Collections.sort(list, new Comparator<BookmarkedConference>() {
+			private String sortableName(BookmarkedConference bc) {
+				if (!TextUtils.isEmpty(bc.getName()))
+					return bc.getName();
+				return bc.getJid().toString();
+			}
+			@Override
+			public int compare(BookmarkedConference bookmarkedConference, BookmarkedConference with) {
+				return sortableName(bookmarkedConference).compareToIgnoreCase(sortableName(with));
+			}
+		});
 		for (BookmarkedConference conf : list) {
 			StatusMode sm = conf.isAutoJoin() ? StatusMode.available : StatusMode.offline;
 			String name = conf.getName();