Improve activity logic in Husqvarna Automower (#144057)

* Improve activity logic in Husqvarna Automower

* add test

Author: Thomas55555

homeassistant/components/husqvarna_automower/lawn_mower.py

@@ -110,10 +110,10 @@ def activity(self) -> LawnMowerActivity:
         mower_attributes = self.mower_attributes
         if mower_attributes.mower.state in PAUSED_STATES:
             return LawnMowerActivity.PAUSED
-        if mower_attributes.mower.activity in MOWING_ACTIVITIES:
+        if mower_attributes.mower.state in MowerStates.IN_OPERATION:
+            if mower_attributes.mower.activity == MowerActivities.GOING_HOME:
+                return LawnMowerActivity.RETURNING
             return LawnMowerActivity.MOWING
-        if mower_attributes.mower.activity == MowerActivities.GOING_HOME:
-            return LawnMowerActivity.RETURNING
         if (mower_attributes.mower.state == "RESTRICTED") or (
             mower_attributes.mower.activity in DOCKED_ACTIVITIES
         ):

tests/components/husqvarna_automower/test_lawn_mower.py

@@ -32,6 +32,11 @@
             MowerStates.IN_OPERATION,
             LawnMowerActivity.RETURNING,
         ),
+        (
+            MowerActivities.NOT_APPLICABLE,
+            MowerStates.IN_OPERATION,
+            LawnMowerActivity.MOWING,
+        ),
     ],
 )
 async def test_lawn_mower_states(