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=a3aef896c1f4718be190509239959c715e02d056;hp=60fba9d367126bec3317e120fd05c0bee3a00381;hb=b140da92536d7c48ba37868f1c2afce7bb86dfdb;hpb=1d208c9509f03f7e2c913abe5c0dd78ef0083c0f

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 60fba9d3..a3aef896 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
@@ -105,10 +105,11 @@ public class DeviceListActivity extends Activity {
 		// If there are paired devices, add each one to the ArrayAdapter
 		if (pairedDevices.size() > 0) {
 			findViewById(R.id.title_paired_devices).setVisibility(View.VISIBLE);
-			for (BluetoothDevice device : pairedDevices)
-				if (device.getName().startsWith("TeleBT"))
-					mPairedDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress());
-
+			for (BluetoothDevice device : pairedDevices) {
+				String name = device.getName();
+				if (name != null && name.startsWith("TeleBT"))
+					mPairedDevicesArrayAdapter.add(name + "\n" + device.getAddress());
+			}
 		} else {
 			String noDevices = getResources().getText(R.string.none_paired).toString();
 			mPairedDevicesArrayAdapter.add(noDevices);
@@ -205,7 +206,7 @@ public class DeviceListActivity extends Activity {
 				{
 					String	name = device.getName();
 					if (name != null && name.startsWith("TeleBT"))
-						mNewDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress());
+						mNewDevicesArrayAdapter.add(name + "\n" + device.getAddress());
 				}
 
 			/* When discovery is finished, change the Activity title