🔀 Merge branch 'yann/fix/lekaupdater/bug-on-sha256-verification'

leka · Sep 25, 2023 · 68cdb86 · 68cdb86
2 parents 4b5a070 + b70a1c5
commit 68cdb86
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Apps/LekaUpdater/Sources/Libs/UpdateProcess/Version/UpdateProcessV130.swift b/Apps/LekaUpdater/Sources/Libs/UpdateProcess/Version/UpdateProcessV130.swift
@@ -300,6 +300,7 @@ private class StateVerifyingFile: GKState, StateEventProcessor {
     private var cancellables: Set<AnyCancellable> = []
 
     private var isFileValid = false
+    private var lastValue = "0000000000000000000000000000000000000000000000000000000000000000"
 
     private var nextStateIsClearingFile = false
 
@@ -312,6 +313,8 @@ private class StateVerifyingFile: GKState, StateEventProcessor {
     override func didEnter(from previousState: GKState?) {
         if previousState is StateSettingDestinationPath {
             nextStateIsClearingFile = true
+        } else {
+            nextStateIsClearingFile = false
         }
 
         DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: startFileVerification)
@@ -349,9 +352,10 @@ private class StateVerifyingFile: GKState, StateEventProcessor {
             .sink { value in
                 guard let value = value else { return }
 
-                if value == "0000000000000000000000000000000000000000000000000000000000000000" {
+                if value == self.lastValue {
                     return
                 }
+                self.lastValue = value
 
                 self.isFileValid = value == globalFirmwareManager.sha256
                 self.process(event: .fileVerificationReceived)
@@ -524,6 +528,7 @@ class UpdateProcessV130: UpdateProcessProtocol {
 
     private var stateMachine: GKStateMachine?
     private var stateSendingFile = StateSendingFile()
+    private var stateVerifyingFile = StateVerifyingFile()
 
     private var cancellables: Set<AnyCancellable> = []
 
@@ -541,7 +546,7 @@ class UpdateProcessV130: UpdateProcessProtocol {
             StateSettingDestinationPath(),
             StateClearingFile(),
             stateSendingFile,
-            StateVerifyingFile(),
+            stateVerifyingFile,
             StateApplyingUpdate(),
             StateWaitingForRobotToReboot(),