Merge pull request NordicSemiconductor#253 from NordicSemiconductor/bugfix/252

Ignoring OPERATION NOT PERMITTED error when re-executing data object

Author: philips77

dfu/src/main/java/no/nordicsemi/android/dfu/SecureDfuImpl.java

@@ -554,8 +554,18 @@ private void sendFirmware(final BluetoothGatt gatt) throws RemoteDfuException,
 					// If the whole page was sent and CRC match, we have to make sure it was executed
 					if (bytesSentNotExecuted == info.maxSize && info.offset < mImageSizeInBytes) {
 						logi("Executing data object (Op Code = 4)");
-						writeExecute();
-						mService.sendLogBroadcast(DfuBaseService.LOG_LEVEL_APPLICATION, "Data object executed");
+						try {
+							writeExecute();
+							mService.sendLogBroadcast(DfuBaseService.LOG_LEVEL_APPLICATION, "Data object executed");
+						} catch (final RemoteDfuException e) {
+							// In DFU bootloader from SDK 15.x, 16 and 17 there's a bug, which
+							// prevents executing an object that has already been executed.
+							// See: https://github.com/NordicSemiconductor/Android-DFU-Library/issues/252
+							if (e.getErrorNumber() != SecureDfuError.OPERATION_NOT_PERMITTED) {
+								throw e;
+							}
+							mService.sendLogBroadcast(DfuBaseService.LOG_LEVEL_APPLICATION, "Data object already executed");
+						}
 					} else {
 						resumeSendingData = true;
 					}