AndroidGCS: Also make the map disconnect its listeners.

androidgcs/src/org/openpilot/androidgcs/UAVLocation.java

@@ -23,14 +23,18 @@
 
 package org.openpilot.androidgcs;
 
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Observable;
 import java.util.Observer;
+import java.util.Set;
 
+import org.openpilot.androidgcs.fragments.ObjectManagerFragment;
 import org.openpilot.androidgcs.telemetry.OPTelemetryService;
 import org.openpilot.androidgcs.telemetry.OPTelemetryService.LocalBinder;
 import org.openpilot.androidgcs.telemetry.OPTelemetryService.TelemTask;
-import org.openpilot.uavtalk.UAVDataObject;
 import org.openpilot.uavtalk.UAVObject;
 import org.openpilot.uavtalk.UAVObjectManager;
 
@@ -46,6 +50,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.IBinder;
 import android.util.Log;
 import android.view.Menu;
@@ -163,40 +168,10 @@ public class UAVLocation extends MapActivity
 
 	void onOPConnected() {
 		UAVObject obj = objMngr.getObject("HomeLocation");
-		if(obj != null)
+		registerObjectUpdates(obj);
-			obj.addUpdatedObserver(new Observer() {
-				@Override
-				public void update(Observable observable, Object data) {
-					UAVDataObject obj = (UAVDataObject) data;
-					Double lat = obj.getField("Latitude").getDouble() / 10;
-					Double lon = obj.getField("Longitude").getDouble() / 10;
-					homeLocation = new GeoPoint(lat.intValue(), lon.intValue());
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-							mapController.setCenter(homeLocation);
-						}
-					});
-					System.out.println("HomeLocation: " + homeLocation.toString());
-				}
-			});
-		obj.updateRequested();
 
 		obj = objMngr.getObject("PositionActual");
-		if(obj != null)
+		registerObjectUpdates(obj);
-			obj.addUpdatedObserver(new Observer() {
-				@Override
-				public void update(Observable observable, Object data) {
-					uavLocation = getUavLocation();
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-							mapView.invalidate();
-						}
-					});
-				}
-			});
-
 	}
 
 	private GeoPoint getUavLocation() {
@@ -231,7 +206,7 @@ public class UAVLocation extends MapActivity
 	}
 
 	void onOPDisconnected() {
-
+		unregisterObjectUpdates();
 	}
 
 	@Override
@@ -307,6 +282,9 @@ public class UAVLocation extends MapActivity
 		unbindService(mConnection);
 		unregisterReceiver(connectedReceiver);
 		connectedReceiver = null;
+
+		// TODO: The register and unregister probably should move to onPause / onResume
+		unregisterObjectUpdates();
 	}
 
 	public void onBind() {
@@ -344,4 +322,96 @@ public class UAVLocation extends MapActivity
 			onOPDisconnected();
 		}
 	};
+
+/******* STRAIGHT COPY PASTE FROM ObjectManagerActivity *************/
+	/**
+	 * Called whenever any objects subscribed to via registerObjects
+	 */
+	protected void objectUpdated(UAVObject obj) {
+		if (obj == null)
+			return;
+		if (obj.getName().compareTo("HomeLocation") == 0) {
+			Double lat = obj.getField("Latitude").getDouble() / 10;
+			Double lon = obj.getField("Longitude").getDouble() / 10;
+			homeLocation = new GeoPoint(lat.intValue(), lon.intValue());
+			mapController.setCenter(homeLocation);
+		} else if (obj.getName().compareTo("PositionActual") == 0) {
+			uavLocation = getUavLocation();
+			mapView.invalidate();
+		}
+	}
+
+	/**
+	 * A message handler and a custom Observer to use it which calls
+	 * objectUpdated with the right object type
+	 */
+	final Handler uavobjHandler = new Handler();
+	private class ActivityUpdatedObserver implements Observer  {
+		UAVObject obj;
+		ActivityUpdatedObserver(UAVObject obj) { this.obj = obj; };
+		@Override
+		public void update(Observable observable, Object data) {
+			uavobjHandler.post(new Runnable() {
+				@Override
+				public void run() { objectUpdated(obj); }
+			});
+		}
+	};
+	private class FragmentUpdatedObserver implements Observer  {
+		UAVObject obj;
+		ObjectManagerFragment frag;
+		FragmentUpdatedObserver(UAVObject obj, ObjectManagerFragment frag) {
+			this.obj = obj;
+			this.frag = frag;
+		};
+		@Override
+		public void update(Observable observable, Object data) {
+			uavobjHandler.post(new Runnable() {
+				@Override
+				public void run() { frag.objectUpdated(obj); }
+			});
+		}
+	};
+
+
+	/**
+	 * Register an activity to receive updates from this object
+	 *
+	 * the objectUpdated() method will be called in the original UI thread
+	 */
+	HashMap<Observer, UAVObject> listeners = new HashMap<Observer,UAVObject>();
+	protected void registerObjectUpdates(UAVObject object) {
+		Observer o = new ActivityUpdatedObserver(object);
+		object.addUpdatedObserver(o);
+		listeners.put(o,  object);
+	}
+	/**
+	 * Unregister all the objects connected to this activity
+	 */
+	protected void unregisterObjectUpdates()
+	{
+		Set<Observer> s = listeners.keySet();
+		Iterator<Observer> i = s.iterator();
+		while (i.hasNext()) {
+			Observer o = i.next();
+			UAVObject obj = listeners.get(o);
+			obj.removeUpdatedObserver(o);
+		}
+		listeners.clear();
+	}
+	public void registerObjectUpdates(UAVObject object,
+			ObjectManagerFragment frag) {
+		Observer o = new FragmentUpdatedObserver(object, frag);
+		object.addUpdatedObserver(o);
+		listeners.put(o, object);
+	}
+	protected void registerObjectUpdates(List<List<UAVObject>> objects) {
+		ListIterator<List<UAVObject>> li = objects.listIterator();
+		while(li.hasNext()) {
+			ListIterator<UAVObject> li2 = li.next().listIterator();
+			while(li2.hasNext())
+				registerObjectUpdates(li2.next());
+		}
+	}
+
 }