Scope loader messages to the circuit connection.

immense · Mar 11, 2024 · 686dc78 · 686dc78
1 parent 7478d63
commit 686dc78
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/Server/Hubs/CircuitConnection.cs b/Server/Hubs/CircuitConnection.cs
@@ -261,7 +261,7 @@ public async Task<Result<RemoteControlSessionEx>> RemoteControl(string deviceId,
                 "There are already the maximum amount of active remote control sessions for your organization.",
                 "Max number of concurrent sessions reached.",
                 "bg-warning");
-
+            
             await _messenger.Send(message, ConnectionId);
 
             return Result.Fail<RemoteControlSessionEx>("Max number of concurrent sessions reached.");

diff --git a/Server/Services/LoaderService.cs b/Server/Services/LoaderService.cs
@@ -1,8 +1,7 @@
 using Immense.RemoteControl.Shared.Primitives;
 using Immense.SimpleMessenger;
+using Remotely.Server.Hubs;
 using Remotely.Server.Models.Messages;
-using System;
-using System.Threading.Tasks;
 
 namespace Remotely.Server.Services;
 
@@ -12,23 +11,16 @@ public interface ILoaderService
     void HideLoader();
 }
 
-public class LoaderService : ILoaderService
+public class LoaderService(IMessenger _messenger, ICircuitConnection _circuitConnection) : ILoaderService
 {
-    private readonly IMessenger _messenger;
-
-    public LoaderService(IMessenger messenger)
-    {
-        _messenger = messenger;
-    }
-
     public async Task<IDisposable> ShowLoader(string statusMessage)
     {
-        await _messenger.Send(new ShowLoaderMessage(true, statusMessage));
+        await _messenger.Send(new ShowLoaderMessage(true, statusMessage), _circuitConnection.ConnectionId);
         return new CallbackDisposable(HideLoader);
     }
 
     public void HideLoader()
     {
-        _messenger.Send(new ShowLoaderMessage(false, string.Empty));
+        _messenger.Send(new ShowLoaderMessage(false, string.Empty), _circuitConnection.ConnectionId);
     }
 }