Remove stopOnNotificationOpen

gdelataillade · Nov 16, 2023 · 22671f1 · 22671f1
1 parent f3f0f5c
commit 22671f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -63,7 +63,6 @@ fadeDuration |   `double`     | Duration, in seconds, over which to fade the ala
 notificationTitle |   `String`     | The title of the notification triggered when alarm rings if app is on background.
 notificationBody | `String` | The body of the notification.
 enableNotificationOnKill |   `bool`     | Whether to show a notification when application is killed to warn the user that the alarm he set may not ring. Enabled by default.
-stopOnNotificationOpen |   `bool`     | Whether to stop the alarm when opening the received notification. Disabled by default.
 androidFullScreenIntent |   `bool`     | Whether to turn screen on when android alarm notification is triggered. Enabled by default.
 
 The notification shown on alarm ring can be disabled simply by ignoring the parameters `notificationTitle` and `notificationBody`. However, if you want a notification to be triggered, you will have to provide **both of them**.

diff --git a/lib/model/alarm_settings.dart b/lib/model/alarm_settings.dart
@@ -39,9 +39,6 @@ class AlarmSettings {
   /// the user that the alarms won't ring anymore. Enabled by default.
   final bool enableNotificationOnKill;
 
-  /// Stops the alarm on opened notification.
-  final bool stopOnNotificationOpen;
-
   /// Whether to turn screen on when android alarm notification is triggered. Enabled by default.
   final bool androidFullScreenIntent;
 
@@ -60,7 +57,6 @@ class AlarmSettings {
     hash = hash ^ (notificationTitle.hashCode);
     hash = hash ^ (notificationBody.hashCode);
     hash = hash ^ enableNotificationOnKill.hashCode;
-    hash = hash ^ stopOnNotificationOpen.hashCode;
     hash = hash & 0x3fffffff;
 
     return hash;
@@ -82,7 +78,6 @@ class AlarmSettings {
     required this.notificationTitle,
     required this.notificationBody,
     this.enableNotificationOnKill = true,
-    this.stopOnNotificationOpen = false,
     this.androidFullScreenIntent = true,
   });
 
@@ -97,9 +92,10 @@ class AlarmSettings {
         fadeDuration: json['fadeDuration'] as double,
         notificationTitle: json['notificationTitle'] as String,
         notificationBody: json['notificationBody'] as String,
-        enableNotificationOnKill: json['enableNotificationOnKill'] as bool,
-        stopOnNotificationOpen: json['stopOnNotificationOpen'] as bool,
-        androidFullScreenIntent: json['androidFullScreenIntent'] as bool,
+        enableNotificationOnKill:
+            json['enableNotificationOnKill'] as bool? ?? true,
+        androidFullScreenIntent:
+            json['androidFullScreenIntent'] as bool? ?? true,
       );
 
   /// Creates a copy of `AlarmSettings` but with the given fields replaced with
@@ -115,7 +111,6 @@ class AlarmSettings {
     String? notificationTitle,
     String? notificationBody,
     bool? enableNotificationOnKill,
-    bool? stopOnNotificationOpen,
     bool? androidFullScreenIntent,
   }) {
     return AlarmSettings(
@@ -130,8 +125,6 @@ class AlarmSettings {
       notificationBody: notificationBody ?? this.notificationBody,
       enableNotificationOnKill:
           enableNotificationOnKill ?? this.enableNotificationOnKill,
-      stopOnNotificationOpen:
-          stopOnNotificationOpen ?? this.stopOnNotificationOpen,
       androidFullScreenIntent:
           androidFullScreenIntent ?? this.androidFullScreenIntent,
     );
@@ -149,7 +142,6 @@ class AlarmSettings {
         'notificationTitle': notificationTitle,
         'notificationBody': notificationBody,
         'enableNotificationOnKill': enableNotificationOnKill,
-        'stopOnNotificationOpen': stopOnNotificationOpen,
         'androidFullScreenIntent': androidFullScreenIntent,
       };
 
@@ -178,6 +170,5 @@ class AlarmSettings {
           notificationTitle == other.notificationTitle &&
           notificationBody == other.notificationBody &&
           enableNotificationOnKill == other.enableNotificationOnKill &&
-          stopOnNotificationOpen == other.stopOnNotificationOpen &&
           androidFullScreenIntent == other.androidFullScreenIntent;
 }
diff --git a/lib/service/notification.dart b/lib/service/notification.dart
@@ -25,45 +25,16 @@ class AlarmNotification {
       requestAlertPermission: false,
       requestSoundPermission: false,
       requestBadgePermission: false,
-      onDidReceiveLocalNotification: onSelectNotificationOldIOS,
     );
     const initializationSettings = InitializationSettings(
       android: initializationSettingsAndroid,
       iOS: initializationSettingsIOS,
     );
 
-    await localNotif.initialize(
-      initializationSettings,
-      onDidReceiveBackgroundNotificationResponse: onSelectNotification,
-      onDidReceiveNotificationResponse: onSelectNotification,
-    );
+    await localNotif.initialize(initializationSettings);
     tz.initializeTimeZones();
   }
 
-  // Callback to stop the alarm when the notification is opened.
-  static onSelectNotification(NotificationResponse notificationResponse) async {
-    if (notificationResponse.id == null) return;
-    await stopAlarm(notificationResponse.id!);
-  }
-
-  // Callback to stop the alarm when the notification is opened for iOS versions older than 10.
-  static onSelectNotificationOldIOS(
-    int? id,
-    String? _,
-    String? __,
-    String? ___,
-  ) async {
-    if (id != null) await stopAlarm(id);
-  }
-
-  /// Stops the alarm.
-  static Future<void> stopAlarm(int id) async {
-    if (Alarm.getAlarm(id)?.stopOnNotificationOpen != null &&
-        Alarm.getAlarm(id)!.stopOnNotificationOpen) {
-      await Alarm.stop(id);
-    }
-  }
-
   /// Shows notification permission request.
   Future<bool> requestNotificationPermission() async {
     if (defaultTargetPlatform == TargetPlatform.iOS) {