From 293e01f2e920af208613cd5a7fbe28cf04bdec5d Mon Sep 17 00:00:00 2001
From: Thomas55555 <59625598+Thomas55555@users.noreply.github.com>
Date: Wed, 7 May 2025 13:12:10 +0200
Subject: [PATCH] Improve activity logic in Husqvarna Automower (#144057)

* Improve activity logic in Husqvarna Automower

* add test
---
 homeassistant/components/husqvarna_automower/lawn_mower.py | 6 +++---
 tests/components/husqvarna_automower/test_lawn_mower.py    | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/husqvarna_automower/lawn_mower.py b/homeassistant/components/husqvarna_automower/lawn_mower.py
index ee6007f089b..9ae214524a7 100644
--- a/homeassistant/components/husqvarna_automower/lawn_mower.py
+++ b/homeassistant/components/husqvarna_automower/lawn_mower.py
@@ -110,10 +110,10 @@ class AutomowerLawnMowerEntity(AutomowerAvailableEntity, LawnMowerEntity):
         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
         ):
diff --git a/tests/components/husqvarna_automower/test_lawn_mower.py b/tests/components/husqvarna_automower/test_lawn_mower.py
index a8c34a3fc79..12c53d709ca 100644
--- a/tests/components/husqvarna_automower/test_lawn_mower.py
+++ b/tests/components/husqvarna_automower/test_lawn_mower.py
@@ -32,6 +32,11 @@ from tests.common import MockConfigEntry, async_fire_time_changed
             MowerStates.IN_OPERATION,
             LawnMowerActivity.RETURNING,
         ),
+        (
+            MowerActivities.NOT_APPLICABLE,
+            MowerStates.IN_OPERATION,
+            LawnMowerActivity.MOWING,
+        ),
     ],
 )
 async def test_lawn_mower_states(