From cf5eb61019a7645a1b535002e08026124fc7f86a Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Mon, 13 Mar 2017 15:49:26 +0100
Subject: [PATCH] Bug fixed: Proximity crashing when Bluetooth turned off and
 on again while device was connected

---
 .../android/nrftoolbox/proximity/DeviceAdapter.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java
index 6dfcf125..5ae7d3b4 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java
@@ -62,7 +62,14 @@ public class DeviceAdapter extends RecyclerView.Adapter<DeviceAdapter.ViewHolder
 	}
 
 	public void onDeviceAdded(final BluetoothDevice device) {
-		notifyItemInserted(mDevices.size() - 1);
+		final int position = mDevices.indexOf(device);
+		if (position == -1) {
+			notifyItemInserted(mDevices.size() - 1);
+		} else {
+			// This may happen when Bluetooth adapter was switched off and on again
+			// while there were devices on the list.
+			notifyItemChanged(position);
+		}
 	}
 
 	public void onDeviceRemoved(final BluetoothDevice device) {