Fix fallback mode (revert to stream after success or fail)

Author: OleksandrChaika

src/Context.h

@@ -54,6 +54,7 @@ namespace sua {
         std::shared_ptr<IBundleChecker>         bundleChecker;
         std::string                             updatesDirectory = "/data/selfupdates";
         bool                                    downloadMode = true;
+        bool                                    fallbackMode = false;
 
         DesiredState desiredState;
         CurrentState currentState;

src/FSM/States/Installing.cpp

@@ -58,6 +58,12 @@ namespace sua {
         if(result == TechCode::OK) {
             Logger::info("Installation completed");
             send(ctx, IMqttProcessor::TOPIC_FEEDBACK, "installed");
+
+            if(ctx.fallbackMode) {
+                ctx.downloadMode = false;
+                ctx.fallbackMode = false;
+            }
+
             return FotaEvent::InstallCompleted;
         }
 
@@ -67,13 +73,20 @@ namespace sua {
         // for download mode transit to fail state
         if (true == ctx.downloadMode) {
             send(ctx, IMqttProcessor::TOPIC_FEEDBACK, "installFailed", lastError);
+
+            if(ctx.fallbackMode) {
+                ctx.downloadMode = false;
+                ctx.fallbackMode = false;
+            }
+
             return FotaEvent::InstallFailed;
         }
 
         // for stream mode start again in download mode
         Logger::info("Trying normal download mode as fallback");
         send(ctx, IMqttProcessor::TOPIC_FEEDBACK, "installFailedFallback", lastError);
         ctx.downloadMode = true;
+        ctx.fallbackMode = true;
         return FotaEvent::InstallFailedFallback;
     }
 

utest/TestMqttMessagingProtocolJSON.cpp

@@ -723,8 +723,6 @@ namespace {
 
     TEST_F(TestMessagingProtocolJSON, createMessage_installFailedFallback)
     {
-        d.installProgressPercentage = 66;
-
         const std::string result = ProtocolJSON().createMessage(ctx, "installFailedFallback");
 
         // clang-format off