altosdroid: fix a connection retry having a null pointer

[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 4701ba1f2c0cf568d6d8e0a2d1d6adac195697f8..1fa62d870f7944395c2d3ef4847869222b08cb4a 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -110,8 +110,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));
@@ -133,9 +136,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();
@@ -144,7 +148,7 @@ 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;
                }
@@ -153,17 +157,23 @@ public class TelemetryService extends Service {
 
        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));