From 5f4a1f768e7ff14cca412b3219855a7bbf300ecc Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 8 Apr 2025 13:32:50 -0500 Subject: [PATCH 1/2] fix: check for grant code in mobileadduiclient If the grant code was not provided, the `mobileadduiclient` console command would fail silently. The command now checks that the correct number of arguments was provided and prints an error to the console of one is missing --- .../WebSocketServer/MobileControlWebsocketServer.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs index 8cf96cc5..cd75dcb7 100644 --- a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs +++ b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs @@ -679,6 +679,14 @@ namespace PepperDash.Essentials.WebSocketServer } var values = s.Split(' '); + + if(values.Length < 2) + { + CrestronConsole.ConsoleCommandResponse("Invalid number of arguments. Please provide a room key and a grant code"); + return; + } + + var roomKey = values[0]; var grantCode = values[1]; From 3770c2a47dbb465f34b7e827bef9a08cd11563e4 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 8 Apr 2025 13:35:58 -0500 Subject: [PATCH 2/2] fix: call the `EssentialsDevice` custom activate `CrestronGenericBaseDevice` was NOT calling `base.CustomActivate()` in it's `CustomActivate` override, causing the `CreateMobileControlMessengers` method to not be called as expected when plugin devices were inheriting from `CrestronGenericBaseDevice` or `CrestronGenericBridgeableBaseDevice`. --- .../Crestron/CrestronGenericBaseDevice.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs b/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs index 9669ca43..ce543885 100644 --- a/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs +++ b/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs @@ -104,7 +104,7 @@ namespace PepperDash.Essentials.Core Hardware.OnlineStatusChange += Hardware_OnlineStatusChange; CommunicationMonitor.Start(); - return true; + return base.CustomActivate(); } ///