From d20edb2dfc74cf02ec0e47a02119fcc1fcc1cea2 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <aleksander.nowakowski@nordicsemi.no>
Date: Mon, 24 Feb 2020 12:03:12 +0100
Subject: [PATCH] Bug fix: dfu stops after sending create data object

---
 .../main/java/no/nordicsemi/android/dfu/SecureDfuImpl.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dfu/src/main/java/no/nordicsemi/android/dfu/SecureDfuImpl.java b/dfu/src/main/java/no/nordicsemi/android/dfu/SecureDfuImpl.java
index da71799..cea3840 100644
--- a/dfu/src/main/java/no/nordicsemi/android/dfu/SecureDfuImpl.java
+++ b/dfu/src/main/java/no/nordicsemi/android/dfu/SecureDfuImpl.java
@@ -600,7 +600,9 @@ class SecureDfuImpl extends BaseCustomDfuImpl {
 					// Waiting until the device is ready to receive the data object.
 					// If prepare data object delay was set in the initiator, the delay will be used
 					// for all data objects.
-					mService.waitFor(prepareObjectDelay > 0 ? prepareObjectDelay : chunkCount == 0 ? 400 : 0);
+					if (prepareObjectDelay > 0 || chunkCount == 0) {
+						mService.waitFor(prepareObjectDelay > 0 ? prepareObjectDelay : 400);
+					}
 					mService.sendLogBroadcast(DfuBaseService.LOG_LEVEL_APPLICATION,
                             "Uploading firmware...");
 				} else {