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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 60500a2c..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;
 
@@ -47,25 +49,31 @@ public class TelemetryService extends Service {
 
 	static final int MSG_REGISTER_CLIENT   = 1;
 	static final int MSG_UNREGISTER_CLIENT = 2;
-	static final int MSG_CONNECT_TELEBT    = 3;
+	static final int MSG_CONNECT           = 3;
+	static final int MSG_CONNECTED         = 4;
 
 	public static final int STATE_NONE       = 0;
 	public static final int STATE_READY      = 1;
 	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;
 	private AltosBluetooth mAltosBluetooth = null;
-
+	private int state = STATE_NONE;
 	LinkedBlockingQueue<AltosLine> telem;
 
 	// Handler of incoming messages from clients.
@@ -79,24 +87,53 @@ 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:
 				s.mClients.remove(msg.replyTo);
 				if (D) Log.d(TAG, "Client unbound from service");
 				break;
-			case MSG_CONNECT_TELEBT:
+			case MSG_CONNECT:
 				if (D) Log.d(TAG, "Connect command received");
 				s.startAltosBluetooth((BluetoothDevice) msg.obj);
 				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);
 			}
 		}
 	}
 
+	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;
 		}
@@ -104,14 +141,25 @@ 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);
+	}
+
+	private synchronized void setState(int s) {
+		if (D) Log.d(TAG, "setState() " + state + " -> " + s);
+		state = s;
+
+		sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
 	}
 
 	@Override
 	public void onCreate() {
 		// Create a reference to the NotificationManager so that we can update our notifcation text later
 		//mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+
+		telem = new LinkedBlockingQueue<AltosLine>();
+		setState(STATE_READY);
 	}
 
 	@Override