1 files changed, 51 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index 267012e2e..7c6bed928 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -72,6 +72,13 @@ namespace Tango.PPC.MachineSettings.ViewModels
             set { _externalBridgePassword = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _enableRemoteAssistance;
+        public bool EnableRemoteAssistance
+        {
+            get { return _enableRemoteAssistance; }
+            set { _enableRemoteAssistance = value; RaisePropertyChangedAuto(); OnEnableRemoteAssistanceChanged(); }
+        }
+
         #endregion
 
         #region Commands
@@ -137,13 +144,54 @@ namespace Tango.PPC.MachineSettings.ViewModels
             Machine = new Machine();
             MachineProvider.Machine.ShallowCopyTo(Machine);
             RaisePropertyChanged(nameof(Machine));
-            _enableHotSpot = ConnectivityProvider.IsHotspotActive;
+
+            _enableHotSpot = HotSpotProvider.IsEnabled;
             RaisePropertyChanged(nameof(EnableHotSpot));
 
+            HotSpotPassword = Settings.HotSpotPassword;
+
+            _enableExternalBridge = ExternalBridgeService.Enabled;
+            RaisePropertyChanged(nameof(EnableExternalBridge));
+
+            ExternalBridgePassword = Settings.ExternalBridgePassword;
+
+            _enableRemoteAssistance = RemoteAssistanceProvider.IsEnabled;
+            RaisePropertyChanged(nameof(EnableRemoteAssistance));
+
 
             SelectedJobTypes = new SelectedObjectCollection<JobTypes>(Enum.GetValues(typeof(JobTypes)).Cast<JobTypes>().ToObservableCollection(), Machine.SupportedJobTypes.ToObservableCollection());
         }
 
+        private async void OnEnableRemoteAssistanceChanged()
+        {
+            if (EnableRemoteAssistance)
+            {
+                try
+                {
+                    await RemoteAssistanceProvider.EnableRemoteAssistance();
+                }
+                catch
+                {
+                    await NotificationProvider.ShowError("An error occurred while trying to activate the remote assistance service. Please check your device settings and try again.");
+                    _enableRemoteAssistance = false;
+                }
+            }
+            else
+            {
+                try
+                {
+                    await RemoteAssistanceProvider.DisableRemoteAssistance();
+                }
+                catch
+                {
+                    await NotificationProvider.ShowError("An error occurred while trying to deactivate the remote assistance service. Please check your device settings and try again.");
+                    _enableRemoteAssistance = true;
+                }
+            }
+
+            RaisePropertyChanged(nameof(EnableRemoteAssistance));
+        }
+
         private async void OnEnableHotSpotChanged()
         {
             if (EnableHotSpot)
@@ -158,7 +206,7 @@ namespace Tango.PPC.MachineSettings.ViewModels
 
                 try
                 {
-                    await ConnectivityProvider.EnableHotSpot(HotSpotPassword);
+                    await HotSpotProvider.EnableHotSpot(HotSpotPassword);
                 }
                 catch
                 {
@@ -170,7 +218,7 @@ namespace Tango.PPC.MachineSettings.ViewModels
             {
                 try
                 {
-                    await ConnectivityProvider.DisableHotSpot();
+                    await HotSpotProvider.DisableHotSpot();
                 }
                 catch
                 {