Remove legacy connected gear checl

OpenTails · Jun 18, 2024 · b8bbde8 · b8bbde8
1 parent 072978c
commit b8bbde8
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 34 deletions.
diff --git a/lib/Backend/Bluetooth/bluetooth_manager_plus.dart b/lib/Backend/Bluetooth/bluetooth_manager_plus.dart
@@ -35,7 +35,6 @@ StreamSubscription<void>? _keepAliveStreamSubscription;
 
 final _bluetoothPlusLogger = log.Logger('BluetoothPlus');
 
-ValueNotifier<bool> isAnyGearConnected = ValueNotifier(false);
 ValueNotifier<bool> isBluetoothEnabled = ValueNotifier(false);
 
 bool _didInitFlutterBluePlus = false;
@@ -101,7 +100,6 @@ Future<void> initFlutterBluePlus(InitFlutterBluePlusRef ref) async {
       }
       // The timer used for the time value on the battery level graph
       statefulDevice.stopWatch.start();
-      isAnyGearConnected.value = true;
       if (HiveProxy.getOrDefault(settings, keepAwake, defaultValue: keepAwakeDefault)) {
         _bluetoothPlusLogger.fine('Enabling wakelock');
         WakelockPlus.enable();
@@ -156,7 +154,6 @@ Future<void> initFlutterBluePlus(InitFlutterBluePlusRef ref) async {
             element.enabled = false;
           },
         );
-        isAnyGearConnected.value = false;
         _bluetoothPlusLogger.finer('Disabling wakelock');
         // stop wakelock if its started
         WakelockPlus.disable();
@@ -326,7 +323,6 @@ Future<void> initFlutterBluePlus(InitFlutterBluePlusRef ref) async {
     ref.read(knownDevicesProvider).forEach(
           (key, value) => value.deviceConnectionState.value = ConnectivityState.disconnected,
         );
-    isAnyGearConnected.value = false;
     isBluetoothEnabled.value = false;
     _didInitFlutterBluePlus = false; // Allow restarting ble stack
   });

diff --git a/lib/Backend/sensors.dart b/lib/Backend/sensors.dart
@@ -186,7 +186,7 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
   TriggerDefinition(this.ref);
 
   Future<void> sendCommands(String name, Ref ref) async {
-    if (!isAnyGearConnected.value) {
+    if (ref.read(getAvailableGearProvider).isEmpty) {
       return;
     }
     actions.values.flattened.where((e) => actionTypes.firstWhere((element) => element.name == name).uuid == e.uuid).forEach(

diff --git a/lib/Frontend/Widgets/back_button_to_close.dart b/lib/Frontend/Widgets/back_button_to_close.dart
@@ -5,7 +5,7 @@ import 'package:back_button_interceptor/back_button_interceptor.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../../Backend/Bluetooth/bluetooth_manager_plus.dart';
+import '../../Backend/device_registry.dart';
 import '../translation_string_definitions.dart';
 
 class BackButtonToClose extends ConsumerStatefulWidget {
@@ -35,7 +35,7 @@ class _BackButtonToCloseState extends ConsumerState<BackButtonToClose> {
   // ignore: avoid_positional_boolean_parameters
   bool myInterceptor(bool stopDefaultButtonEvent, RouteInfo info) {
     if (info.currentRoute(context)!.isFirst && info.currentRoute(context)!.isCurrent) {
-      if (isAnyGearConnected.value) {
+      if (ref.read(getAvailableGearProvider).isNotEmpty) {
         return true;
       }
       if (timer.isActive) {

diff --git a/lib/Frontend/Widgets/bt_app_state_controller.dart b/lib/Frontend/Widgets/bt_app_state_controller.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../Backend/Bluetooth/bluetooth_manager_plus.dart';
+import '../../Backend/device_registry.dart';
 import '../../Backend/logging_wrappers.dart';
 import '../../constants.dart';
 
@@ -28,7 +29,7 @@ class _BtAppStateControllerState extends ConsumerState<BtAppStateController> {
         }
       },
       onPause: () {
-        if (!isAnyGearConnected.value && ref.exists(initFlutterBluePlusProvider)) {
+        if (ref.read(getAvailableGearProvider).isEmpty && ref.exists(initFlutterBluePlusProvider)) {
           ref.invalidate(initFlutterBluePlusProvider);
         }
       },
@@ -48,7 +49,7 @@ class _BtAppStateControllerState extends ConsumerState<BtAppStateController> {
   void dispose() {
     super.dispose();
     _listener.dispose();
-    if (!isAnyGearConnected.value && ref.exists(initFlutterBluePlusProvider)) {
+    if (ref.read(getAvailableGearProvider).isEmpty && ref.exists(initFlutterBluePlusProvider)) {
       ref.invalidate(initFlutterBluePlusProvider);
     }
   }

diff --git a/lib/Frontend/Widgets/known_gear_scan_controller.dart b/lib/Frontend/Widgets/known_gear_scan_controller.dart
@@ -10,6 +10,7 @@ import 'package:sentry_hive/sentry_hive.dart';
 import '../../Backend/Bluetooth/bluetooth_manager.dart';
 import '../../Backend/Bluetooth/bluetooth_manager_plus.dart';
 import '../../Backend/Definitions/Device/device_definition.dart';
+import '../../Backend/device_registry.dart';
 import '../../constants.dart';
 
 final knownGearScanControllerLogger = log.Logger('KnownGearScanController');
@@ -39,7 +40,7 @@ class _KnownGearScanControllerState extends ConsumerState<KnownGearScanControlle
       },
       //onResume: () => _handleTransition('resume'),
       onHide: () async {
-        if (!isAnyGearConnected.value) {
+        if (ref.read(getAvailableGearProvider).isEmpty) {
           await stopScan();
         }
       },

diff --git a/lib/Frontend/Widgets/scan_for_new_device.dart b/lib/Frontend/Widgets/scan_for_new_device.dart
@@ -192,7 +192,6 @@ class _ScanForNewDevice extends ConsumerState<ScanForNewDevice> {
                                 baseStoredDevice = BaseStoredDevice(value.uuid, "DEV${value.deviceType.name}", value.deviceType.color(ref: ref).value)..name = getNameFromBTName(value.btName);
                                 statefulDevice = BaseStatefulDevice(value, baseStoredDevice);
                                 statefulDevice.deviceConnectionState.value = ConnectivityState.connected;
-                                isAnyGearConnected.value = true;
                                 if (!ref.read(knownDevicesProvider).containsKey(baseStoredDevice.btMACAddress)) {
                                   ref.read(knownDevicesProvider.notifier).add(statefulDevice);
                                 }
@@ -216,9 +215,7 @@ class _ScanForNewDevice extends ConsumerState<ScanForNewDevice> {
                             .where(
                               (element) => element.deviceConnectionState.value == ConnectivityState.connected,
                             )
-                            .isEmpty) {
-                          isAnyGearConnected.value = false;
-                        }
+                            .isEmpty) {}
                         context.pop();
                       },
                     ),

diff --git a/lib/Frontend/pages/developer/developer_menu.dart b/lib/Frontend/pages/developer/developer_menu.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
-import '../../../Backend/Bluetooth/bluetooth_manager_plus.dart';
 import '../../../Backend/logging_wrappers.dart';
 import '../../../constants.dart';
 import '../../../main.dart';
@@ -108,19 +107,6 @@ class _DeveloperMenuState extends ConsumerState<DeveloperMenu> {
               },
             ),
           ),
-          ListTile(
-            title: const Text("isAnyGearConnected"),
-            trailing: Switch(
-              value: isAnyGearConnected.value,
-              onChanged: (bool value) {
-                setState(
-                  () {
-                    isAnyGearConnected.value = value;
-                  },
-                );
-              },
-            ),
-          ),
           ListTile(
             title: const Text("SentryEnvironment"),
             subtitle: FutureBuilder(

diff --git a/test/Backend/action_registry_test.dart b/test/Backend/action_registry_test.dart
@@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart' as flTest;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:tail_app/Backend/Bluetooth/bluetooth_manager.dart';
-import 'package:tail_app/Backend/Bluetooth/bluetooth_manager_plus.dart';
 import 'package:tail_app/Backend/Definitions/Action/base_action.dart';
 import 'package:tail_app/Backend/Definitions/Device/device_definition.dart';
 import 'package:tail_app/Backend/action_registry.dart';
@@ -18,7 +17,6 @@ void main() {
   });
   tearDown(() async {
     await deleteHive();
-    isAnyGearConnected.value = false;
   });
   test('All actions count', () {
     expect(ActionRegistry.allCommands.length, 26);

diff --git a/test/Backend/device_definition_test.dart b/test/Backend/device_definition_test.dart
@@ -1,7 +1,6 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart' as flTest;
 import 'package:tail_app/Backend/Bluetooth/bluetooth_manager.dart';
-import 'package:tail_app/Backend/Bluetooth/bluetooth_manager_plus.dart';
 import 'package:tail_app/Backend/Definitions/Device/device_definition.dart';
 import 'package:test/test.dart';
 
@@ -16,7 +15,6 @@ void main() {
   });
   tearDown(() async {
     await deleteHive();
-    isAnyGearConnected.value = false;
   });
   group('Stateful Device event listeners', () {
     test('Battery Levels', () async {

diff --git a/test/testing_utils/gear_utils.dart b/test/testing_utils/gear_utils.dart
@@ -1,7 +1,6 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:tail_app/Backend/Bluetooth/bluetooth_manager.dart';
-import 'package:tail_app/Backend/Bluetooth/bluetooth_manager_plus.dart';
 import 'package:tail_app/Backend/Definitions/Device/device_definition.dart';
 import 'package:tail_app/Backend/device_registry.dart';
 import 'package:tail_app/Backend/logging_wrappers.dart';
@@ -14,7 +13,6 @@ Future<BaseStatefulDevice> createAndStoreGear(String gearBtName, ProviderContain
   baseStoredDevice = BaseStoredDevice(baseDeviceDefinition.uuid, "$gearMacPrefix${baseDeviceDefinition.deviceType.name}", baseDeviceDefinition.deviceType.color(ref: ref).value)..name = getNameFromBTName(baseDeviceDefinition.btName);
   statefulDevice = BaseStatefulDevice(baseDeviceDefinition, baseStoredDevice);
   statefulDevice.deviceConnectionState.value = ConnectivityState.connected;
-  isAnyGearConnected.value = true;
   if (!ref.read(knownDevicesProvider).containsKey(baseStoredDevice.btMACAddress)) {
     await ref.read(knownDevicesProvider.notifier).add(statefulDevice);
   }