altosdroid: create connected() method

[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 89c45d6cde25a096f440efb95f5ea6a6ad4f387b..a1b1915a9fefd4b08d9cf248238ecc7e166fd28c 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -27,17 +27,15 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
+//import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.RemoteException;
 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 {
@@ -47,7 +45,10 @@ public class TelemetryService extends Service {
 
        static final int MSG_REGISTER_CLIENT   = 1;
        static final int MSG_UNREGISTER_CLIENT = 2;
-       static final int MSG_CONNECT_TELEBT    = 3;
+       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;
@@ -60,12 +61,13 @@ public class TelemetryService extends Service {
        //private NotificationManager mNM;
 
        ArrayList<Messenger> mClients = new ArrayList<Messenger>(); // Keeps track of all current registered clients.
-       final Messenger mMessenger = new Messenger(new IncomingHandler()); // Target we publish for clients to send messages to IncomingHandler.
+       final Handler   mHandler   = new IncomingHandler(this);
+       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;
 
        // Handler of incoming messages from clients.
@@ -79,15 +81,35 @@ public class TelemetryService extends Service {
                        switch (msg.what) {
                        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);
+                               }
                                if (D) Log.d(TAG, "Client bound to service");
                                break;
                        case MSG_UNREGISTER_CLIENT:
                                s.mClients.remove(msg.replyTo);
                                if (D) Log.d(TAG, "Client unbound from service");
                                break;
-                       case MSG_CONNECT_TELEBT:
+                       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.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);
@@ -95,25 +117,59 @@ public class TelemetryService extends Service {
                }
        }
 
+       private void sendMessageToClients(Message m) {
+               for (int i=mClients.size()-1; i>=0; i--) {
+                       try {
+                               mClients.get(i).send(m);
+                       } catch (RemoteException e) {
+                               mClients.remove(i);
+                       }
+               }
+       }
+
        private void stopAltosBluetooth() {
+               if (D) Log.i(TAG, "Stopping BT");
+               setState(STATE_READY);
                if (mAltosBluetooth != null) {
+                       if (D) Log.i(TAG, "Closing AltosBluetooth");
                        mAltosBluetooth.close();
                        mAltosBluetooth = null;
                }
+               device = null;
                telem.clear();
        }
 
-       private void startAltosBluetooth(BluetoothDevice d) {
-               mAltosBluetooth = new AltosBluetooth(d);
-               mAltosBluetooth.add_monitor(telem);
+       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) {
+               if (D) Log.d(TAG, "setState() " + state + " -> " + s);
+               state = s;
+
+               sendMessageToClients(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, state, -1));
+       }
+
+       private void connected() {
+               sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, device.getName()));
+               setState(STATE_CONNECTED);
        }
 
+
        @Override
        public void onCreate() {
                // Create a reference to the NotificationManager so that we can update our notifcation text later
                //mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
 
                telem = new LinkedBlockingQueue<AltosLine>();
+               setState(STATE_READY);
        }
 
        @Override