Find Location: Fix for missing loading spinner (#1022)

QuantumBadger · Jun 27, 2022 · faf0e0f · faf0e0f
1 parent 3c87f1f
commit faf0e0f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/assets/changelog-alpha.txt b/assets/changelog-alpha.txt
@@ -1,5 +1,6 @@
 /Alpha 317 (2022-06-27)
 Ability to hide subreddit header (thanks to Cameron Merkel)
+Find Location: Fix for missing loading spinner
 
 /Alpha 316 (2022-06-27)
 Renamed "Find Subreddit" to "Find Location"

diff --git a/src/main/java/org/quantumbadger/redreader/activities/SubredditSearchActivity.java b/src/main/java/org/quantumbadger/redreader/activities/SubredditSearchActivity.java
@@ -157,11 +157,6 @@ private void updateList() {
 
 		Log.i(TAG, "Updating list");
 
-		if(!mLoadingItem.isHidden()) {
-			mLoadingItem.setHidden(true);
-			mRecyclerViewAdapter.updateHiddenStatus();
-		}
-
 		if(mSubscriptionsErrorItem.get().isPresent()) {
 
 			mRecyclerViewAdapter.removeAllFromGroup(GROUP_SUBREDDITS);
@@ -190,6 +185,9 @@ private void updateList() {
 				requestSubscriptions();
 			}
 
+			mLoadingItem.setHidden(false);
+			mRecyclerViewAdapter.updateHiddenStatus();
+
 		} else {
 
 			final HashSet<String> shownSubreddits = new HashSet<>(256);
@@ -249,13 +247,20 @@ private void updateList() {
 								mSubredditItemCache.get(subreddit));
 					}
 				}
+
+				mLoadingItem.setHidden(false);
+				mRecyclerViewAdapter.updateHiddenStatus();
+
 			} else if(!currentQuery.trim().isEmpty()) {
 
 				if(mQueryErrorItem.get().isPresent()) {
 					mRecyclerViewAdapter.appendToGroup(
 							GROUP_SUBREDDITS,
 							mQueryErrorItem.get().get());
 
+					mLoadingItem.setHidden(true);
+					mRecyclerViewAdapter.updateHiddenStatus();
+
 				} else {
 					mLoadingItem.setHidden(false);
 					mRecyclerViewAdapter.updateHiddenStatus();
@@ -264,9 +269,6 @@ private void updateList() {
 
 			mRecyclerViewAdapter.notifyDataSetChanged();
 			mSubredditItemCache.nextGeneration();
-
-			mLoadingItem.setHidden(true);
-			mRecyclerViewAdapter.updateHiddenStatus();
 		}
 	}
 
@@ -333,7 +335,6 @@ public boolean isHidden() {
 
 		final RedditAccount user
 				= RedditAccountManager.getInstance(this).getDefaultAccount();
-
 		final RedditSubredditSubscriptionManager subscriptionManager
 				= RedditSubredditSubscriptionManager.getSingleton(this, user);