Merge disconnect conditions

pennam · pennam · commit 03e87ba69060 · 2024-04-09T14:53:10.000+02:00
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
@@ -444,12 +444,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeThingTopics()
 {
-  if (!_mqttClient.connected())
-  {
-    return State::Disconnect;
-  }
-
-  if (_thing_id_property->isDifferentFromCloud())
+  if (!_mqttClient.connected() || _thing_id_property->isDifferentFromCloud())
   {
     return State::Disconnect;
   }
@@ -490,12 +485,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeThingTopics()
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_RequestLastValues()
 {
-  if (!_mqttClient.connected())
-  {
-    return State::Disconnect;
-  }
-
-  if (_thing_id_property->isDifferentFromCloud())
+  if (!_mqttClient.connected() || _thing_id_property->isDifferentFromCloud())
   {
     return State::Disconnect;
   }

Original file line number	Diff line number	Diff line change
`@@ -444,12 +444,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()`
`444`	`444`
`445`	`445`	`ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeThingTopics()`
`446`	`446`	`{`
`447`		`- if (!_mqttClient.connected())`
`448`		`- {`
`449`		`- return State::Disconnect;`
`450`		`- }`
`451`		`-`
`452`		`- if (_thing_id_property->isDifferentFromCloud())`
	`447`	`+ if (!_mqttClient.connected() \|\| _thing_id_property->isDifferentFromCloud())`
`453`	`448`	`{`
`454`	`449`	`return State::Disconnect;`
`455`	`450`	`}`
`@@ -490,12 +485,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeThingTopics()`
`490`	`485`
`491`	`486`	`ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_RequestLastValues()`
`492`	`487`	`{`
`493`		`- if (!_mqttClient.connected())`
`494`		`- {`
`495`		`- return State::Disconnect;`
`496`		`- }`
`497`		`-`
`498`		`- if (_thing_id_property->isDifferentFromCloud())`
	`488`	`+ if (!_mqttClient.connected() \|\| _thing_id_property->isDifferentFromCloud())`
`499`	`489`	`{`
`500`	`490`	`return State::Disconnect;`
`501`	`491`	`}`