altosdroid: really don't need to store a local copy of the device name

[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 1903cc1de2d8c2084cebfebda7cdabad9a3590ac..14e41ba0cb5a8aa6d2c4dd2b088f7da77938097e 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -27,17 +27,15 @@ 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;
 
-// Need the following import to get access to the app resources, since this
-// class is in a sub-package.
-//import org.altusmetrum.AltosDroid.R;
-
 import org.altusmetrum.AltosLib.*;
 
 public class TelemetryService extends Service {
@@ -55,6 +53,10 @@ 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;
@@ -65,7 +67,7 @@ public class TelemetryService extends Service {
        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 BluetoothDevice device = null;
        private AltosBluetooth mAltosBluetooth = null;
        private int state = STATE_NONE;
        LinkedBlockingQueue<AltosLine> telem;
@@ -81,6 +83,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:
@@ -89,10 +96,12 @@ public class TelemetryService extends Service {
                                break;
                        case MSG_CONNECT:
                                if (D) Log.d(TAG, "Connect command received");
-                               s.startAltosBluetooth((BluetoothDevice) msg.obj);
+                               s.device = (BluetoothDevice) msg.obj;
+                               s.startAltosBluetooth();
                                break;
                        case MSG_CONNECTED:
                                if (D) Log.d(TAG, "Connected to device");
+                               s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
                                s.setState(STATE_CONNECTED);
                                s.mAltosBluetooth.add_monitor(s.telem);
                                break;
@@ -102,18 +111,37 @@ 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;
                }
+               device = null;
                telem.clear();
        }
 
-       private void startAltosBluetooth(BluetoothDevice d) {
-                       mAltosBluetooth = new AltosBluetooth(d, mHandler);
+       private void startAltosBluetooth() {
+               if (mAltosBluetooth == null) {
+                       if (D) Log.i(TAG, "Connecting to " + device.getName());
+                       mAltosBluetooth = new AltosBluetooth(device, mHandler);
                        setState(STATE_CONNECTING);
+               } else {
+                       stopAltosBluetooth();
+                       mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
+               }
        }
 
        private synchronized void setState(int s) {