Fix NPE's when accessing ReviewItApp from activity
getActivity() in Fragment may return null when the fragment is not
added to an activity. This leads to NPE's when trying to get the
ReviewItApp from the activity from a callback that may be executed
after the fragment was removed from the activity. Use isAdded() to
skip the callback code when the fragment is not added to an activity.
Change-Id: I4f28660987730ff866cc12dbb76920e34b13a658
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/app/src/main/java/com/google/reviewit/ReviewChangesFragment.java b/app/src/main/java/com/google/reviewit/ReviewChangesFragment.java
index 190eb4f..7b6240a 100644
--- a/app/src/main/java/com/google/reviewit/ReviewChangesFragment.java
+++ b/app/src/main/java/com/google/reviewit/ReviewChangesFragment.java
@@ -102,7 +102,8 @@
new ViewTreeObserver.OnScrollChangedListener() {
@Override
public void onScrollChanged() {
- if (getApp().getQueryHandler().hasNext()
+ if (isAdded()
+ && getApp().getQueryHandler().hasNext()
&& nextPageProgress.getVisibility() == View.GONE) {
View lastChild =
scrollView.getChildAt(scrollView.getChildCount() - 1);
diff --git a/app/src/main/java/com/google/reviewit/SortChangesFragment.java b/app/src/main/java/com/google/reviewit/SortChangesFragment.java
index b5c0a49..8dab019 100644
--- a/app/src/main/java/com/google/reviewit/SortChangesFragment.java
+++ b/app/src/main/java/com/google/reviewit/SortChangesFragment.java
@@ -523,6 +523,10 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ if (!isAdded()) {
+ super.onCreateOptionsMenu(menu, inflater);
+ return;
+ }
SortActionHandler actionHandler = getSortActionHandler();
inflater.inflate(R.menu.menu_sort_changes, menu);
for (int i = 0; i < menu.size(); i++) {
