Fix subreddit autocomplete

QuantumBadger · Apr 8, 2020 · 32bff3d · 32bff3d
1 parent 3bea09f
commit 32bff3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/org/quantumbadger/redreader/activities/MainActivity.java b/src/main/java/org/quantumbadger/redreader/activities/MainActivity.java
@@ -49,6 +49,7 @@
 import org.quantumbadger.redreader.common.General;
 import org.quantumbadger.redreader.common.LinkHandler;
 import org.quantumbadger.redreader.common.PrefsUtility;
+import org.quantumbadger.redreader.common.collections.CollectionStream;
 import org.quantumbadger.redreader.fragments.AccountListDialog;
 import org.quantumbadger.redreader.fragments.ChangelogDialog;
 import org.quantumbadger.redreader.fragments.CommentListingFragment;
@@ -482,10 +483,12 @@ public void onSelected(final @MainMenuFragment.MainMenuAction int type) {
 				final ArrayList<SubredditCanonicalId> subredditHistory = RedditSubredditHistory.getSubredditsSorted(
 						RedditAccountManager.getInstance(this).getDefaultAccount());
 
-				final ArrayAdapter<SubredditCanonicalId> autocompleteAdapter = new ArrayAdapter<>(
+				final ArrayAdapter<String> autocompleteAdapter = new ArrayAdapter<>(
 						this,
 						android.R.layout.simple_dropdown_item_1line,
-						subredditHistory.toArray(new SubredditCanonicalId[0]));
+						new CollectionStream<>(subredditHistory)
+								.map(SubredditCanonicalId::getDisplayNameLowercase)
+								.collect(new ArrayList<>()));
 
 				editText.setAdapter(autocompleteAdapter);
 				editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {

diff --git a/src/main/java/org/quantumbadger/redreader/reddit/RedditSubredditHistory.java b/src/main/java/org/quantumbadger/redreader/reddit/RedditSubredditHistory.java
@@ -16,8 +16,7 @@ public class RedditSubredditHistory {
 
 	private static final HashMap<RedditAccount, HashSet<SubredditCanonicalId>> SUBREDDITS = new HashMap<>();
 
-	private static HashSet<SubredditCanonicalId> getForAccount(
-			final RedditAccount account) {
+	private static HashSet<SubredditCanonicalId> getForAccount(final RedditAccount account) {
 
 		HashSet<SubredditCanonicalId> result = SUBREDDITS.get(account);