altosdroid: Add multi-tracker support

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / DeviceListActivity.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
index 4af117a29bbde343c91a0a0b8c6416aa0836280d..f36ef267c9c5c2660c5431e72638a388aa85125f 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
@@ -191,14 +191,22 @@ public class DeviceListActivity extends Activity {
 
                        // When discovery finds a device
                        if (BluetoothDevice.ACTION_FOUND.equals(action)) {
 
                        // When discovery finds a device
                        if (BluetoothDevice.ACTION_FOUND.equals(action)) {

-                               // Get the BluetoothDevice object from the Intent
+
+                               /* Get the BluetoothDevice object from the Intent
+                                */

                                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
                                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);

-                               // If it's already paired, skip it, because it's been listed already
-                               if (   device.getBondState() != BluetoothDevice.BOND_BONDED
-                                   && device.getName().startsWith("TeleBT")               ) {
-                                       mNewDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress());
+
+                               /* If it's already paired, skip it, because it's been listed already
+                                */
+                               if (device != null && device.getBondState() != BluetoothDevice.BOND_BONDED)
+                               {
+                                       String  name = device.getName();
+                                       if (name != null && name.startsWith("TeleBT"))
+                                               mNewDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress());

                                }
                                }

-                       // When discovery is finished, change the Activity title
+
+                       /* When discovery is finished, change the Activity title
+                        */

                        } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
                                setProgressBarIndeterminateVisibility(false);
                                setTitle(R.string.select_device);
                        } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
                                setProgressBarIndeterminateVisibility(false);
                                setTitle(R.string.select_device);