[bug] NPE in DiscoveryFragment (#241)

* attempting to fix bug where the discoveryfragment.viewmodel is null * just checking if viewmodel is null vs ondetached because that only gets called when .detach is called
kickstarter · Apr 23, 2018 · 77d2d90 · 77d2d90
1 parent 7ea0861
commit 77d2d90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/src/main/java/com/kickstarter/ui/adapters/DiscoveryPagerAdapter.java b/app/src/main/java/com/kickstarter/ui/adapters/DiscoveryPagerAdapter.java
@@ -68,6 +68,7 @@ public CharSequence getPageTitle(final int position) {
   public void takeCategoriesForPosition(final @NonNull List<Category> categories, final int position) {
     Observable.from(this.fragments)
       .filter(DiscoveryFragment::isInstantiated)
+      .filter(DiscoveryFragment::isAttached)
       .filter(frag -> {
         final int fragmentPosition = frag.getArguments().getInt(ArgumentsKey.DISCOVERY_SORT_POSITION);
         return fragmentPosition == position;
@@ -81,6 +82,7 @@ public void takeCategoriesForPosition(final @NonNull List<Category> categories,
   public void takeParams(final @NonNull DiscoveryParams params) {
     Observable.from(this.fragments)
       .filter(DiscoveryFragment::isInstantiated)
+      .filter(DiscoveryFragment::isAttached)
       .filter(frag -> {
         final int fragmentPosition = frag.getArguments().getInt(ArgumentsKey.DISCOVERY_SORT_POSITION);
         return DiscoveryUtils.positionFromSort(params.sort()) == fragmentPosition;
@@ -94,6 +96,7 @@ public void takeParams(final @NonNull DiscoveryParams params) {
   public void clearPages(final @NonNull List<Integer> pages) {
     Observable.from(this.fragments)
       .filter(DiscoveryFragment::isInstantiated)
+      .filter(DiscoveryFragment::isAttached)
       .filter(frag -> {
         final int fragmentPosition = frag.getArguments().getInt(ArgumentsKey.DISCOVERY_SORT_POSITION);
         return pages.contains(fragmentPosition);

diff --git a/app/src/main/java/com/kickstarter/ui/fragments/DiscoveryFragment.java b/app/src/main/java/com/kickstarter/ui/fragments/DiscoveryFragment.java
@@ -114,6 +114,10 @@ public void onDetach() {
     }
   }
 
+  public boolean isAttached() {
+    return this.viewModel != null;
+  }
+
   public boolean isInstantiated() {
     return this.recyclerView != null;
   }