Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 4 insertions, 22 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 befad162c..c13c7379a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -20,7 +20,6 @@ using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Diagnostics;
 using Tango.MachineStudio.Common.EventLogging;
-using Tango.MachineStudio.Common.Html;
 using Tango.MachineStudio.Common.Messages;
 using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common.Navigation;
@@ -54,7 +53,6 @@ namespace Tango.MachineStudio.UI.ViewModels
         private bool _isDisconnecting;
         private Thread _updateCheckThread;
         private IEventLogger _eventLogger;
-        private IHtmlPresenter _htmlPresenter;
         private MachineStudioSettings _settings;
 
         /// <summary>
@@ -282,7 +280,7 @@ namespace Tango.MachineStudio.UI.ViewModels
             IEventLogger eventLogger,
             IDiagnosticsFrameProvider frameProvider,
             ISpeechProvider speechProvider,
-            IHtmlPresenter htmlPresenter, TeamFoundationServiceExtendedClient tfs) : base()
+            TeamFoundationServiceExtendedClient tfs) : base()
         {
             TFSClient = tfs;
             _eventLogger = eventLogger;
@@ -293,7 +291,6 @@ namespace Tango.MachineStudio.UI.ViewModels
             ApplicationManager = applicationManager;
             DiagnosticsFrameProvider = frameProvider;
             SpeechProvider = speechProvider;
-            _htmlPresenter = htmlPresenter;
 
             _settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
 
@@ -363,8 +360,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                         CheckForUpdatesResponse response = client.CheckForUpdates(new CheckForUpdatesRequest()
                         {
-                            Email = _authenticationProvider.CurrentUser.Email,
-                            Password = _authenticationProvider.CurrentUser.Password,
+                            AccessToken = _authenticationProvider.AccessToken,
                             Version = _applicationManager.Version.ToString(),
                             AcceptBetaRelease = _settings.AcceptBetaRelease,
                         }).Result;
@@ -455,7 +451,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                             //Check machine exist on my database first
                             if (x.SelectedMachine.Machine == null)
                             {
-                                _notificationProvider.ShowError( $"The specified machine '{x.SelectedMachine.SerialNumber}' could not be found on the database. Aborting connection.");
+                                _notificationProvider.ShowError($"The specified machine '{x.SelectedMachine.SerialNumber}' could not be found on the database. Aborting connection.");
                                 return;
                             }
 
@@ -783,21 +779,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// <param name="machineEvent">The HTML page.</param>
         private async void ResolveMachineEvent(MachinesEvent machineEvent)
         {
-            if (machineEvent.EventType.HtmlPage != null)
-            {
-                if (_htmlPresenter.DisplayHtml(machineEvent.EventType.HtmlPage))
-                {
-                    if (ApplicationManager.ConnectedMachine != null && machineEvent.EventType.Resolvable)
-                    {
-                        _eventLogger.Log(String.Format("Event '{0}' resolved by user.", machineEvent.EventType.Name));
-                        await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type);
-                    }
-                }
-            }
-            else
-            {
-                _notificationProvider.ShowWarning("Could not locate guidance content for the specified event.");
-            }
+
         }
 
         /// <summary>