X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FDeviceListActivity.java;fp=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FDeviceListActivity.java;h=fd6abe0fbd7057c66a261987fa01efc04654fc81;hp=71692122b8def9d96839a9f70414d0f74ecf20e3;hb=4af4e36cda96d053458eeb040e35886890917385;hpb=91b1a80650a7dcd7c5bf819618a8cea0fceb37d9

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
index 71692122..fd6abe0f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
@@ -50,7 +50,8 @@ public class DeviceListActivity extends Activity {
 	private static final boolean D = true;
 
 	// Return Intent extra
-	public static String EXTRA_DEVICE_ADDRESS = "device_address";
+	public static final String EXTRA_DEVICE_ADDRESS = "device_address";
+	public static final String EXTRA_DEVICE_NAME = "device_name";
 
 	// Member fields
 	private BluetoothAdapter mBtAdapter;
@@ -164,9 +165,20 @@ public class DeviceListActivity extends Activity {
 			String info = ((TextView) v).getText().toString();
 			String address = info.substring(info.length() - 17);
 
+			int newline = info.indexOf('\n');
+
+			String name = null;
+			if (newline > 0)
+				name = info.substring(0, newline);
+			else
+				name = info;
+
+			if (D) Log.d(TAG, String.format("******* selected item '%s'", info));
+
 			// Create the result Intent and include the MAC address
 			Intent intent = new Intent();
 			intent.putExtra(EXTRA_DEVICE_ADDRESS, address);
+			intent.putExtra(EXTRA_DEVICE_NAME, name);
 
 			// Set result and finish this Activity
 			setResult(Activity.RESULT_OK, intent);