X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=71ac298e77b6d6000d4620db1a16eddd57871b5b;hp=db7815f3a7ab5ac4fcd069bd6f35bff95785b305;hb=251263f72a1c189aac709d3d0410eb916a9f66d6;hpb=bfa6cd8934b993bd4a67cfc7a4eeecf9b11915ef

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index db7815f3..71ac298e 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -133,7 +133,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 			switch (msg.what) {
 			case MSG_STATE:
-				AltosDebug.debug("MSG_STATE");
 				if (msg.obj == null) {
 					AltosDebug.debug("telemetry_state null!");
 					return;
@@ -141,7 +140,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				ad.update_state((TelemetryState) msg.obj);
 				break;
 			case MSG_UPDATE_AGE:
-				AltosDebug.debug("MSG_UPDATE_AGE");
 				ad.update_age();
 				break;
 			}
@@ -654,6 +652,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		super.onStart();
 		AltosDebug.debug("++ ON START ++");
 
+		set_switch_time();
+
 		noticeIntent(getIntent());
 
 		// Start Telemetry Service
@@ -691,12 +691,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	public void onStop() {
 		super.onStop();
 		AltosDebug.debug("-- ON STOP --");
-
-		doUnbindService();
-		if (mAltosVoice != null) {
-			mAltosVoice.stop();
-			mAltosVoice = null;
-		}
 	}
 
 	@Override
@@ -704,7 +698,11 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		super.onDestroy();
 		AltosDebug.debug("--- ON DESTROY ---");
 
-		if (mAltosVoice != null) mAltosVoice.stop();
+		doUnbindService();
+		if (mAltosVoice != null) {
+			mAltosVoice.stop();
+			mAltosVoice = null;
+		}
 		stop_timer();
 	}
 
@@ -859,6 +857,26 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		update_state(null);
 	}
 
+	void touch_trackers(Integer[] serials) {
+		AlertDialog.Builder builder_tracker = new AlertDialog.Builder(this);
+		builder_tracker.setTitle("Select Tracker");
+		final String[] trackers = new String[serials.length + 1];
+		trackers[0] = "Auto";
+		for (int i = 0; i < serials.length; i++)
+			trackers[i+1] = String.format("%d", serials[i]);
+		builder_tracker.setItems(trackers,
+					 new DialogInterface.OnClickListener() {
+						 public void onClick(DialogInterface dialog, int item) {
+							 if (item == 0)
+								 select_tracker(0);
+							 else
+								 select_tracker(Integer.parseInt(trackers[item]));
+						 }
+					 });
+		AlertDialog alert_tracker = builder_tracker.create();
+		alert_tracker.show();
+	}
+
 	void delete_track(int serial) {
 		try {
 			mService.send(Message.obtain(null, TelemetryService.MSG_DELETE_SERIAL, (Integer) serial));
@@ -998,6 +1016,12 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 	static String direction(AltosGreatCircle from_receiver,
 			     Location receiver) {
+		if (from_receiver == null)
+			return null;
+
+		if (receiver == null)
+			return null;
+
 		if (!receiver.hasBearing())
 			return null;
 
@@ -1016,8 +1040,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		else if (iheading < -179 || 179 < iheading)
 			return "backwards";
 		else if (iheading < 0)
-			return String.format("left %d", -iheading);
+			return String.format("left %d°", -iheading);
 		else
-			return String.format("right %d", iheading);
+			return String.format("right %d°", iheading);
 	}
 }