Dbrant has submitted this change and it was merged.

Change subject: Avoid meltdown in setupGeomagneticField
......................................................................


Avoid meltdown in setupGeomagneticField

Initialize warp stabilizers! ;)

bug: 72091
Change-Id: I73813e41bd4c74e7664c2524dd546a2cdb8797e6
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
1 file changed, 8 insertions(+), 4 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved



diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index d55926d..a0738fd 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -202,11 +202,15 @@
             setupGeomagneticField();
             showNearbyPages(lastResult);
         } else if (savedInstanceState != null) {
-            lastLocation = 
savedInstanceState.getParcelable(NEARBY_LAST_LOCATION);
             nextLocation = 
savedInstanceState.getParcelable(NEARBY_NEXT_LOCATION);
-            lastResult = savedInstanceState.getParcelable(NEARBY_LAST_RESULT);
-            setupGeomagneticField();
-            showNearbyPages(lastResult);
+            if (nextLocation != null) {
+                lastLocation = 
savedInstanceState.getParcelable(NEARBY_LAST_LOCATION);
+                lastResult = 
savedInstanceState.getParcelable(NEARBY_LAST_RESULT);
+                setupGeomagneticField();
+                showNearbyPages(lastResult);
+            } else {
+                setRefreshingState(true);
+            }
         } else {
             setRefreshingState(true);
         }

-- 
To view, visit https://gerrit.wikimedia.org/r/167299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I73813e41bd4c74e7664c2524dd546a2cdb8797e6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to