X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FDeviceListActivity.java;h=60fba9d367126bec3317e120fd05c0bee3a00381;hb=07fa6611080cc7a4ae2815e9867afde5be7a3f89;hp=839fb5311df69fd3e388ced03b0e4817a0276b43;hpb=d7ef39ba104a1ac6024af875c730a645f282719f;p=fw%2Faltos

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 839fb531..60fba9d3 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
@@ -55,10 +55,10 @@ public class DeviceListActivity extends Activity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
 		super.onCreate(savedInstanceState);
 
 		// Setup the window
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		setContentView(R.layout.device_list);
 
 		// Set result CANCELED incase the user backs out
@@ -135,7 +135,6 @@ public class DeviceListActivity extends Activity {
 		AltosDebug.debug("doDiscovery()");
 
 		// Indicate scanning in the title
-		setProgressBarIndeterminateVisibility(true);
 		setTitle(R.string.scanning);
 
 		// Turn on sub-title for new devices
@@ -153,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');
@@ -207,7 +211,6 @@ public class DeviceListActivity extends Activity {
 			/* When discovery is finished, change the Activity title
 			 */
 			} else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
-				setProgressBarIndeterminateVisibility(false);
 				setTitle(R.string.select_device);
 				if (mNewDevicesArrayAdapter.getCount() == 0) {
 					String noDevices = getResources().getText(R.string.none_found).toString();