Dbrant has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/242555

Change subject: Fix possible crash when returning to Nearby fragment.
......................................................................

Fix possible crash when returning to Nearby fragment.

The icon bitmap that represents the nearby markers wasn't being created
soon enough. (There are cases when showNearbyPages() gets called before
the icons are created, thus causing a NPE)

Bug: T114244
Change-Id: I5a09eeae05137d48f9ae2e71e1a78273b399a561
---
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/55/242555/1

diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 1aaffd2..0bec655 100644
--- a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -180,6 +180,8 @@
         mMagnetometer = 
mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
 
         compassViews = new ArrayList<>();
+        mMarkerIconPassive = makeMarkerIcon(false);
+        mMarkerIconActive = makeMarkerIcon(true);
 
         if (!adapter.isEmpty()) {
             setupGeomagneticField();
@@ -209,8 +211,6 @@
             }
         }
 
-        mMarkerIconPassive = makeMarkerIcon(false);
-        mMarkerIconActive = makeMarkerIcon(true);
         setRefreshingState(true);
         initializeMap();
     }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a09eeae05137d48f9ae2e71e1a78273b399a561
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to