X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=218c6d3378103c9f03dcbf74466af4ad626872ea;hb=30d107882b62edf4e6d48923209da6ce3dabeef7;hp=6a23dca32a6ab264ad922f69432dfa963775c0cc;hpb=215d78f06093bd8a8b08a85cae0f1f34aee2a6ec;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 6a23dca3..218c6d33 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -27,10 +27,12 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -55,13 +57,18 @@ public class TelemetryService extends Service {
 	public static final int STATE_CONNECTING = 2;
 	public static final int STATE_CONNECTED  = 3;
 
+	// Key names received from the TelemetryService Handler
+	public static final String KEY_DEVNAME = "key_devname";
+	public static final String KEY_TOAST   = "key_toast";
+
 	// Unique Identification Number for the Notification.
 	// We use it on Notification start, and to cancel it.
 	private int NOTIFICATION = R.string.telemetry_service_label;
 	//private NotificationManager mNM;
 
 	ArrayList<Messenger> mClients = new ArrayList<Messenger>(); // Keeps track of all current registered clients.
-	final Messenger mMessenger = new Messenger(new IncomingHandler()); // Target we publish for clients to send messages to IncomingHandler.
+	final Handler   mHandler   = new IncomingHandler(this);
+	final Messenger mMessenger = new Messenger(mHandler); // Target we publish for clients to send messages to IncomingHandler.
 
 	// Name of the connected device
 	private String mConnectedDeviceName = null;
@@ -80,6 +87,11 @@ public class TelemetryService extends Service {
 			switch (msg.what) {
 			case MSG_REGISTER_CLIENT:
 				s.mClients.add(msg.replyTo);
+				try {
+					msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1));
+				} catch (RemoteException e) {
+					s.mClients.remove(msg.replyTo);
+				}
 				if (D) Log.d(TAG, "Client bound to service");
 				break;
 			case MSG_UNREGISTER_CLIENT:
@@ -92,7 +104,14 @@ public class TelemetryService extends Service {
 				break;
 			case MSG_CONNECTED:
 				if (D) Log.d(TAG, "Connected to device");
+				s.mConnectedDeviceName = msg.getData().getString(KEY_DEVNAME);
+				Message m = Message.obtain(null, AltosDroid.MSG_DEVNAME);
+				Bundle b = new Bundle();
+				b.putString(AltosDroid.KEY_DEVNAME, s.mConnectedDeviceName);
+				m.setData(b);
+				s.sendMessageToClients(m);
 				s.setState(STATE_CONNECTED);
+				s.mAltosBluetooth.add_monitor(s.telem);
 				break;
 			default:
 				super.handleMessage(msg);
@@ -100,9 +119,21 @@ public class TelemetryService extends Service {
 		}
 	}
 
+	private void sendMessageToClients(Message m) {
+		for (int i=mClients.size()-1; i>=0; i--) {
+			try {
+				mClients.get(i).send(m);
+			} catch (RemoteException e) {
+				mClients.remove(i);
+			}
+		}
+	}
+
 	private void stopAltosBluetooth() {
+		if (D) Log.i(TAG, "Stopping BT");
 		setState(STATE_READY);
 		if (mAltosBluetooth != null) {
+			if (D) Log.i(TAG, "Closing AltosBluetooth");
 			mAltosBluetooth.close();
 			mAltosBluetooth = null;
 		}
@@ -110,8 +141,8 @@ public class TelemetryService extends Service {
 	}
 
 	private void startAltosBluetooth(BluetoothDevice d) {
-		mAltosBluetooth = new AltosBluetooth(d);
-		mAltosBluetooth.add_monitor(telem);
+			if (D) Log.i(TAG, "Connecting to " + d.getName());
+			mAltosBluetooth = new AltosBluetooth(d, mHandler);
 			setState(STATE_CONNECTING);
 	}