MainActivity: fix NPE presumably caused by a rare race condition

mvglasow · mvglasow · commit bb2df5e166ae · 2018-03-28T14:14:54.000+02:00
Signed-off-by: mvglasow &lt;michael -at- vonglasow.com&gt;
diff --git a/src/com/vonglasow/michael/satstat/ui/MapSectionFragment.java b/src/com/vonglasow/michael/satstat/ui/MapSectionFragment.java
@@ -179,8 +179,11 @@ protected void applyLocationProviderStyle(Context context, String provider, Stri
 			needsRedraw = needsRedraw || (isStyleChanged && marker.isVisible());
 		}
 
-		if (needsRedraw)
-			mapMap.getLayerManager().redrawLayers();
+		if (needsRedraw) {
+			LayerManager manager = mapMap.getLayerManager();
+			if (manager != null)
+				manager.redrawLayers();
+		}
 		providerAppliedStyles.put(provider, sn);
 		style.recycle();
 	}

Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,11 @@ protected void applyLocationProviderStyle(Context context, String provider, Stri`
`179`	`179`	`needsRedraw = needsRedraw \|\| (isStyleChanged && marker.isVisible());`
`180`	`180`	`}`
`181`	`181`
`182`		`- if (needsRedraw)`
`183`		`- mapMap.getLayerManager().redrawLayers();`
	`182`	`+ if (needsRedraw) {`
	`183`	`+ LayerManager manager = mapMap.getLayerManager();`
	`184`	`+ if (manager != null)`
	`185`	`+ manager.redrawLayers();`
	`186`	`+ }`
`184`	`187`	`providerAppliedStyles.put(provider, sn);`
`185`	`188`	`style.recycle();`
`186`	`189`	`}`