Prevent NullPointerExceptions when the activity is null (#2982)

For example, during an orientation change.
getodk · Apr 2, 2019 · 8748be4 · 8748be4
1 parent 3ea775e
commit 8748be4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/map/GoogleMapFragment.java b/collect_app/src/main/java/org/odk/collect/android/map/GoogleMapFragment.java
@@ -327,7 +327,10 @@ protected void moveOrAnimateCamera(CameraUpdate movement, boolean animate) {
         if (gpsLocationListener != null) {
             gpsLocationListener.onPoint(lastLocationFix);
         }
-        updateLocationIndicator(toLatLng(lastLocationFix), location.getAccuracy());
+
+        if (getActivity() != null) {
+            updateLocationIndicator(toLatLng(lastLocationFix), location.getAccuracy());
+        }
     }
 
     protected void updateLocationIndicator(LatLng loc, double radius) {
@@ -483,7 +486,7 @@ protected void updateFeature(int featureId) {
     }
 
     protected Marker createMarker(GoogleMap map, MapPoint point, boolean draggable) {
-        if (map == null) {  // during Robolectric tests, map will be null
+        if (map == null || getActivity() == null) {  // during Robolectric tests, map will be null
             return null;
         }
         // A Marker's position is a LatLng with just latitude and longitude