address PR comments

Mosquito-Alert · May 9, 2024 · 080fd34 · 080fd34
1 parent 04e2055
commit 080fd34
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -40,8 +40,9 @@ void main({String env = 'prod'}) async {
   var timeUntilMidnight = nextMidnight.difference(now);
 
   await Workmanager().registerPeriodicTask(
-    'fiveTimesPerDayTracking',
-    'fiveTimesPerDayTracking',
+    'scheduleDailyTasks',
+    'scheduleDailyTasks',
+    tag: 'scheduleDailyTasks',
     frequency: Duration(days: 1),
     initialDelay: timeUntilMidnight,
     );
@@ -57,8 +58,8 @@ void callbackDispatcher() {
       case 'trackingTask':
         BackgroundTracking.trackingTask();
         break;
-      case 'fiveTimesPerDayTracking':
-        BackgroundTracking.fiveTimesPerDayTracking();
+      case 'scheduleDailyTasks':
+        BackgroundTracking.scheduleMultipleTrackingTask(5);
         break;
     }
     return Future.value(true);

diff --git a/lib/utils/BackgroundTracking.dart b/lib/utils/BackgroundTracking.dart
@@ -9,11 +9,11 @@ import 'package:workmanager/workmanager.dart';
 
 
 class BackgroundTracking{
-  static List<TimeOfDay> getRandomTimes() {
+  static List<TimeOfDay> getRandomTimes(int numSamples) {
     var random = Random();
     var randomTimes = <TimeOfDay>[];
 
-    for (var i = 0; i < 5; i++) {
+    for (var i = 0; i < numSamples; i++) {
       var hour = random.nextInt(24); // Random hour between 00 and 23
       var minute = random.nextInt(60); // Random minute between 00 and 59
       var time = TimeOfDay(hour: hour, minute: minute);
@@ -23,16 +23,18 @@ class BackgroundTracking{
     return randomTimes;
   }
 
-  static void fiveTimesPerDayTracking() {
-    var randomTimes = getRandomTimes();
+  static void scheduleMultipleTrackingTask(int numTasks) {
+    var randomTimes = getRandomTimes(numTasks);
 
-    for (var i = 0; i < 5; i++) {
-      Workmanager().registerOneOffTask(
-        'tracking_task_$i',
-        'trackingTask',
-        initialDelay: Duration(hours: randomTimes[i].hour, minutes: randomTimes[i].minute),
+    randomTimes.asMap().forEach((index, time) async {
+      await Workmanager().registerOneOffTask(
+      'tracking_task_$index',
+      'trackingTask',
+      initialDelay: Duration(hours: time.hour, minutes: time.minute),
+      tag: 'trackingTask',
+      constraints: Constraints(networkType: NetworkType.connected)
       );
-    }
+    });
   }
 
   static void trackingTask() async {