From d77513114f39c7182e58d38182e8f4577114285c Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Mon, 3 Feb 2020 14:31:43 +0100
Subject: [PATCH] #54 fixed

---
 .../BleMulticonnectProfileServiceReadyActivity.java           | 4 +++-
 .../android/nrftoolbox/proximity/ProximityActivity.java       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java
index 06f3e2d6..1c3db523 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java
@@ -173,10 +173,12 @@ public abstract class BleMulticonnectProfileServiceReadyActivity<E extends BleMu
 			managedDevices.addAll(bleService.getManagedDevices());
 			onServiceBound(bleService);
 
-			// and notify user if device is connected
+			// and notify user if device is connected and ready
 			for (final BluetoothDevice device : managedDevices) {
 				if (bleService.isConnected(device))
 					onDeviceConnected(device);
+				if (bleService.isReady(device))
+					onDeviceReady(device);
 			}
 		}
 
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityActivity.java
index 5bcdf1d3..4fc2218b 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityActivity.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityActivity.java
@@ -105,7 +105,7 @@ public class ProximityActivity extends BleMulticonnectProfileServiceReadyActivit
 	}
 
 	@Override
-	public void onDeviceConnected(final BluetoothDevice device) {
+	public void onDeviceConnected(@NonNull final BluetoothDevice device) {
 		if (adapter != null)
 			adapter.onDeviceStateChanged(device);
 	}
@@ -123,7 +123,7 @@ public class ProximityActivity extends BleMulticonnectProfileServiceReadyActivit
 	}
 
 	@Override
-	public void onDeviceDisconnected(final BluetoothDevice device) {
+	public void onDeviceDisconnected(@NonNull final BluetoothDevice device) {
 		if (adapter != null)
 			adapter.onDeviceRemoved(device);
 	}