altosdroid: move methods around

[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 3ae87bb139f8a5c9dfce058fffdf3a354cab0552..d11fc53a8c47df6a6273b526fa4a13322af9425b 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -36,7 +36,7 @@ import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 
-//import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.AltosLib.*;
 
 public class TelemetryService extends Service {
 
@@ -66,10 +66,12 @@ 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 BluetoothDevice device = null;
-       private AltosBluetooth mAltosBluetooth = null;
+       private BluetoothDevice device           = null;
+       private AltosBluetooth  mAltosBluetooth  = null;
+       private AltosConfigData mConfigData      = null;
        private TelemetryReader mTelemetryReader = null;
 
+       // internally track state of bluetooth connection
        private int state = STATE_NONE;
 
        // Handler of incoming messages from clients.
@@ -84,8 +86,9 @@ 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));
+                                       // Now we try to send the freshly connected UI any relavant information about what
+                                       // we're talking to - Basically state and Config Data.
+                                       msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1, s.mConfigData));
                                } catch (RemoteException e) {
                                        s.mClients.remove(msg.replyTo);
                                }
@@ -109,8 +112,11 @@ public class TelemetryService extends Service {
                                s.startAltosBluetooth();
                                break;
                        case MSG_DISCONNECTED:
-                               if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
-                               s.stopAltosBluetooth();
+                               // Only do the following if we haven't been shutdown elsewhere..
+                               if (s.device != null) {
+                                       if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
+                                       s.stopAltosBluetooth();
+                               }
                                break;
                        case MSG_TELEMETRY:
                                s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj));
@@ -132,9 +138,10 @@ public class TelemetryService extends Service {
        }
 
        private void stopAltosBluetooth() {
-               if (D) Log.i(TAG, "Stopping BT");
+               if (D) Log.d(TAG, "stopAltosBluetooth(): begin");
                setState(STATE_READY);
                if (mTelemetryReader != null) {
+                       if (D) Log.d(TAG, "stopAltosBluetooth(): stopping TelemetryReader");
                        mTelemetryReader.interrupt();
                        try {
                                mTelemetryReader.join();
@@ -143,39 +150,55 @@ public class TelemetryService extends Service {
                        mTelemetryReader = null;
                }
                if (mAltosBluetooth != null) {
-                       if (D) Log.i(TAG, "Closing AltosBluetooth");
+                       if (D) Log.d(TAG, "stopAltosBluetooth(): stopping AltosBluetooth");
                        mAltosBluetooth.close();
                        mAltosBluetooth = null;
                }
                device = null;
+               mConfigData = null;
        }
 
        private void startAltosBluetooth() {
                if (mAltosBluetooth == null) {
-                       if (D) Log.i(TAG, "Connecting to " + device.getName());
+                       if (D) Log.d(TAG, String.format("startAltosBluetooth(): Connecting to %s (%s)", device.getName(), device.getAddress()));
                        mAltosBluetooth = new AltosBluetooth(device, mHandler);
                        setState(STATE_CONNECTING);
                } else {
+                       // This is a bit of a hack - if it appears we're still connected, we treat this as a restart.
+                       // So, to give a suitable delay to teardown/bringup, we just schedule a resend of a message
+                       // to ourselves in a few seconds time that will ultimately call this method again.
+                       // ... then we tear down the existing connection.
+                       // We do it this way around so that we don't lose a reference to the device when this method
+                       // is called on reception of MSG_CONNECT_FAILED in the handler above.
+                       mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 3000);
                        stopAltosBluetooth();
-                       mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
                }
        }
 
        private synchronized void setState(int s) {
-               if (D) Log.d(TAG, "setState() " + state + " -> " + s);
+               if (D) Log.d(TAG, "setState(): " + state + " -> " + s);
                state = s;
 
-               sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
+               // This shouldn't be required - mConfigData should be null for any non-connected
+               // state, but to be safe and to reduce message size
+               AltosConfigData acd = (state == STATE_CONNECTED) ? mConfigData : null;
+
+               sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1, acd));
        }
 
        private void connected() {
-               sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, device.getName()));
-               setState(STATE_CONNECTED);
                try {
-                       sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVCONFIG, mAltosBluetooth.config_data()));
+                       mConfigData = mAltosBluetooth.config_data();
                } catch (InterruptedException e) {
                } catch (TimeoutException e) {
+                       // If this timed out, then we really want to retry it, but
+                       // probably safer to just retry the connection from scratch.
+                       mHandler.obtainMessage(MSG_CONNECT_FAILED).sendToTarget();
+                       return;
                }
+
+               setState(STATE_CONNECTED);
+
                mTelemetryReader = new TelemetryReader(mAltosBluetooth, mHandler);
                mTelemetryReader.start();
        }