Merge pull request #96 from meshtastic/wip

Obsolete method and hex string
meshtastic · Oct 30, 2024 · 31a5c9c · 31a5c9c
2 parents 4955972 + 2148ea7
commit 31a5c9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Meshtastic.Cli/CommandHandlers/MqttProxyCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/MqttProxyCommandHandler.cs
@@ -91,7 +91,7 @@ private static MqttClientOptions GetMqttClientOptions(DeviceStateContainer conta
 
         if (container.LocalModuleConfig.Mqtt.TlsEnabled)
         {
-            builder = builder.WithTls()
+            builder = builder.WithTlsOptions(options => { })
                 .WithTcpServer(host, Int32.Parse(port ?? "8883"));
         }
         else {

diff --git a/Meshtastic/Extensions/ReflectionExtensions.cs b/Meshtastic/Extensions/ReflectionExtensions.cs
@@ -47,7 +47,12 @@ public static IEnumerable<PropertyInfo> GetProperties(this object instance)
             .Where(p => !Exclusions.Contains(p.Name));
     }
 
-    public static string GetSettingValue(this PropertyInfo property, object instance) =>
-        (property.GetValue(instance)?.ToString() ?? string.Empty).Replace("[", string.Empty).Replace("]", string.Empty);
-
+    public static string GetSettingValue(this PropertyInfo property, object instance)
+    {
+        if (property.PropertyType == typeof(ByteString)) {
+            var byteString = (ByteString)property.GetValue(instance)!;
+            return Convert.ToHexString(byteString.ToByteArray());
+        }
+        return (property.GetValue(instance)?.ToString() ?? string.Empty).Replace("[", string.Empty).Replace("]", string.Empty);
+    }
 }