Merge pull request #420 from NordicSemiconductor/develop

Version 4.10.1

Author: philips77

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - iOSDFULibrary (4.10.0):
+  - iOSDFULibrary (4.10.1):
     - ZIPFoundation (= 0.9.11)
   - ZIPFoundation (0.9.11)
 
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  iOSDFULibrary: 998be9333f6b7781f342c837b5d7bb20280bf17b
+  iOSDFULibrary: 54dfe3f729cabc2250b0420147d0f864d76e7b54
   ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
 
 PODFILE CHECKSUM: 16697609d795697cac6384a823bc962ccbddb9d0

Example/Pods/Local Podspecs/iOSDFULibrary.podspec.json

@@ -56,7 +56,7 @@ let package = Package(
   dependencies: [
     .package(
       url: "https://github.com/NordicSemiconductor/IOS-Pods-DFU-Library", 
-      .upToNextMajor(from: "<Desired Version, e.g. 4.10.0>")
+      .upToNextMajor(from: "<Desired Version, e.g. 4.10.1>")
     )
   ],
   targets: [.target(name: "<Your Target Name>", dependencies: ["NordicDFU"])]

Example/Pods/Manifest.lock

@@ -1,4 +1,7 @@
 ### Changelog
+- **4.10.1**
+   -Bugfix: A log message was incorrectly shown pointing to a solution to non-existing problem (#419). 
+   
 - **4.10.0**
    - Improvement: Guarantee word-aligned writes to the packet characteristic (#366).
    - Improvement: Extended DFU Connection Timeout from 3 to 15 seconds (#411).

Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS-Info.plist

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "iOSDFULibrary"
-  s.version          = "4.10.0"
+  s.version          = "4.10.1"
   s.summary          = "This repository contains a tested library for iOS 9+ devices to perform Device Firmware Update on the nRF5x devices"
   s.description      = <<-DESC
 The nRF5x Series chips are flash-based SoCs, and as such they represent the most flexible solution available. A key feature of the nRF5x Series and their associated software architecture and S-Series SoftDevices is the possibility for Over-The-Air Device Firmware Upgrade (OTA-DFU). See Figure 1. OTA-DFU allows firmware upgrades to be issued and downloaded to products in the field via the cloud and so enables OEMs to fix bugs and introduce new features to products that are already out on the market. This brings added security and flexibility to product development when using the nRF5x Series SoCs.

Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS-Info.plist

@@ -117,11 +117,13 @@ internal class SecureDFUPeripheral : BaseCommonDFUPeripheral<SecureDFUExecutor,
         dfuService.jumpToBootloaderMode(withAlternativeAdvertisingName: name,
             onSuccess: {
                 self.jumpingToBootloader = true
+                self.possibleDisconnectionOnSettingAlternativeName = false
                 // The device will now disconnect and
                 // `centralManager(_:didDisconnectPeripheral:error)` will be called.
             },
             onError: { error, message in
                 self.jumpingToBootloader = false
+                self.possibleDisconnectionOnSettingAlternativeName = false
                 self.delegate?.error(error, didOccurWithMessage: message)
             }
         )
@@ -142,6 +144,13 @@ internal class SecureDFUPeripheral : BaseCommonDFUPeripheral<SecureDFUExecutor,
         if possibleDisconnectionOnSettingAlternativeName {
             logger.e("Buttonless service not configured, see: https://devzone.nordicsemi.com/f/nordic-q-a/59881/advertising-rename-feature-not-working/243566#243566. To workaround, disable alternative advertising name.")
             possibleDisconnectionOnSettingAlternativeName = false
+            
+            // We could set the flag below to allow jumping to the bootloader mode
+            // without using alternative advertising name, but it's better to fail
+            // and make sure the user knows about the issue. It can be workarond
+            // by disabling alternative name in DFUServiceInitiator.
+            
+            // jumpingToBootloader = true
         }
         super.peripheralDidDisconnect()
     }