fix compass crash (#114)

streetcomplete · Apr 9, 2017 · 63a4167 · 63a4167
1 parent 28d1373
commit 63a4167
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/tangram/CompassComponent.java b/app/src/main/java/de/westnordost/streetcomplete/tangram/CompassComponent.java
@@ -30,7 +30,7 @@ public interface Listener
 		void onRotationChanged(float rotation);
 	}
 
-	public CompassComponent(Listener listener)
+	public void setListener(Listener listener)
 	{
 		this.listener = listener;
 	}
@@ -111,7 +111,7 @@ else if(currentRotation != targetRotation)
 				if(deltaTime > DURATION) currentRotation = targetRotation;
 				else currentRotation += deltaRotation * deltaTime / DURATION;
 			}
-			listener.onRotationChanged(currentRotation);
+			if(listener != null) listener.onRotationChanged(currentRotation);
 			lastTime = System.currentTimeMillis();
 		}
 	}

diff --git a/app/src/main/java/de/westnordost/streetcomplete/tangram/MapFragment.java b/app/src/main/java/de/westnordost/streetcomplete/tangram/MapFragment.java
@@ -48,7 +48,7 @@ public class MapFragment extends Fragment implements
 		TouchInput.ShoveResponder, TouchInput.RotateResponder,
 		TouchInput.PanResponder, TouchInput.DoubleTapResponder, CompassComponent.Listener
 {
-	private CompassComponent compass = new CompassComponent(this);
+	private CompassComponent compass = new CompassComponent();
 
 	private Marker locationMarker;
 	private Marker accuracyMarker;
@@ -134,6 +134,8 @@ protected void initMap()
 		accuracyMarker.setDrawable(createBitmapDrawableFrom(R.drawable.accuracy_circle));
 		accuracyMarker.setDrawOrder(1);
 
+		compass.setListener(this);
+
 		showLocation();
 		followPosition();
 
@@ -461,6 +463,7 @@ private void saveCameraState()
 	@Override public void onDestroy()
 	{
 		super.onDestroy();
+		compass.setListener(null);
 		if(mapView != null) mapView.onDestroy();
 	}