Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173337
Change subject: Fix possible crash(es) on screen rotation.
......................................................................
Fix possible crash(es) on screen rotation.
- One crash may happen in NearbyFragment, where we call
invalidateOptionsMenu (unnecessarily) when we're no longer attached to
the activity.
- Another similar crash may happen in PageViewFragment.
Change-Id: I1b3330185e5b54cbb16e064108fe35c141c901ca
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/37/173337/1
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index b515bca..a77e780 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -113,7 +113,6 @@
super.onCreate(savedInstanceState);
app = WikipediaApp.getInstance();
site = app.getPrimarySite();
- adapter = new NearbyAdapter(getActivity(), new
ArrayList<NearbyPage>());
}
@Override
@@ -132,6 +131,7 @@
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
setHasOptionsMenu(true);
+ adapter = new NearbyAdapter(getActivity(), new
ArrayList<NearbyPage>());
nearbyList.setAdapter(adapter);
nearbyList.setOnItemClickListener(new
AdapterView.OnItemClickListener() {
@@ -438,9 +438,6 @@
((PageActivity)getActivity()).updateProgressBar(true, true, 0);
} else {
((PageActivity)getActivity()).updateProgressBar(false, true, 0);
- }
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- getActivity().invalidateOptionsMenu();
}
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 41f4e76..5d4db85 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -506,6 +506,9 @@
}
private void setState(int state, int subState) {
+ if (!isAdded()) {
+ return;
+ }
this.state = state;
this.subState = subState;
getActivity().supportInvalidateOptionsMenu();
--
To view, visit https://gerrit.wikimedia.org/r/173337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b3330185e5b54cbb16e064108fe35c141c901ca
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
