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));
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);
}
}