altosdroid: miscellaneous cleanup

[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 3e9998e5f09681b79c716aa6654cc7a9cd947b12..3855f6f9a262670f7c4925e940cd1485fb0b25ef 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -18,6 +18,7 @@
 package org.altusmetrum.AltosDroid;
 
 import java.lang.ref.WeakReference;
+
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -47,7 +48,7 @@ import android.view.Window;
 //import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
-import org.altusmetrum.AltosDroid.R;
+//import org.altusmetrum.AltosDroid.R;
 
 /**
  * This is the main Activity that displays the current chat session.
@@ -60,12 +61,9 @@ public class AltosDroid extends Activity {
        // Message types sent from the TelemetryService Handler
        public static final int MSG_STATE_CHANGE    = 1;
        public static final int MSG_DEVNAME         = 2;
-       public static final int MSG_INCOMING_TELEM  = 3;
-       public static final int MSG_TOAST           = 4;
-
-       // Key names received from the TelemetryService Handler
-       public static final String KEY_DEVNAME = "key_devname";
-       public static final String KEY_TOAST   = "key_toast";
+       public static final int MSG_TOAST           = 3;
+       public static final int MSG_DEVCONFIG       = 4;
+       public static final int MSG_TELEMETRY       = 5;
 
        // Intent request codes
        private static final int REQUEST_CONNECT_DEVICE = 1;
@@ -115,22 +113,24 @@ public class AltosDroid extends Activity {
                                        break;
                                }
                                break;
-                       case MSG_INCOMING_TELEM:
-                               byte[] buf = (byte[]) msg.obj;
+                       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);
+                               //String telem = new String(buf);
+                               //ad.mSerialView.append(telem);
                                break;
                        case MSG_DEVNAME:
                                // save the connected device's name
-                               ad.mConnectedDeviceName = msg.getData().getString(KEY_DEVNAME);
-                               Toast.makeText(ad.getApplicationContext(), "Connected to "
+                               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(),
-                                               msg.getData().getString(KEY_TOAST),
+                                               (String) msg.obj,
                                                Toast.LENGTH_SHORT).show();
                                break;
                        }