Release 2.5.2 [Firmware Upgrade for df3]

Modules/RuuviDiscover/Sources/RuuviDiscover/VMP/Presenter/DiscoverPresenter.swift

@@ -41,6 +41,7 @@ class DiscoverPresenter: NSObject, RuuviDiscover {
     var ruuviOwnershipService: RuuviServiceOwnership!
     var firmwareBuilder: RuuviFirmwareBuilder!
 
+    private weak var firmwareModule: RuuviFirmware?
     private weak var view: DiscoverViewInput?
     private var accessQueue = DispatchQueue(
         label: "com.ruuviDiscover.accessQueue", attributes: .concurrent
@@ -122,11 +123,15 @@ extension DiscoverPresenter: DiscoverViewOutput {
 
     func viewDidChoose(device: DiscoverRuuviTagViewModel, displayName: String) {
         if let ruuviTag = ruuviTags.first(where: { $0.luid?.any != nil && $0.luid?.any == device.luid?.any }) {
-            addRuuviTagOwnership(
-                for: ruuviTag,
-                displayName: displayName,
-                firmwareVersion: nil
-            )
+            if device.mac != nil {
+                addRuuviTagOwnership(
+                    for: ruuviTag,
+                    displayName: displayName,
+                    firmwareVersion: nil
+                )
+            } else {
+                view?.showUpdateFirmwareDialog(for: ruuviTag.uuid)
+            }
         }
     }
 
@@ -260,6 +265,7 @@ extension DiscoverPresenter: DiscoverViewOutput {
         let firmwareModule = firmwareBuilder.build(uuid: sensor.id, currentFirmware: sensor.firmwareVersion)
         firmwareModule.output = self
         viewController.present(firmwareModule.viewController, animated: true)
+        self.firmwareModule = firmwareModule
     }
 
     func viewDidACopyMacAddress(of sensor: NFCSensor?) {
@@ -269,6 +275,27 @@ extension DiscoverPresenter: DiscoverViewOutput {
     func viewDidACopySecret(of sensor: NFCSensor?) {
         UIPasteboard.general.string = sensor?.id
     }
+
+    func viewDidConfirmToUpdateFirmware(for uuid: String) {
+        let firmwareModule = firmwareBuilder.build(uuid: uuid, currentFirmware: "<=2.5.9")
+        firmwareModule.output = self
+        let firmwareViewController = firmwareModule.viewController
+        firmwareViewController.presentationController?.delegate = self
+        viewController.present(firmwareViewController, animated: true)
+        self.firmwareModule = firmwareModule
+    }
+}
+
+extension DiscoverPresenter: UIAdaptivePresentationControllerDelegate {
+    func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool {
+        guard presentationController.presentedViewController == firmwareModule?.viewController else {
+            return true
+        }
+        guard let firmwareModule, !firmwareModule.isSafeToDismiss() else {
+            return true
+        }
+        return false
+    }
 }
 
 // MARK: - RuuviFirmwareOutput

Modules/RuuviDiscover/Sources/RuuviDiscover/VMP/View/DiscoverViewInput.swift

@@ -20,4 +20,7 @@ protocol DiscoverViewInput: UIViewController {
         showUpgradeFirmware: Bool,
         isDF3: Bool
     )
+    func showUpdateFirmwareDialog(
+        for uuid: String
+    )
 }

Modules/RuuviDiscover/Sources/RuuviDiscover/VMP/View/DiscoverViewOutput.swift

@@ -17,4 +17,5 @@ protocol DiscoverViewOutput {
     func viewDidACopyMacAddress(of sensor: NFCSensor?)
     func viewDidACopySecret(of sensor: NFCSensor?)
     func viewDidAskToUpgradeFirmware(of sensor: NFCSensor?)
+    func viewDidConfirmToUpdateFirmware(for uuid: String)
 }

Modules/RuuviDiscover/Sources/RuuviDiscover/VMP/View/Table/DiscoverTableViewController.swift

@@ -89,6 +89,20 @@ extension DiscoverTableViewController: DiscoverViewInput {
         session = nil
     }
 
+    func showUpdateFirmwareDialog(
+        for uuid: String
+    ) {
+        let title = RuuviLocalization.DiscoverTable.UpdateFirmware.title
+        let message = RuuviLocalization.DiscoverTable.UpdateFirmware.message
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        let cancelTitle = RuuviLocalization.cancel
+        alert.addAction(UIAlertAction(title: cancelTitle, style: .cancel, handler: nil))
+        alert.addAction(UIAlertAction(title: title, style: .default, handler: { [weak self] _ in
+            self?.output.viewDidConfirmToUpdateFirmware(for: uuid)
+        }))
+        present(alert, animated: true)
+    }
+
     // swiftlint:disable:next function_parameter_count function_body_length
     func showSensorDetailsDialog(
         for tag: NFCSensor?,

Modules/RuuviFirmware/Sources/RuuviFirmware/FirmwarePresenter.swift

@@ -11,11 +11,6 @@ final class FirmwarePresenter: RuuviFirmware {
         if let view = weakView {
             return view
         } else {
-            let viewModel = FirmwareViewModel(
-                uuid: uuid,
-                currentFirmware: currentFirmware,
-                interactor: interactor
-            )
             viewModel.output = self
             let view = UIHostingController(rootView: FirmwareView(viewModel: viewModel))
             weakView = view
@@ -27,6 +22,13 @@ final class FirmwarePresenter: RuuviFirmware {
     private let interactor: FirmwareInteractor
     private let uuid: String
     private let currentFirmware: String?
+    private lazy var viewModel: FirmwareViewModel = {
+        FirmwareViewModel(
+            uuid: uuid,
+            currentFirmware: currentFirmware,
+            interactor: interactor
+        )
+    }()
 
     init(
         uuid: String,
@@ -43,6 +45,15 @@ final class FirmwarePresenter: RuuviFirmware {
             firmwareRepository: firmwareRepository
         )
     }
+
+    func isSafeToDismiss() -> Bool {
+        switch viewModel.state {
+        case .flashing:
+            false
+        default:
+            true
+        }
+    }
 }
 
 extension FirmwarePresenter: FirmwareViewModelOutput {

Modules/RuuviFirmware/Sources/RuuviFirmware/RuuviFirmware.swift

@@ -4,6 +4,8 @@ public protocol RuuviFirmware: AnyObject {
     var viewController: UIViewController { get }
     var router: AnyObject? { get set }
     var output: RuuviFirmwareOutput? { get set }
+
+    func isSafeToDismiss() -> Bool
 }
 
 public protocol RuuviFirmwareOutput: AnyObject {

Packages/RuuviDFU/Sources/RuuviDFU/RuuviDFUError.swift

@@ -1,13 +1,6 @@
 import Foundation
-import RuuviLocalization
 
 public struct RuuviDfuError: Error {
-    public static let invalidFirmwareFile = RuuviDfuError(
-        description: RuuviLocalization.RuuviDfuError.invalidFirmwareFile
-    )
-    public static let failedToConstructUUID = RuuviDfuError(
-        description: RuuviLocalization.RuuviDfuError.failedToConstructUUID
-    )
     public let description: String
     public init(description: String) {
         self.description = description

Packages/RuuviDFU/Sources/RuuviDFUImpl/DfuFlasher.swift

@@ -32,7 +32,8 @@ class DfuFlasher: NSObject {
     ) -> AnyPublisher<FlashResponse, Error> {
         guard let uuid = UUID(uuidString: uuid)
         else {
-            return Fail<FlashResponse, Error>(error: RuuviDfuError.failedToConstructUUID).eraseToAnyPublisher()
+            assertionFailure("Invalid UUID")
+            return Fail<FlashResponse, Error>(error: RuuviDfuError(description: "Invalid UUID")).eraseToAnyPublisher()
         }
         let subject = PassthroughSubject<FlashResponse, Error>()
         self.subject = subject

Packages/RuuviDFU/target.yml

@@ -8,4 +8,3 @@ targets:
       name: DFU
     dependencies:
     - package: NordicDFU
-    - target: RuuviLocalization

Packages/RuuviOntology/Sources/RuuviOntologySQLite/SensorSettingsSQLite.swift

@@ -82,7 +82,7 @@ extension SensorSettingsSQLite: PersistableRecord {
 public extension SensorSettingsSQLite {
     static func createTable(in db: Database) throws {
         try db.create(table: SensorSettingsSQLite.databaseTableName, body: { table in
-            table.column(RuuviTagDataSQLite.idColumn.name, .text).notNull().primaryKey(onConflict: .replace)
+            table.column(SensorSettingsSQLite.idColumn.name, .text).notNull().primaryKey(onConflict: .replace)
             table.column(SensorSettingsSQLite.luidColumn.name, .text)
             table.column(SensorSettingsSQLite.macIdColumn.name, .text)
             table.column(SensorSettingsSQLite.temperatureOffsetColumn.name, .double)

Packages/RuuviReactor/Sources/RuuviReactorImpl/RuuviReactorImpl.swift

@@ -152,8 +152,6 @@ class RuuviReactorImpl: RuuviReactor {
         sqlitePersistence.readSensorSettings(ruuviTag).on { sqliteRecord in
             if let sensorSettings = sqliteRecord {
                 block(.update(sensorSettings))
-            } else {
-                assertionFailure()
             }
         }
         var sensorSettingsCombine: SensorSettingsCombine