From 803825d34cf0ac757c7b1d3c7cba451026649592 Mon Sep 17 00:00:00 2001
From: Dawid Wojtas <dawid.wojtas@mudita.com>
Date: Wed, 31 Jan 2024 16:12:14 +0100
Subject: [PATCH] [BH-1867][BH-1868] Fix alarm rings after deactivation

Fix the function that it's responsible for disabling
the snooze alarm. After snoozing the alarm
and deactivating the alarm device shouldn't ring.
---
 harmony_changelog.md                               |  1 +
 products/BellHybrid/apps/common/src/AlarmModel.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/harmony_changelog.md b/harmony_changelog.md
index 1c8c2c9c5c212290958a674f5623f592d51cae69..b2b11a5adcfa584e83e2ad62b1033bf6d0fd058c 100644
--- a/harmony_changelog.md
+++ b/harmony_changelog.md
@@ -5,6 +5,7 @@
 ### Fixed
 * Fixed source clock frequency computation for PWM module
 * Fixed initial watchdog configuration
+* Fixed alarm rings when deactivated during snooze
 
 ### Added
 * Added setting onboarding year to build date year
diff --git a/products/BellHybrid/apps/common/src/AlarmModel.cpp b/products/BellHybrid/apps/common/src/AlarmModel.cpp
index e6fe319cf76a3760e1d8356634b0a3eea3748c42..286ea0c3622351e0419a434d5bf648b19ca5baae 100644
--- a/products/BellHybrid/apps/common/src/AlarmModel.cpp
+++ b/products/BellHybrid/apps/common/src/AlarmModel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2024, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "models/AlarmModel.hpp"
@@ -80,11 +80,14 @@ namespace app
             return;
         }
         alarmEventPtr->enabled = value;
-        if (isSnoozeActive()) {
+        updateAlarm(*alarmEventPtr);
+        if (value) {
+            alarmStatus = alarms::AlarmStatus::Activated;
+        }
+        else {
+            alarmStatus = alarms::AlarmStatus::Deactivated;
             disableSnooze(*alarmEventPtr);
         }
-        updateAlarm(*alarmEventPtr);
-        alarmStatus = value ? alarms::AlarmStatus::Activated : alarms::AlarmStatus::Deactivated;
     }
     void AlarmModel::updateAlarm(AlarmEventRecord &alarm)
     {