NordicSemiconductor#219 fixed

philips77 · philips77 · commit bb0c971439e2 · 2020-07-28T11:07:23.000+02:00
diff --git a/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java b/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java
@@ -1543,7 +1543,7 @@ protected BluetoothGatt connect(@NonNull final String address) {
 		// Connection error may occur as well.
 		try {
 			synchronized (mLock) {
-				while ((mConnectionState == STATE_CONNECTING || mConnectionState == STATE_CONNECTED) && mError == 0)
+				while ((mConnectionState == STATE_CONNECTING || mConnectionState == STATE_CONNECTED) && mError == 0 && !mAborted)
 					mLock.wait();
 			}
 		} catch (final InterruptedException e) {

Original file line number	Diff line number	Diff line change
`@@ -1543,7 +1543,7 @@ protected BluetoothGatt connect(@NonNull final String address) {`
`1543`	`1543`	`// Connection error may occur as well.`
`1544`	`1544`	`try {`
`1545`	`1545`	`synchronized (mLock) {`
`1546`		`- while ((mConnectionState == STATE_CONNECTING \|\| mConnectionState == STATE_CONNECTED) && mError == 0)`
	`1546`	`+ while ((mConnectionState == STATE_CONNECTING \|\| mConnectionState == STATE_CONNECTED) && mError == 0 && !mAborted)`
`1547`	`1547`	`mLock.wait();`
`1548`	`1548`	`}`
`1549`	`1549`	`} catch (final InterruptedException e) {`