Merge pull request #128 from Myzel394/fix-migration

Fix migration
Myzel394 · Oct 3, 2023 · fb2500b · fb2500b
2 parents 92d19f9 + 2c99789
commit fb2500b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/lib/constants/values.dart b/lib/constants/values.dart
@@ -13,7 +13,7 @@ const LOCATION_INTERVAL = Duration(minutes: 1);
 const TRANSFER_DATA_USERNAME = "locus_transfer";
 final TRANSFER_SUCCESS_MESSAGE = Uint8List.fromList([1, 2, 3, 4]);
 
-const CURRENT_APP_VERSION = "0.15.0";
+const CURRENT_APP_VERSION = "0.15.1";
 
 const LOG_TAG = "LocusLog";
 

diff --git a/lib/screens/view_alarm_screen_widgets/ViewAlarmScreen.dart b/lib/screens/view_alarm_screen_widgets/ViewAlarmScreen.dart
@@ -313,6 +313,7 @@ class _ViewAlarmScreenState extends State<ViewAlarmScreen> {
               final child = (() {
                 switch (alarm.IDENTIFIER) {
                   case LocationAlarmType.geo:
+                  case LocationAlarmType.radiusBasedRegion:
                     return GeoLocationAlarmPreview(
                       view: widget.view,
                       alarm: alarm as GeoLocationAlarm,

diff --git a/lib/screens/view_alarm_screen_widgets/ViewAlarmSelectRadiusBasedScreen.dart b/lib/screens/view_alarm_screen_widgets/ViewAlarmSelectRadiusBasedScreen.dart
@@ -216,6 +216,7 @@ class _ViewAlarmSelectRadiusBasedScreenState
 
     switch (widget.type) {
       case LocationAlarmType.geo:
+      case LocationAlarmType.radiusBasedRegion:
         alarm = await showPlatformModalSheet(
           context: context,
           material: MaterialModalSheetData(

diff --git a/lib/services/location_alarm_service/enums.dart b/lib/services/location_alarm_service/enums.dart
@@ -7,6 +7,8 @@ enum LocationAlarmTriggerType {
 enum LocationAlarmType {
   geo,
   proximity,
+  // Required for migration, same as `geo`
+  radiusBasedRegion,
 }
 
 enum LocationRadiusBasedTriggerType {

diff --git a/lib/services/task_service/task.dart b/lib/services/task_service/task.dart
@@ -73,8 +73,9 @@ class Task extends ChangeNotifier with LocationBase {
             throw Exception("Unknown timer type");
         }
       })),
-      outstandingLocations: Map<String, int>.from(json["outstandingLocations"])
-          .map<LocationPointService, int>(
+      outstandingLocations:
+          Map<String, int>.from(json["outstandingLocations"] ?? {})
+              .map<LocationPointService, int>(
         (rawLocationData, tries) => MapEntry(
           LocationPointService.fromJSON(jsonDecode(rawLocationData)),
           tries,

diff --git a/lib/services/view_service/view.dart b/lib/services/view_service/view.dart
@@ -49,8 +49,7 @@ class TaskView extends ChangeNotifier with LocationBase {
     String? id,
     DateTime? lastAlarmCheck,
     List<LocationAlarmServiceBase>? alarms,
-  })
-      : _encryptionPassword = encryptionPassword,
+  })  : _encryptionPassword = encryptionPassword,
         alarms = alarms ?? [],
         lastAlarmCheck = lastAlarmCheck ?? DateTime.now(),
         id = id ?? const Uuid().v4();
@@ -62,7 +61,7 @@ class TaskView extends ChangeNotifier with LocationBase {
     final fragment = uri.fragment;
 
     final rawParameters =
-    const Utf8Decoder().convert(base64Url.decode(fragment));
+        const Utf8Decoder().convert(base64Url.decode(fragment));
     final parameters = jsonDecode(rawParameters);
 
     return ViewServiceLinkParameters(
@@ -76,10 +75,9 @@ class TaskView extends ChangeNotifier with LocationBase {
     );
   }
 
-  factory TaskView.fromJSON(final Map<String, dynamic> json) =>
-      TaskView(
+  factory TaskView.fromJSON(final Map<String, dynamic> json) => TaskView(
         encryptionPassword:
-        SecretKey(List<int>.from(json["encryptionPassword"])),
+            SecretKey(List<int>.from(json["encryptionPassword"])),
         nostrPublicKey: json["nostrPublicKey"],
         relays: List<String>.from(json["relays"]),
         name: json["name"] ?? "Unnamed Task",
@@ -92,6 +90,7 @@ class TaskView extends ChangeNotifier with LocationBase {
 
             switch (identifier) {
               case LocationAlarmType.geo:
+              case LocationAlarmType.radiusBasedRegion:
                 return GeoLocationAlarm.fromJSON(alarm);
               case LocationAlarmType.proximity:
                 return ProximityLocationAlarm.fromJSON(alarm);
@@ -109,8 +108,10 @@ class TaskView extends ChangeNotifier with LocationBase {
             : Colors.primaries[Random().nextInt(Colors.primaries.length)],
       );
 
-  static Future<TaskView> fetchFromNostr(final AppLocalizations l10n,
-      final ViewServiceLinkParameters parameters,) async {
+  static Future<TaskView> fetchFromNostr(
+    final AppLocalizations l10n,
+    final ViewServiceLinkParameters parameters,
+  ) async {
     final completer = Completer<TaskView>();
 
     final request = Request(generate64RandomHexChars(), [
@@ -152,7 +153,7 @@ class TaskView extends ChangeNotifier with LocationBase {
                 relays: List<String>.from(data['relays']),
                 name: l10n.longFormattedDate(DateTime.now()),
                 color:
-                Colors.primaries[Random().nextInt(Colors.primaries.length)],
+                    Colors.primaries[Random().nextInt(Colors.primaries.length)],
               ),
             );
           } catch (error) {
@@ -199,7 +200,8 @@ class TaskView extends ChangeNotifier with LocationBase {
     };
   }
 
-  Future<String?> validate(final AppLocalizations l10n, {
+  Future<String?> validate(
+    final AppLocalizations l10n, {
     required final TaskService taskService,
     required final ViewService viewService,
   }) async {
@@ -208,14 +210,14 @@ class TaskView extends ChangeNotifier with LocationBase {
     }
 
     final sameTask = taskService.tasks.firstWhereOrNull(
-            (element) => element.nostrPublicKey == nostrPublicKey);
+        (element) => element.nostrPublicKey == nostrPublicKey);
 
     if (sameTask != null) {
       return l10n.taskImport_error_sameTask(sameTask.name);
     }
 
     final sameView = viewService.views.firstWhereOrNull(
-            (element) => element.nostrPublicKey == nostrPublicKey);
+        (element) => element.nostrPublicKey == nostrPublicKey);
 
     if (sameView != null) {
       return l10n.taskImport_error_sameView(sameView.name);

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.15.0+36
+version: 0.15.1+37
 
 environment:
   sdk: '>=3.0.0'