Refactor code to improve cancellation handling and remove unused outputs in CI workflow

Author: oldrev

.github/workflows/flutter-ci.yml

@@ -19,8 +19,7 @@ jobs:
     defaults:
       run:
         working-directory: client
-    outputs:
-      flutter-version: ${{ steps.setup-flutter.outputs.flutter-version }}
+    # outputs removed as setup-flutter does not define flutter-version output
 
     steps:
       - name: Checkout code

client/lib/devices/borneo/lyfi/view_models/settings_view_model.dart

@@ -2,7 +2,7 @@ import 'package:borneo_app/devices/borneo/lyfi/view_models/base_lyfi_device_view
 import 'package:borneo_app/infrastructure/timezone.dart';
 import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:borneo_common/exceptions.dart' as bo_ex;
-import 'package:timezone/timezone.dart' as tz;
+import 'package:cancellation_token/cancellation_token.dart';
 import 'package:geolocator/geolocator.dart';
 
 import 'package:borneo_kernel/drivers/borneo/borneo_device_api.dart';
@@ -83,6 +83,7 @@ class SettingsViewModel extends BaseLyfiDeviceViewModel {
     });
   }
 
+  /*
   Duration _getTimeDifference(String timezone1, String timezone2) {
     final location1 = tz.getLocation(timezone1);
     final location2 = tz.getLocation(timezone2);
@@ -91,22 +92,22 @@ class SettingsViewModel extends BaseLyfiDeviceViewModel {
     final offset2 = tz.TZDateTime.now(location2).timeZoneOffset;
     return offset1 - offset2;
   }
+  */
 
-  Future<Position> getLocation() async {
-    // TODO cancellable
+  Future<Position> getLocation({CancellationToken? cancel}) async {
     bool serviceEnabled;
     LocationPermission permission;
 
     // Check if location services are enabled
-    serviceEnabled = await Geolocator.isLocationServiceEnabled();
+    serviceEnabled = await Geolocator.isLocationServiceEnabled().asCancellable(cancel);
     if (!serviceEnabled) {
       throw bo_ex.InvalidOperationException(message: 'Please enable location services');
     }
 
     // Check permissions
-    permission = await Geolocator.checkPermission();
+    permission = await Geolocator.checkPermission().asCancellable(cancel);
     if (permission == LocationPermission.denied) {
-      permission = await Geolocator.requestPermission();
+      permission = await Geolocator.requestPermission().asCancellable(cancel);
       if (permission == LocationPermission.denied) {
         throw bo_ex.PermissionDeniedException(message: 'Location permissions are denied');
       }
@@ -123,7 +124,7 @@ class SettingsViewModel extends BaseLyfiDeviceViewModel {
         timeLimit: Duration(seconds: 30),
         distanceFilter: 100,
       ),
-    );
+    ).asCancellable(cancel);
 
     return position;
   }

client/lib/services/device_manager.dart

@@ -146,9 +146,18 @@ final class DeviceManager implements IDisposable {
     deviceEvents.fire(DeviceEntityUpdatedEvent(oldEntity, updatedEntity));
   }
 
+  Future<bool> _groupExists(Transaction tx, String groupID) async {
+    final groupStore = stringMapStoreFactory.store(StoreNames.groups);
+    final groupRecord = await groupStore.record(groupID).get(tx);
+    return groupRecord != null;
+  }
+
   Future<void> moveToGroup(String id, String newGroupID) async {
     return await _db.transaction((tx) async {
-      // TODO ensure newGroupID exists
+      final exists = await _groupExists(tx, newGroupID);
+      if (!exists) {
+        throw KeyNotFoundException(message: 'Cannot find group with ID `$newGroupID`');
+      }
       return await _update(id, tx: tx, groupID: newGroupID);
     });
   }

client/lib/view_models/abstract_screen_view_model.dart

@@ -4,7 +4,7 @@ abstract class AbstractScreenViewModel extends BaseViewModel with ViewModelEvent
   bool _isInitialized = false;
   bool get isInitialized => _isInitialized;
 
-  AbstractScreenViewModel();
+  AbstractScreenViewModel({super.logger});
 
   Future<void> initialize() async {
     if (_isInitialized) {

client/lib/view_models/scenes/scene_edit_view_model.dart

@@ -2,7 +2,6 @@ import 'package:borneo_app/models/scene_entity.dart';
 import 'package:borneo_app/services/scene_manager.dart';
 import 'package:borneo_app/view_models/abstract_screen_view_model.dart';
 import 'package:event_bus/event_bus.dart';
-import 'package:logger/logger.dart';
 
 import '../base_view_model.dart';
 
@@ -14,7 +13,6 @@ final class SceneEditArguments {
 }
 
 class SceneEditViewModel extends AbstractScreenViewModel with ViewModelEventBusMixin {
-  final Logger? logger;
   final SceneManager _sceneManager;
   final bool isCreation;
   late final String? id;
@@ -29,7 +27,7 @@ class SceneEditViewModel extends AbstractScreenViewModel with ViewModelEventBusM
     this._sceneManager, {
     required this.isCreation,
     SceneEntity? model,
-    this.logger,
+    super.logger,
   }) : _deletionAvailable = !isCreation {
     super.globalEventBus = globalEventBus;
     if (isCreation) {

client/lib/widgets/icon_progress.dart

@@ -9,14 +9,14 @@ class IconProgressBar extends StatefulWidget {
   final Duration? duration;
 
   const IconProgressBar({
-    Key? key,
+    super.key,
     required this.icon,
     this.size = 50.0,
     required this.progress,
     this.backgroundColor = Colors.grey,
     this.progressColor = Colors.blue,
     this.duration,
-  }) : super(key: key);
+  });
 
   @override
   _IconProgressBarState createState() => _IconProgressBarState();

client/lib/widgets/map_location_picker.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:geocoding/geocoding.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:lat_lng_to_timezone/lat_lng_to_timezone.dart';
@@ -20,7 +19,7 @@ class _MapLocationPickerState extends State<MapLocationPicker> {
   LatLng? _userLocation;
   String? _currentTimeZone;
 
-  final TextEditingController _searchController = TextEditingController();
+  // final TextEditingController _searchController = TextEditingController();
 
   @override
   void initState() {
@@ -72,6 +71,7 @@ class _MapLocationPickerState extends State<MapLocationPicker> {
     });
   }
 
+  /*
   Future<List<String>> _getSuggestions(String query) async {
     if (query.isEmpty) return [];
     try {
@@ -105,6 +105,7 @@ class _MapLocationPickerState extends State<MapLocationPicker> {
       // Handle error
     }
   }
+  */
 
   bool _isSameLocation(LatLng? a, LatLng? b, {double epsilon = 1e-6}) {
     if (a == null || b == null) return false;

client/packages/borneo_common/pubspec.yaml

@@ -13,4 +13,5 @@ dependencies:
   cancellation_token: ^2.0.1
 
 dev_dependencies:
-  test: ^1.25.0
+  test: ^1.25.0
+  lints: ^6.0.0

client/packages/borneo_kernel/lib/drivers/borneo/lyfi/lyfi_driver.dart

@@ -408,8 +408,8 @@ class BorneoLyfiDriver
   @override
   Future<bool> heartbeat(Device dev, {CancellationToken? cancelToken}) async {
     try {
-      await getOnOff(dev).asCancellable(cancelToken); // FIXME
-      return true;
+      final dd = dev.driverData as LyfiDriverData;
+      return await dd.coap.ping().asCancellable(cancelToken);
     } catch (e) {
       return false;
     }

client/pubspec.yaml

@@ -101,6 +101,7 @@ dev_dependencies:
     sdk: flutter
   test: ^1.25.0
   build_runner: ^2.4.13
+  lints: ^6.0.0
 
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is