Change auto alarm delete behaviour

vicolo-dev · Apr 26, 2024 · 8019459 · 8019459
1 parent 3387db9
commit 8019459
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/lib/alarm/logic/alarm_isolate.dart b/lib/alarm/logic/alarm_isolate.dart
@@ -1,8 +1,6 @@
 import 'dart:isolate';
 import 'dart:ui';
 
-import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
-import 'package:clock_app/alarm/logic/alarm_reminder_notifications.dart';
 import 'package:clock_app/common/types/json.dart';
 import 'package:clock_app/common/types/notification_type.dart';
 import 'package:clock_app/common/utils/list_storage.dart';
@@ -84,7 +82,6 @@ void triggerAlarm(int scheduleId, Json params) async {
   }
 
   Alarm? alarm = getAlarmById(scheduleId);
-  await updateAlarmById(scheduleId, (alarm) async => alarm.handleTrigger());
   DateTime now = DateTime.now();
 
   // if alarm is triggered more than 10 minutes after the scheduled time, ignore
@@ -158,6 +155,7 @@ void stopAlarm(int scheduleId, AlarmStopAction action) async {
     }
   }
   RingingManager.stopAlarm();
+  await updateAlarmById(scheduleId, (alarm) async => alarm.handleDismiss());
 }
 
 void triggerTimer(int scheduleId, Json params) async {

diff --git a/lib/alarm/types/alarm.dart b/lib/alarm/types/alarm.dart
@@ -289,14 +289,11 @@ class Alarm extends CustomizableListItem {
 
   Future<void> finish() async {
     await disable();
-    if (shouldDeleteAfterFinish) {
-      _delete();
-    }
-    // _isFinished = true;
+        // _isFinished = true;
   }
 
-  void handleTrigger() {
-    if (scheduleType == OnceAlarmSchedule && shouldDeleteAfterRinging) {
+  void handleDismiss() {
+    if (scheduleType == OnceAlarmSchedule && shouldDeleteAfterRinging || shouldDeleteAfterFinish && isFinished) {
       _markedForDeletion = true;
     }
   }
@@ -335,9 +332,9 @@ class Alarm extends CustomizableListItem {
     }
   }
 
-  void _delete() {
-    _markedForDeletion = true;
-  }
+  // void _delete() {
+  //   _markedForDeletion = true;
+  // }
 
   void setTime(Time time) {
     _time = time;