X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=1c0e94b3855ab2e7172dbb623e5272bff935c6b9;hb=54baecc208a40606e3242b2cbd5e66567053646f;hp=15293b9e8ed5a55fd1e0a8453b04ff8968413447;hpb=a33333b97e810f50db36f345aab71a3200feccc3;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 15293b9e..1c0e94b3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -17,13 +17,20 @@
 
 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.PendingIntent;
 import android.app.Service;
+import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
-//import android.os.Binder;
 import android.os.IBinder;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -38,11 +45,22 @@ public class TelemetryService extends Service {
 	private static final String TAG = "TelemetryService";
 	private static final boolean D = true;
 
+	static final int MSG_REGISTER_CLIENT   = 1;
+	static final int MSG_UNREGISTER_CLIENT = 2;
+	static final int MSG_CONNECT_TELEBT    = 3;
+
+	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;
+
 	// 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.
 
 	// Name of the connected device
 	private String mConnectedDeviceName = null;
@@ -50,6 +68,46 @@ public class TelemetryService extends Service {
 
 	LinkedBlockingQueue<AltosLine> telem;
 
+	// Handler of incoming messages from clients.
+	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:
+				s.mClients.add(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:
+				if (D) Log.d(TAG, "Connect command received");
+				s.startAltosBluetooth((BluetoothDevice) msg.obj);
+				break;
+			default:
+				super.handleMessage(msg);
+			}
+		}
+	}
+
+	private void stopAltosBluetooth() {
+		if (mAltosBluetooth != null) {
+			mAltosBluetooth.close();
+			mAltosBluetooth = null;
+		}
+		telem.clear();
+	}
+
+	private void startAltosBluetooth(BluetoothDevice d) {
+		mAltosBluetooth = new AltosBluetooth(d);
+		mAltosBluetooth.add_monitor(telem);
+	}
+
 	@Override
 	public void onCreate() {
 		// Create a reference to the NotificationManager so that we can update our notifcation text later
@@ -86,6 +144,8 @@ public class TelemetryService extends Service {
 	@Override
 	public void onDestroy() {
 
+		// Stop the bluetooth Comms threads
+		stopAltosBluetooth();
 
 		// Demote us from the foreground, and cancel the persistent notification.
 		stopForeground(true);
@@ -96,6 +156,7 @@ public class TelemetryService extends Service {
 
 	@Override
 	public IBinder onBind(Intent intent) {
+		return mMessenger.getBinder();
 	}