altosdroid: tidy up old messages

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroid.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index bbb2970f44d0aa676e8cbb6120fda68274a71dfc..e3e6012e7357b0501b187c60ec92c1dd6eb40db3 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -43,6 +43,8 @@ import android.view.Window;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.altusmetrum.AltosLib.*;
+
 /**
  * This is the main Activity that displays the current chat session.
  */
@@ -53,10 +55,7 @@ public class AltosDroid extends Activity {
 
        // Message types received by our Handler
        public static final int MSG_STATE_CHANGE    = 1;
-       public static final int MSG_DEVNAME         = 2;
-       public static final int MSG_TOAST           = 3;
-       public static final int MSG_DEVCONFIG       = 4;
-       public static final int MSG_TELEMETRY       = 5;
+       public static final int MSG_TELEMETRY       = 2;
 
        // Intent request codes
        private static final int REQUEST_CONNECT_DEVICE = 1;
@@ -71,8 +70,8 @@ public class AltosDroid extends Activity {
        private Messenger mService = null;
        final Messenger mMessenger = new Messenger(new IncomingHandler(this));
 
-       // Name of the connected device
-       private String mConnectedDeviceName = null;
+       // TeleBT Config data
+       private AltosConfigData mConfigData = null;
        // Local Bluetooth adapter
        private BluetoothAdapter mBluetoothAdapter = null;
 
@@ -93,39 +92,29 @@ public class AltosDroid extends Activity {
                                if(D) Log.d(TAG, "MSG_STATE_CHANGE: " + msg.arg1);
                                switch (msg.arg1) {
                                case TelemetryService.STATE_CONNECTED:
+                                       ad.mConfigData = (AltosConfigData) msg.obj;
+                                       String str = String.format(" %s S/N: %d", ad.mConfigData.product, ad.mConfigData.serial);
                                        ad.mTitle.setText(R.string.title_connected_to);
-                                       ad.mTitle.append(ad.mConnectedDeviceName);
-                                       ad.mSerialView.setText("");
+                                       ad.mTitle.append(str);
+                                       Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
                                        break;
                                case TelemetryService.STATE_CONNECTING:
                                        ad.mTitle.setText(R.string.title_connecting);
                                        break;
                                case TelemetryService.STATE_READY:
                                case TelemetryService.STATE_NONE:
+                                       ad.mConfigData = null;
                                        ad.mTitle.setText(R.string.title_not_connected);
+                                       ad.mSerialView.setText("");
                                        break;
                                }
                                break;
-                       case MSG_DEVCONFIG:
                        case MSG_TELEMETRY:
                                //byte[] buf = (byte[]) msg.obj;
                                // construct a string from the buffer
                                //String telem = new String(buf);
                                //ad.mSerialView.append(telem);
                                break;
-                       case MSG_DEVNAME:
-                               // save the connected device's name
-                               ad.mConnectedDeviceName = (String) msg.obj;
-                               if (ad.mConnectedDeviceName != null)
-                                       Toast.makeText(ad.getApplicationContext(), "Connected to "
-                                                       + ad.mConnectedDeviceName, Toast.LENGTH_SHORT).show();
-                               break;
-                       case MSG_TOAST:
-                               Toast.makeText(
-                                               ad.getApplicationContext(),
-                                               (String) msg.obj,
-                                               Toast.LENGTH_SHORT).show();
-                               break;
                        }
                }
        };