[MQTT] never publish force to the refresh/mode to prevent never ending polling

Author: tisoft

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - MQTT
   - keep message fetch thread alive after connection failures
   - Make sure car state is updated after successful command
+  - never publish `force` to the `refresh/mode` to prevent never ending polling
 
 ### Dependencies
 - Bump `version.picocli` from 4.7.3 to 4.7.4 (#29)

saic-java-mqtt-gateway/src/main/java/net/heberling/ismart/mqtt/VehicleState.java

@@ -608,15 +608,20 @@ public void setRefreshPeriodInactive(long refreshPeriodInactive) {
 
   public void setRefreshMode(RefreshMode refreshMode) {
     if (this.refreshMode == null || this.refreshMode != refreshMode) {
-
-      MqttMessage mqttMessage =
-          new MqttMessage(refreshMode.getStringValue().getBytes(StandardCharsets.UTF_8));
-      try {
-        LOGGER.info("Setting refresh mode to {}", refreshMode.getStringValue());
-        mqttMessage.setRetained(true);
-        this.client.publish(this.mqttVINPrefix + "/" + REFRESH_MODE, mqttMessage);
-      } catch (MqttException e) {
-        throw new MqttGatewayException("Error publishing message: " + mqttMessage, e);
+      LOGGER.info("Setting refresh mode to {}", refreshMode.getStringValue());
+
+      if (refreshMode != FORCE) {
+        // never send force mode to MQTT.
+        // If we get restarted while force mode is active, the configuration from MQTT
+        // feature would enable force mode permanently and polling of the car never stops
+        MqttMessage mqttMessage =
+            new MqttMessage(refreshMode.getStringValue().getBytes(StandardCharsets.UTF_8));
+        try {
+          mqttMessage.setRetained(true);
+          this.client.publish(this.mqttVINPrefix + "/" + REFRESH_MODE, mqttMessage);
+        } catch (MqttException e) {
+          throw new MqttGatewayException("Error publishing message: " + mqttMessage, e);
+        }
       }
     }
     this.previousRefreshMode = this.refreshMode;