merge

1 files changed, 17 insertions, 13 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 573e56fff..986bf483f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -11,6 +11,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using Tango.BL;
+using Tango.BL.Builders;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
 using Tango.Core.DI;
@@ -26,7 +27,7 @@ using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.Speech;
 using Tango.MachineStudio.Common.StudioApplication;
-using Tango.MachineStudio.Common.Update;
+using Tango.MachineStudio.Common.Web;
 using Tango.MachineStudio.UI.StudioApplication;
 using Tango.MachineStudio.UI.SupervisingController;
 using Tango.MachineStudio.UI.TFS;
@@ -54,6 +55,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         private Thread _updateCheckThread;
         private IEventLogger _eventLogger;
         private MachineStudioSettings _settings;
+        private MachineStudioWebClient _machineStudioWebClient;
 
         /// <summary>
         /// Gets or sets the current loaded module.
@@ -280,8 +282,10 @@ namespace Tango.MachineStudio.UI.ViewModels
             IEventLogger eventLogger,
             IDiagnosticsFrameProvider frameProvider,
             ISpeechProvider speechProvider,
-            TeamFoundationServiceExtendedClient tfs) : base()
+            TeamFoundationServiceExtendedClient tfs,
+            MachineStudioWebClient machineStudioWebClient) : base()
         {
+            _machineStudioWebClient = machineStudioWebClient;
             TFSClient = tfs;
             _eventLogger = eventLogger;
             _navigation = navigationManager;
@@ -356,11 +360,8 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     if (_authenticationProvider.CurrentUser != null)
                     {
-                        var client = new MachineStudioUpdateService();
-
-                        CheckForUpdatesResponse response = client.CheckForUpdates(new CheckForUpdatesRequest()
+                        CheckForUpdatesResponse response = _machineStudioWebClient.CheckForUpdates(new CheckForUpdatesRequest()
                         {
-                            AccessToken = _authenticationProvider.AccessToken,
                             Version = _applicationManager.Version.ToString(),
                         }).Result;
 
@@ -483,7 +484,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                                         if (x.UploadHardwareConfiguration)
                                         {
-                                            UploadHardwareConfiguration();
+                                            UploadHardwareConfiguration(false);
                                         }
 
                                     }
@@ -525,7 +526,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                                             if (x.UploadHardwareConfiguration)
                                             {
-                                                UploadHardwareConfiguration();
+                                                UploadHardwareConfiguration(false);
                                             }
                                         }
                                         catch (Exception ex)
@@ -615,18 +616,21 @@ namespace Tango.MachineStudio.UI.ViewModels
             InvalidateRelayCommands();
         }
 
-        private async void UploadHardwareConfiguration()
+        private async void UploadHardwareConfiguration(bool showSuccessMessage = true)
         {
             try
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    var config = db.Adapter.GetConfiguration(s => s.Guid == ApplicationManager.Machine.ConfigurationGuid);
-                    var hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.Machine.Guid);
+                    var config = (await new ConfigurationBuilder(db).Set(ApplicationManager.Machine.ConfigurationGuid).WithIdsPacks().WithHardwareVersion().BuildAsync());
+
+                    await ApplicationManager.ConnectedMachine.UploadHardwareConfiguration(config.HardwareVersion, config);
+                }
 
-                    await ApplicationManager.ConnectedMachine.UploadHardwareConfiguration(hw, config);
+                if (showSuccessMessage)
+                {
+                    NotificationProvider.ShowInfo("Hardware configuration uploaded successfully.");
                 }
-                NotificationProvider.ShowInfo("Hardware configuration uploaded successfully.");
             }
             catch (Exception ex)
             {