altosdroid: Let a freshly connected client know what the device name is!

[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 e9254badc235994e81b905158a8a4b6a0a3d3b2a..88ba805cd44fbb1fb2f5ca65c285e847eb014a36 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -47,6 +47,8 @@ public class TelemetryService extends Service {
        static final int MSG_UNREGISTER_CLIENT = 2;
        static final int MSG_CONNECT           = 3;
        static final int MSG_CONNECTED         = 4;
+       static final int MSG_CONNECT_FAILED    = 5;
+       static final int MSG_DISCONNECTED      = 6;
 
        public static final int STATE_NONE       = 0;
        public static final int STATE_READY      = 1;
@@ -80,6 +82,7 @@ public class TelemetryService extends Service {
                        case MSG_REGISTER_CLIENT:
                                s.mClients.add(msg.replyTo);
                                try {
+                                       msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
                                        msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1));
                                } catch (RemoteException e) {
                                        s.mClients.remove(msg.replyTo);
@@ -101,6 +104,14 @@ public class TelemetryService extends Service {
                                s.setState(STATE_CONNECTED);
                                s.mAltosBluetooth.add_monitor(s.telem);
                                break;
+                       case MSG_CONNECT_FAILED:
+                               if (D) Log.d(TAG, "Connection failed... retrying");
+                               s.startAltosBluetooth();
+                               break;
+                       case MSG_DISCONNECTED:
+                               if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
+                               s.stopAltosBluetooth();
+                               break;
                        default:
                                super.handleMessage(msg);
                        }