altosdroid: Rename Connect message, add connected message

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TelemetryService.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 9059ca7950f599360910f267c867cd231448d378..cf7ae6da452a312dd095d7810ca052b2877db7a8 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -17,16 +17,16 @@
 
 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;
 import android.content.Intent;
-//import android.os.Binder;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.Message;
@@ -47,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;
@@ -57,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.
@@ -69,22 +70,28 @@ public class TelemetryService extends Service {
        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");
                                break;
                        default:
                                super.handleMessage(msg);
@@ -92,7 +99,7 @@ public class TelemetryService extends Service {
                }
        }
 
-       private void TeleBT_stop() {
+       private void stopAltosBluetooth() {
                if (mAltosBluetooth != null) {
                        mAltosBluetooth.close();
                        mAltosBluetooth = null;
@@ -100,7 +107,7 @@ 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);
        }
@@ -108,7 +115,9 @@ public class TelemetryService extends Service {
        @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>();
        }
 
        @Override
@@ -142,7 +151,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);