X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FDeviceListActivity.java;fp=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FDeviceListActivity.java;h=60fba9d367126bec3317e120fd05c0bee3a00381;hp=1c3e1dbab21019bd9bfa82423e820a2129720c00;hb=0a7cc99d9db45c6c4ba929acf5b57e22d826c82a;hpb=362f11fffb63c5c4d4e2ccfc59c0e6ae83a55d01

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
index 1c3e1dba..60fba9d3 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
@@ -152,11 +152,16 @@ public class DeviceListActivity extends Activity {
 	// The on-click listener for all devices in the ListViews
 	private OnItemClickListener mDeviceClickListener = new OnItemClickListener() {
 		public void onItemClick(AdapterView<?> av, View v, int arg2, long arg3) {
+			// Get the device MAC address, which is the last 17 chars in the View
+			String info = ((TextView) v).getText().toString();
+
+			/* Ignore clicks on items that are too short */
+			if (info.length() <= 17)
+				return;
+
 			// Cancel discovery because it's costly and we're about to connect
 			mBtAdapter.cancelDiscovery();
 
-			// Get the device MAC address, which is the last 17 chars in the View
-			String info = ((TextView) v).getText().toString();
 			String address = info.substring(info.length() - 17);
 
 			int newline = info.indexOf('\n');