fix wfb button available update

OpenIPC · Dec 18, 2024 · 33d4be4 · 33d4be4
1 parent 8dc6591
commit 33d4be4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/OpenIPC_Config/ViewModels/ViewModelBase.cs b/OpenIPC_Config/ViewModels/ViewModelBase.cs
@@ -14,6 +14,7 @@ public abstract class ViewModelBase : ObservableObject
     protected readonly ILogger Logger;
     protected readonly IEventSubscriptionService EventSubscriptionService;
 
+
     protected ViewModelBase(
         ILogger logger,
         ISshClientService sshClientService,
@@ -41,7 +42,8 @@ public virtual void UpdateUIMessage(string message)
         EventSubscriptionService.Publish<AppMessageEvent, AppMessage>(new AppMessage
         {
             Message = message,
-            UpdateLogView = false
+            UpdateLogView = false,
+            CanConnect = DeviceConfig.Instance.CanConnect
         });
     }
 }
diff --git a/OpenIPC_Config/ViewModels/WfbTabViewModel.cs b/OpenIPC_Config/ViewModels/WfbTabViewModel.cs
@@ -229,8 +229,8 @@ private async void RestartWfb()
         UpdateUIMessage("Restarting WFB...");
 
         EventSubscriptionService.Publish<TabMessageEvent, string>("Restart Pushed");
-        EventSubscriptionService.Publish<AppMessageEvent, AppMessage>(
-            new AppMessage { Message = "Getting new content", DeviceConfig = DeviceConfig.Instance });
+
+        UpdateUIMessage("Getting new content");
 
         var newFrequency58 = SelectedFrequency58String;
         var newFrequency24 = SelectedFrequency24String;
@@ -265,20 +265,16 @@ private async void RestartWfb()
         if (string.IsNullOrEmpty(updatedWfbConfContent))
             await MessageBoxManager.GetMessageBoxStandard("Error", "WfbConfContent is empty").ShowAsync();
 
-        EventSubscriptionService.Publish<AppMessageEvent, AppMessage>(
-            new AppMessage { Message = $"Uploading new {OpenIPC.WfbConfFileLoc}", DeviceConfig = DeviceConfig.Instance,
-                UpdateLogView = true });
+        UpdateUIMessage($"Uploading new {OpenIPC.WfbConfFileLoc}");
 
 
         Logger.Information($"Uploading new : {OpenIPC.WfbConfFileLoc}");
         await SshClientService.UploadFileStringAsync(DeviceConfig.Instance, OpenIPC.WfbConfFileLoc, WfbConfContent);
-
-        EventSubscriptionService.Publish<AppMessageEvent, AppMessage>(
-            new AppMessage { Message = "Restarting Wfb", DeviceConfig = DeviceConfig.Instance, UpdateLogView = true });
 
-        Logger.Information("Restarting Wfb");
+        UpdateUIMessage("Restarting Wfb");
 
         await SshClientService.ExecuteCommandAsync(DeviceConfig.Instance, DeviceCommands.WfbRestartCommand);
+        UpdateUIMessage("Restarting Wfb..done");
     }
 
     private void HandleFrequencyChange(string newValue, Dictionary<int, string> frequencyMapping)