Crash fix when subreddit subscriptions aren't ready

QuantumBadger · Jun 14, 2017 · 707fdd1 · 707fdd1
1 parent c00ef20
commit 707fdd1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/src/main/java/org/quantumbadger/redreader/adapters/MainMenuListingManager.java b/src/main/java/org/quantumbadger/redreader/adapters/MainMenuListingManager.java
@@ -539,13 +539,19 @@ public boolean onLongClick(final View view) {
 					}
 
 					if (!RedditAccountManager.getInstance(mActivity).getDefaultAccount().isAnonymous()) {
-						if (itemPref.contains(SubredditAction.SUBSCRIBE)) {
-							if (RedditSubredditSubscriptionManager
-									.getSingleton(mActivity, RedditAccountManager.getInstance(mActivity).getDefaultAccount())
-									.getSubscriptionState(subredditCanonicalName) == RedditSubredditSubscriptionManager.SubredditSubscriptionState.SUBSCRIBED) {
-								menu.add(new SubredditMenuItem(mActivity, R.string.options_unsubscribe, SubredditAction.UNSUBSCRIBE));
-							} else {
-								menu.add(new SubredditMenuItem(mActivity, R.string.options_subscribe, SubredditAction.SUBSCRIBE));
+
+						if(itemPref.contains(SubredditAction.SUBSCRIBE)) {
+
+							final RedditSubredditSubscriptionManager subscriptionManager = RedditSubredditSubscriptionManager
+									.getSingleton(mActivity, RedditAccountManager.getInstance(mActivity).getDefaultAccount());
+
+							if(subscriptionManager.areSubscriptionsReady()) {
+								if(subscriptionManager.getSubscriptionState(subredditCanonicalName)
+										== RedditSubredditSubscriptionManager.SubredditSubscriptionState.SUBSCRIBED) {
+									menu.add(new SubredditMenuItem(mActivity, R.string.options_unsubscribe, SubredditAction.UNSUBSCRIBE));
+								} else {
+									menu.add(new SubredditMenuItem(mActivity, R.string.options_subscribe, SubredditAction.SUBSCRIBE));
+								}
 							}
 						}
 					}

diff --git a/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java b/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedPost.java
@@ -251,12 +251,18 @@ public static void showActionMenu(
 
 				if (!RedditAccountManager.getInstance(activity).getDefaultAccount().isAnonymous()) {
 					if (itemPref.contains(Action.SUBSCRIBE)) {
-						if (RedditSubredditSubscriptionManager
-								.getSingleton(activity, RedditAccountManager.getInstance(activity).getDefaultAccount())
-								.getSubscriptionState(subredditCanonicalName) == RedditSubredditSubscriptionManager.SubredditSubscriptionState.SUBSCRIBED) {
-							menu.add(new RPVMenuItem(activity, R.string.action_unsubscribe_subreddit, Action.UNSUBSCRIBE));
-						} else {
-							menu.add(new RPVMenuItem(activity, R.string.action_subscribe_subreddit, Action.SUBSCRIBE));
+
+						final RedditSubredditSubscriptionManager subscriptionManager = RedditSubredditSubscriptionManager
+								.getSingleton(activity, RedditAccountManager.getInstance(activity).getDefaultAccount());
+
+						if(subscriptionManager.areSubscriptionsReady()) {
+
+							if(subscriptionManager.getSubscriptionState(subredditCanonicalName)
+									== RedditSubredditSubscriptionManager.SubredditSubscriptionState.SUBSCRIBED) {
+								menu.add(new RPVMenuItem(activity, R.string.action_unsubscribe_subreddit, Action.UNSUBSCRIBE));
+							} else {
+								menu.add(new RPVMenuItem(activity, R.string.action_subscribe_subreddit, Action.SUBSCRIBE));
+							}
 						}
 					}
 				}