X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=33da93466ac14406fca341673bdad98ca33d8418;hb=afac4d6c82916eea67ac838cd22806bd73db00a9;hp=3e9998e5f09681b79c716aa6654cc7a9cd947b12;hpb=58d2b70575f3616a056d2356a737b3be15ed3d66;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 3e9998e5..33da9346 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -63,10 +63,6 @@ public class AltosDroid extends Activity {
 	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";
-
 	// Intent request codes
 	private static final int REQUEST_CONNECT_DEVICE = 1;
 	private static final int REQUEST_ENABLE_BT      = 2;
@@ -123,14 +119,15 @@ public class AltosDroid extends Activity {
 				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;
 			}