Merge pull request #29 from jimmyeao/dev

Fixes for MQTT connectivity in #10
jimmyeao · Feb 20, 2024 · 9279ec2 · 9279ec2
2 parents d59fb39 + 3b286d2
commit 9279ec2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -464,6 +464,7 @@ private async void ReestablishConnections()
                 if (!mqttClientWrapper.IsConnected)
                 {
                     await mqttClientWrapper.ConnectAsync();
+                    await mqttClientWrapper.SubscribeAsync("homeassistant/switch/+/set", MqttQualityOfServiceLevel.AtLeastOnce);
                     SetupMqttSensors();
                 }
                 if (!_teamsClient.IsConnected)
@@ -588,6 +589,7 @@ private async void CheckMqttConnection()
             {
                 Log.Debug("CheckMqttConnection: MQTT Client Not Connected. Attempting reconnection.");
                 await mqttClientWrapper.ConnectAsync();
+                await mqttClientWrapper.SubscribeAsync("homeassistant/switch/+/set", MqttQualityOfServiceLevel.AtLeastOnce);
                 UpdateConnectionStatus();
             }
         }
@@ -1076,6 +1078,7 @@ private async void TestMQTTConnection_Click(object sender, RoutedEventArgs e)
                     }
                     UpdateStatusMenuItems();
                     Log.Debug("TestMQTTConnection_Click: MQTT Client Connected in TestMQTTConnection_Click");
+                    await mqttClientWrapper.SubscribeAsync("homeassistant/switch/+/set", MqttQualityOfServiceLevel.AtLeastOnce);
                     return; // Exit the method if connected
                 }
                 catch (Exception ex)

diff --git a/TEAMS2HA.csproj b/TEAMS2HA.csproj
@@ -5,8 +5,8 @@
     <TargetFramework>net7.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <AssemblyVersion>1.1.0.280</AssemblyVersion>
-    <FileVersion>1.1.0.280</FileVersion>
+    <AssemblyVersion>1.1.0.282</AssemblyVersion>
+    <FileVersion>1.1.0.282</FileVersion>
     <ApplicationIcon>Assets\Square150x150Logo.scale-200.ico</ApplicationIcon>
     <Title>Teams2HA</Title>
     <PackageIcon>Square150x150Logo.scale-200.png</PackageIcon>