import android.app.Service;
import android.bluetooth.BluetoothDevice;
import android.content.Intent;
-import android.os.Bundle;
+//import android.os.Bundle;
import android.os.IBinder;
import android.os.Handler;
import android.os.Message;
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;
public static final int STATE_CONNECTING = 2;
public static final int STATE_CONNECTED = 3;
- // Key names received from the TelemetryService Handler
- public static final String KEY_DEVNAME = "key_devname";
- public static final String KEY_TOAST = "key_toast";
-
// Unique Identification Number for the Notification.
// We use it on Notification start, and to cancel it.
private int NOTIFICATION = R.string.telemetry_service_label;
final Messenger mMessenger = new Messenger(mHandler); // Target we publish for clients to send messages to IncomingHandler.
// Name of the connected device
- private String mConnectedDeviceName = null;
+ private BluetoothDevice device = null;
private AltosBluetooth mAltosBluetooth = null;
private int state = STATE_NONE;
LinkedBlockingQueue<AltosLine> telem;
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);
break;
case MSG_CONNECT:
if (D) Log.d(TAG, "Connect command received");
- s.startAltosBluetooth((BluetoothDevice) msg.obj);
+ s.device = (BluetoothDevice) msg.obj;
+ s.startAltosBluetooth();
break;
case MSG_CONNECTED:
if (D) Log.d(TAG, "Connected to device");
- s.mConnectedDeviceName = msg.getData().getString(KEY_DEVNAME);
- Message m = Message.obtain(null, AltosDroid.MSG_DEVNAME);
- Bundle b = new Bundle();
- b.putString(AltosDroid.KEY_DEVNAME, s.mConnectedDeviceName);
- m.setData(b);
- s.sendMessageToClients(m);
+ s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
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);
}
mAltosBluetooth.close();
mAltosBluetooth = null;
}
+ device = null;
telem.clear();
}
- private void startAltosBluetooth(BluetoothDevice d) {
+ private void startAltosBluetooth() {
if (mAltosBluetooth == null) {
- if (D) Log.i(TAG, "Connecting to " + d.getName());
- mAltosBluetooth = new AltosBluetooth(d, mHandler);
+ if (D) Log.i(TAG, "Connecting to " + device.getName());
+ mAltosBluetooth = new AltosBluetooth(device, mHandler);
setState(STATE_CONNECTING);
} else {
stopAltosBluetooth();
- mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, d), 1000);
+ mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
}
}