Some multireddit fixes

QuantumBadger · Aug 6, 2016 · c3003cf · c3003cf
1 parent 0354799
commit c3003cf
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 9 deletions.
diff --git a/src/main/java/org/quantumbadger/redreader/adapters/MainMenuListingManager.java b/src/main/java/org/quantumbadger/redreader/adapters/MainMenuListingManager.java
@@ -216,14 +216,11 @@ public MainMenuListingManager(
 			}
 		}
 
-		showMultiredditsHeader(context);
 
-		mAdapter.appendToGroup(
-				GROUP_SUBREDDITS_HEADER,
-				new GroupedRecyclerViewItemListSectionHeaderView(
-						context.getString(R.string.mainmenu_header_subreddits_subscribed)));
 
-		{
+		if(!user.isAnonymous()) {
+			showMultiredditsHeader(context);
+
 			final LoadingSpinnerView multiredditsLoadingSpinnerView = new LoadingSpinnerView(context);
 			final int paddingPx = General.dpToPixels(context, 30);
 			multiredditsLoadingSpinnerView.setPadding(paddingPx, paddingPx, paddingPx, paddingPx);
@@ -233,6 +230,11 @@ public MainMenuListingManager(
 			mAdapter.appendToGroup(GROUP_MULTIREDDITS_ITEMS, multiredditsLoadingItem);
 		}
 
+		mAdapter.appendToGroup(
+				GROUP_SUBREDDITS_HEADER,
+				new GroupedRecyclerViewItemListSectionHeaderView(
+						context.getString(R.string.mainmenu_header_subreddits_subscribed)));
+
 		{
 			final LoadingSpinnerView subredditsLoadingSpinnerView = new LoadingSpinnerView(context);
 			final int paddingPx = General.dpToPixels(context, 30);
@@ -246,6 +248,8 @@ public MainMenuListingManager(
 
 	private void showMultiredditsHeader(@NonNull final Context context) {
 
+		General.checkThisIsUIThread();
+
 		if(mMultiredditHeaderItem == null) {
 			mMultiredditHeaderItem = new GroupedRecyclerViewItemListSectionHeaderView(
 					context.getString(R.string.mainmenu_header_multireddits));
@@ -255,10 +259,25 @@ private void showMultiredditsHeader(@NonNull final Context context) {
 	}
 
 	private void hideMultiredditsHeader() {
+
+		General.checkThisIsUIThread();
+
 		mMultiredditHeaderItem = null;
 		mAdapter.removeAllFromGroup(GROUP_MULTIREDDITS_HEADER);
 	}
 
+	public void setMultiredditsError(final ErrorView errorView) {
+
+		AndroidApi.UI_THREAD_HANDLER.post(new Runnable() {
+			@Override
+			public void run() {
+
+				mAdapter.removeAllFromGroup(GROUP_MULTIREDDITS_ITEMS);
+				mAdapter.appendToGroup(GROUP_MULTIREDDITS_ITEMS, new GroupedRecyclerViewItemFrameLayout(errorView));
+			}
+		});
+	}
+
 	public void setSubredditsError(final ErrorView errorView) {
 
 		AndroidApi.UI_THREAD_HANDLER.post(new Runnable() {

diff --git a/src/main/java/org/quantumbadger/redreader/fragments/MainMenuFragment.java b/src/main/java/org/quantumbadger/redreader/fragments/MainMenuFragment.java
@@ -104,7 +104,7 @@ public MainMenuFragment(
 			multiredditSubscriptionManager.triggerUpdate(new RequestResponseHandler<HashSet<String>, SubredditRequestFailure>() {
 				@Override
 				public void onRequestFailed(SubredditRequestFailure failureReason) {
-					onError(failureReason.asError(context));
+					onMultiredditError(failureReason.asError(context));
 				}
 
 				@Override
@@ -117,7 +117,7 @@ public void onRequestSuccess(HashSet<String> result, long timeCached) {
 			subredditSubscriptionManager.triggerUpdate(new RequestResponseHandler<HashSet<String>, SubredditRequestFailure>() {
 				@Override
 				public void onRequestFailed(SubredditRequestFailure failureReason) {
-					onError(failureReason.asError(context));
+					onSubredditError(failureReason.asError(context));
 				}
 
 				@Override
@@ -168,10 +168,14 @@ public void onMultiredditSubscriptionsChanged(final Collection<String> subscript
 		mManager.setMultireddits(subscriptions);
 	}
 
-	private void onError(final RRError error) {
+	private void onSubredditError(final RRError error) {
 		mManager.setSubredditsError(new ErrorView(getActivity(), error));
 	}
 
+	private void onMultiredditError(final RRError error) {
+		mManager.setMultiredditsError(new ErrorView(getActivity(), error));
+	}
+
 	@Override
 	public void onSelected(final @MainMenuAction int type) {
 		((MainMenuSelectionListener)getActivity()).onSelected(type);