Fix #683 - Ensure StopOverlay/Map has been initialized prior to setti…

…ng focused stop
OneBusAway · Sep 23, 2016 · 27979de · 27979de
1 parent 3e5d418
commit 27979de
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 24 deletions.
diff --git a/...away-android/src/amazon/java/org/onebusaway/android/map/googlemapsv2/BaseMapFragment.java b/...away-android/src/amazon/java/org/onebusaway/android/map/googlemapsv2/BaseMapFragment.java
@@ -360,11 +360,23 @@ public boolean isRouteDisplayed() {
                 MapParams.MODE_ROUTE.equals(mController.getMode());
     }
 
-    public void setupStopOverlay() {
-        if (mStopOverlay == null) {
-            mStopOverlay = new StopOverlay(getActivity(), mMap);
-            mStopOverlay.setOnFocusChangeListener(this);
+    /**
+     * Initialize the Stop Overlay
+     *
+     * @return true if the overlay was successfully initialized, false if it was not
+     */
+    public boolean setupStopOverlay() {
+        if (mStopOverlay != null) {
+            // Overlay was previously initialized and can be used
+            return true;
         }
+        if (mMap == null) {
+            // We need a map reference to initialize the overlay
+            return false;
+        }
+        mStopOverlay = new StopOverlay(getActivity(), mMap);
+        mStopOverlay.setOnFocusChangeListener(this);
+        return true;
     }
 
     public void setupVehicleOverlay() {
@@ -494,10 +506,8 @@ public void showProgress(boolean show) {
 
     @Override
     public void showStops(List<ObaStop> stops, ObaReferences refs) {
-        // Make sure that the stop overlay has been initialized
-        setupStopOverlay();
-
-        if (stops != null) {
+        // Make sure that the stop overlay has been successfully initialized
+        if (setupStopOverlay() && stops != null) {
             mStopOverlay.populateStops(stops, refs);
         }
     }
@@ -938,10 +948,10 @@ public boolean canWatchMapChanges() {
      */
     @Override
     public void setFocusStop(ObaStop stop, List<ObaRoute> routes) {
-        // Make sure that the stop overlay has been initialized
-        setupStopOverlay();
-
-        mStopOverlay.setFocus(stop, routes);
+        // Make sure that the stop overlay has been successfully initialized before setting focus
+        if (setupStopOverlay()) {
+            mStopOverlay.setFocus(stop, routes);
+        }
     }
 
     @Override

diff --git a/...away-android/src/google/java/org/onebusaway/android/map/googlemapsv2/BaseMapFragment.java b/...away-android/src/google/java/org/onebusaway/android/map/googlemapsv2/BaseMapFragment.java
@@ -349,11 +349,23 @@ public boolean isRouteDisplayed() {
                 MapParams.MODE_ROUTE.equals(mController.getMode());
     }
 
-    public void setupStopOverlay() {
-        if (mStopOverlay == null) {
-            mStopOverlay = new StopOverlay(getActivity(), mMap);
-            mStopOverlay.setOnFocusChangeListener(this);
+    /**
+     * Initialize the Stop Overlay
+     *
+     * @return true if the overlay was successfully initialized, false if it was not
+     */
+    public boolean setupStopOverlay() {
+        if (mStopOverlay != null) {
+            // Overlay was previously initialized and can be used
+            return true;
         }
+        if (mMap == null) {
+            // We need a map reference to initialize the overlay
+            return false;
+        }
+        mStopOverlay = new StopOverlay(getActivity(), mMap);
+        mStopOverlay.setOnFocusChangeListener(this);
+        return true;
     }
 
     public void setupVehicleOverlay() {
@@ -483,10 +495,8 @@ public void showProgress(boolean show) {
 
     @Override
     public void showStops(List<ObaStop> stops, ObaReferences refs) {
-        // Make sure that the stop overlay has been initialized
-        setupStopOverlay();
-
-        if (stops != null) {
+        // Make sure that the stop overlay has been successfully initialized
+        if (setupStopOverlay() && stops != null) {
             mStopOverlay.populateStops(stops, refs);
         }
     }
@@ -927,10 +937,10 @@ public boolean canWatchMapChanges() {
      */
     @Override
     public void setFocusStop(ObaStop stop, List<ObaRoute> routes) {
-        // Make sure that the stop overlay has been initialized
-        setupStopOverlay();
-
-        mStopOverlay.setFocus(stop, routes);
+        // Make sure that the stop overlay has been successfully initialized before setting focus
+        if (setupStopOverlay()) {
+            mStopOverlay.setFocus(stop, routes);
+        }
     }
 
     @Override