Refactored machine studio service.

7 files changed, 12 insertions, 12 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
index 9be938fb7..452b706df 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -15,6 +15,7 @@ using Tango.Settings;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.Core.Helpers;
+using Tango.MachineStudio.Common.Web;
 
 namespace Tango.MachineStudio.UI.Authentication
 {
@@ -56,9 +57,9 @@ namespace Tango.MachineStudio.UI.Authentication
         {
             var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
 
+            IMachineStudioService service = new MachineStudioService();
 
-            IWebTransportClient service = new WebTransportClient();
-            var response = service.PostJson<LoginRequest, LoginResponse>(settings.GetMachineServiceAddress() + "/api/MachineStudio/Login", new LoginRequest()
+            var response = service.Login(new LoginRequest()
             {
 
                 Email = email,
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Messages/ChangeVersionMessage.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Messages/ChangeVersionMessage.cs
index fc616f359..a0fdec8ed 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Messages/ChangeVersionMessage.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Messages/ChangeVersionMessage.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.MachineStudio.Common.Authentication;
-using Tango.MachineStudio.Common.Update;
+using Tango.MachineStudio.Common.Web;
 
 namespace Tango.MachineStudio.UI.Messages
 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Messages/ForcedUpdateMessage.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Messages/ForcedUpdateMessage.cs
index 38bc82b6e..54b43c6d3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Messages/ForcedUpdateMessage.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Messages/ForcedUpdateMessage.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.MachineStudio.Common.Update;
+using Tango.MachineStudio.Common.Web;
 
 namespace Tango.MachineStudio.UI.Messages
 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index 283ea3637..e55d0534e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -17,7 +17,7 @@ using Tango.MachineStudio.Common.EventLogging;
 using Tango.BL.Enumerations;
 using Tango.MachineStudio.UI.TFS;
 using Tango.MachineStudio.Common;
-using Tango.MachineStudio.Common.Update;
+using Tango.MachineStudio.Common.Web;
 using Tango.Core.DI;
 using Tango.Settings;
 using Tango.Core;
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 1d03dd389..64043e556 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -27,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;
@@ -357,7 +357,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     if (_authenticationProvider.CurrentUser != null)
                     {
-                        var client = new MachineStudioUpdateService();
+                        var client = new MachineStudioService();
 
                         CheckForUpdatesResponse response = client.CheckForUpdates(new CheckForUpdatesRequest()
                         {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
index 63cff2242..8d4553e32 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
@@ -19,12 +19,13 @@ using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
-using Tango.MachineStudio.Common.Update;
+using Tango.MachineStudio.Common.Web;
 using Tango.SharedUI;
 using Tango.MachineStudio.UI.Messages;
 using Tango.Settings;
 using Tango.MachineStudio.Common;
 using Tango.Transport.Web;
+using Tango.MachineStudio.Common.Web;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
@@ -168,7 +169,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             Status = UpdateStatus.CheckingForUpdate;
 
-            var client = new MachineStudioUpdateService();
+            var client = new MachineStudioService();
 
             DownloadLatestVersionResponse response = await client.DownloadLatestVersion(new DownloadLatestVersionRequest()
             {
@@ -215,7 +216,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     Thread.Sleep(2000);
 
-                    var client = new MachineStudioUpdateService();
+                    var client = new MachineStudioService();
 
                     CheckForUpdatesResponse response = client.CheckForUpdates(new CheckForUpdatesRequest()
                     {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 696cc051f..d9cb20d03 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -60,8 +60,6 @@
                             <TextBlock><Run Text="{Binding DataSource.Address,Mode=OneWay}"></Run>
                                 <Run>(</Run><Run Foreground="Gray" Text="{Binding DataSource.Catalog,Mode=OneWay}"></Run><Run>)</Run>
                             </TextBlock>
-                            <TextBlock FontWeight="SemiBold">Allow BETA Updates:</TextBlock>
-                            <ToggleButton IsChecked="{Binding MachineStudioSettings.AcceptBetaRelease,Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Bottom"></ToggleButton>
                         </controls:TableGrid>
 
                         <DockPanel Margin="0 0 0 0">