Merge pull request #11206 from wordpress-mobile/issue/handle-null-fir…

…st-reader-tag-for-filter Refactor getValidTagForSharedPrefs and don't return null value
wordpress-mobile · Feb 3, 2020 · d88767c · d88767c
2 parents a6b57c8 + ceacbd7
commit d88767c
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtils.java
@@ -359,33 +359,32 @@ public static boolean isFollowing(
         }
     }
 
-    public static ReaderTag getValidTagForSharedPrefs(
-            ReaderTag tag,
+    public static @NonNull ReaderTag getValidTagForSharedPrefs(
+            @NonNull ReaderTag tag,
             boolean isTopLevelReader,
             FilteredRecyclerView recyclerView
     ) {
-        ReaderTag validTag = tag;
+        if (!isTopLevelReader) {
+            return tag;
+        }
 
-        if (isTopLevelReader) {
-            if (tag.isDiscover() || tag.isPostsILike() || tag.isBookmarked()
-                    ||
-                (recyclerView != null && recyclerView.isValidFilter(tag))
-            ) {
-                validTag = tag;
+        boolean isValidFilter = (recyclerView != null && recyclerView.isValidFilter(tag));
+        boolean isSpecialTag = tag.isDiscover() || tag.isPostsILike() || tag.isBookmarked();
+        if (!isSpecialTag && !isValidFilter && isFollowing(tag, isTopLevelReader, recyclerView)) {
+            ReaderTag defaultTag = ReaderUtils.getDefaultTag();
+            // it's possible the default tag won't exist if the user just changed the app's
+            // language, in which case default to the first tag in the table
+            if (ReaderTagTable.tagExists(defaultTag)) {
+                return defaultTag;
             } else {
-                if (isFollowing(tag, isTopLevelReader, recyclerView)) {
-                    validTag = ReaderUtils.getDefaultTag();
-
-                    // it's possible the default tag won't exist if the user just changed the app's
-                    // language, in which case default to the first tag in the table
-                    if (!ReaderTagTable.tagExists(validTag)) {
-                        validTag = ReaderTagTable.getFirstTag();
-                    }
+                ReaderTag firstTag = ReaderTagTable.getFirstTag();
+                if (firstTag != null) {
+                    return firstTag;
                 }
             }
         }
 
-        return validTag;
+        return tag;
     }
 
     public static boolean isDefaultTag(ReaderTag tag) {