Implemeneted continuous ActivateVersionRequest.

Added Progress & Total.

1 files changed, 33 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 57613aae2..a95d34e96 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -3612,11 +3612,43 @@ namespace Tango.Integration.Operation
                 {
                     try
                     {
+                        TaskCompletionSource<object> activationCompletion = new TaskCompletionSource<object>();
+
+                        bool completed = false;
+
                         LogManager.Log("Activating version...");
+
                         upgradeHandler.RaiseProgress(upgradeHandler.Total, FirmwareUpgradeStatus.Activating, "Activating version...");
+
                         var activateRequest = new ActivateVersionRequest();
                         activateRequest.Path = package_folder;
-                        var activateResponse = SendRequest<ActivateVersionRequest, ActivateVersionResponse>(activateRequest, new TransportRequestConfig() { Timeout = TimeSpan.FromSeconds(10), ShouldLog = true }).Result;
+
+                        SendContinuousRequest<ActivateVersionRequest, ActivateVersionResponse>(activateRequest, new TransportContinuousRequestConfig() { Timeout = TimeSpan.FromSeconds(10), ContinuousTimeout = TimeSpan.FromSeconds(10), ShouldLog = true })
+                        .Subscribe((response) =>
+                        {
+                            if (!completed && response.Message.Progress > 0)
+                            {
+                                upgradeHandler.Total = (long)response.Message.Total;
+                                upgradeHandler.RaiseProgress((long)response.Message.Progress, FirmwareUpgradeStatus.Activating, "Activating version...");
+                            }
+                        }, (ex) =>
+                        {
+                            if (!completed)
+                            {
+                                completed = true;
+                                activationCompletion.SetException(ex);
+                            }
+                        }, () =>
+                        {
+                            if (!completed)
+                            {
+                                completed = true;
+                                activationCompletion.SetResult(true);
+                            }
+                        });
+
+                        var result = activationCompletion.Task.GetAwaiter().GetResult();
+
                         postActivation();
                     }
                     catch (Exception ex)