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;
import android.util.Log;
import android.widget.Toast;
-// Need the following import to get access to the app resources, since this
-// class is in a sub-package.
-//import org.altusmetrum.AltosDroid.R;
-
import org.altusmetrum.AltosLib.*;
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 String mConnectedDeviceName = null;
+ private BluetoothDevice device = null;
private AltosBluetooth mAltosBluetooth = null;
private int state = STATE_NONE;
LinkedBlockingQueue<AltosLine> telem;
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;
mAltosBluetooth.close();
mAltosBluetooth = null;
}
+ device = null;
telem.clear();
}
- private void startAltosBluetooth(BluetoothDevice d) {
- if (D) Log.i(TAG, "Connecting to " + d.getName());
- mAltosBluetooth = new AltosBluetooth(d, mHandler);
+ private void startAltosBluetooth() {
+ if (mAltosBluetooth == null) {
+ 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, device), 1000);
+ }
}
private synchronized void setState(int s) {