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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 2ee7fe58..6a23dca3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -17,11 +17,12 @@
 
 package org.altusmetrum.AltosDroid;
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import android.app.Notification;
-import android.app.NotificationManager;
+//import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
@@ -46,7 +47,8 @@ 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;
@@ -56,7 +58,7 @@ public class TelemetryService extends Service {
 	// 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;
+	//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.
@@ -64,26 +66,33 @@ public class TelemetryService extends Service {
 	// 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.
-	class IncomingHandler extends Handler {
+	static class IncomingHandler extends Handler {
+		private final WeakReference<TelemetryService> service;
+		IncomingHandler(TelemetryService s) { service = new WeakReference<TelemetryService>(s); }
+
 		@Override
 		public void handleMessage(Message msg) {
+			TelemetryService s = service.get();
 			switch (msg.what) {
 			case MSG_REGISTER_CLIENT:
-				mClients.add(msg.replyTo);
+				s.mClients.add(msg.replyTo);
 				if (D) Log.d(TAG, "Client bound to service");
 				break;
 			case MSG_UNREGISTER_CLIENT:
-				mClients.remove(msg.replyTo);
+				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");
-				TeleBT_stop();
-				TeleBT_start((BluetoothDevice) msg.obj);
+				s.startAltosBluetooth((BluetoothDevice) msg.obj);
+				break;
+			case MSG_CONNECTED:
+				if (D) Log.d(TAG, "Connected to device");
+				s.setState(STATE_CONNECTED);
 				break;
 			default:
 				super.handleMessage(msg);
@@ -91,7 +100,8 @@ public class TelemetryService extends Service {
 		}
 	}
 
-	private void TeleBT_stop() {
+	private void stopAltosBluetooth() {
+		setState(STATE_READY);
 		if (mAltosBluetooth != null) {
 			mAltosBluetooth.close();
 			mAltosBluetooth = null;
@@ -99,15 +109,26 @@ public class TelemetryService extends Service {
 		telem.clear();
 	}
 
-	private void TeleBT_start(BluetoothDevice d) {
+	private void startAltosBluetooth(BluetoothDevice d) {
 		mAltosBluetooth = new AltosBluetooth(d);
 		mAltosBluetooth.add_monitor(telem);
+			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);
+		//mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+
+		telem = new LinkedBlockingQueue<AltosLine>();
+		setState(STATE_READY);
 	}
 
 	@Override
@@ -141,7 +162,7 @@ public class TelemetryService extends Service {
 	public void onDestroy() {
 
 		// Stop the bluetooth Comms threads
-		TeleBT_stop();
+		stopAltosBluetooth();
 
 		// Demote us from the foreground, and cancel the persistent notification.
 		stopForeground(true);