altosdroid: create connected() method

[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 ecafc74a0fd6b13c0898dac920e790047f0dd8c9..a1b1915a9fefd4b08d9cf248238ecc7e166fd28c 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -82,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);
@@ -99,8 +100,7 @@ public class TelemetryService extends Service {
                                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.connected();
                                s.mAltosBluetooth.add_monitor(s.telem);
                                break;
                        case MSG_CONNECT_FAILED:
@@ -157,6 +157,12 @@ public class TelemetryService extends Service {
                sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
        }
 
+       private void connected() {
+               sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, device.getName()));
+               setState(STATE_CONNECTED);
+       }
+
+
        @Override
        public void onCreate() {
                // Create a reference to the NotificationManager so that we can update our notifcation text later