fix(OTA): close HTTP connection before sending update status

esp-admin · Jun 22, 2024 · 00a56ed · 00a56ed
1 parent 757eeac
commit 00a56ed
Showing 1 changed file with 7 additions and 23 deletions.
diff --git a/src/OTA.cpp b/src/OTA.cpp
@@ -69,9 +69,10 @@ namespace ESPAdmin
 
                 if (err == ESP_OK)
                 {
-                    Store::updateRunning = false;
+                    _aborted = false;
                     Update::onChange(UPDATE_FAILED);
-                    break;
+                    Store::updateRunning = false;
+                    continue;
                 }
             }
 
@@ -89,33 +90,16 @@ namespace ESPAdmin
 
             if (err == ESP_OK)
             {
-                Store::updateRunning = false;
-
-                bool success = esp_https_ota_is_complete_data_received(_otaHandle);
-
-                if (success)
-                {
-                    Update::onChange(UPDATE_SUCCEDED);
-                }
-                else
-                {
-                    Update::onChange(UPDATE_FAILED);
-                }
+                esp_err_t err = esp_https_ota_finish(_otaHandle);
+                Update::onChange(err == ESP_OK ? UPDATE_SUCCEDED : UPDATE_FAILED);
             }
             else
             {
-                Store::updateRunning = false;
+                esp_https_ota_finish(_otaHandle);
                 Update::onChange(UPDATE_FAILED);
             }
-        }
 
-        if (_aborted == false)
-        {
-            esp_https_ota_finish(_otaHandle);
-        }
-        else
-        {
-            _aborted = false;
+            Store::updateRunning = false;
         }
 
         vTaskDelete(nullptr);