fix bluetooth scan issues on older Android devices by asking for location permission

.github/workflows/build.yml

@@ -4,6 +4,12 @@ on:
   push:
     branches:
       - main
+    paths:
+      - '.github/workflows/**'
+      - 'lib/**'
+      - 'accessibility/**'
+      - 'keypress_simulator/**'
+      - 'pubspec.yaml'
 
 jobs:
   build:

CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 2.0.2 (2025-04-07)
+- fix bluetooth scan issues on older Android devices by asking for location permission
+
+#### 2.0.1 (2025-04-06)
+- long pressing a button will trigger the action again every 250ms
+
 #### 2.0.0 (2025-04-06)
 - You can now customize the actions (touches, mouse clicks or keyboard keys) for all buttons on all supported Zwift devices
 - now shows the battery level of the connected devices

README.md

@@ -4,7 +4,12 @@
 
 ## Description
 
-With SwiftControl you can control your favorite trainer app using your Zwift Click, Zwift Ride or Zwift Play devices. Primarily useful to perform virtual gear shifting.
+With SwiftControl you can control your favorite trainer app using your Zwift Click, Zwift Ride or Zwift Play devices. Here's what you can do with it, depending on your configuration:
+- Virtual Gear shifting
+- Steering / turning
+- adjust workout intensity
+- control music on your device
+- more? If you can do it via keyboard, mouse or touch, you can do it with SwiftControl
 
 
 https://github.com/user-attachments/assets/1f81b674-1628-4763-ad66-5f3ed7a3f159
@@ -46,7 +51,7 @@ The app connects to your Zwift device automatically.
   - you can also use the mouse to click on a certain part of the screen, or use keyboard shortcuts
 
 ## Donate
-Please consider donating to support the development of this app. 
+Please consider donating to support the development of this app :)
 
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/boni)
 

lib/bluetooth/devices/base_device.dart

@@ -14,6 +14,7 @@ import 'package:swift_control/utils/single_line_exception.dart';
 import 'package:universal_ble/universal_ble.dart';
 
 import '../../utils/crypto/encryption_utils.dart';
+import '../../utils/keymap/buttons.dart';
 import '../messages/notification.dart';
 
 abstract class BaseDevice {
@@ -26,6 +27,8 @@ abstract class BaseDevice {
 
   bool supportsEncryption = true;
 
+  Timer? _longPressTimer;
+
   List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_CLICK;
   String get customServiceId => BleUuid.ZWIFT_CUSTOM_SERVICE_UUID;
 
@@ -230,12 +233,31 @@ abstract class BaseDevice {
       case Constants.CLICK_NOTIFICATION_MESSAGE_TYPE:
       case Constants.PLAY_NOTIFICATION_MESSAGE_TYPE:
       case Constants.RIDE_NOTIFICATION_MESSAGE_TYPE: // untested
-        processClickNotification(message).then((_) {}).catchError((e) {
-          actionStreamInternal.add(LogNotification(e.toString()));
-        });
+        processClickNotification(message)
+            .then((buttonsClicked) async {
+              if (buttonsClicked == null) {
+                // ignore, no changes
+              } else if (buttonsClicked.isEmpty) {
+                actionStreamInternal.add(LogNotification('Buttons released'));
+                _longPressTimer?.cancel();
+              } else {
+                _longPressTimer?.cancel();
+                _longPressTimer = Timer.periodic(const Duration(milliseconds: 250), (timer) async {
+                  for (final action in buttonsClicked) {
+                    actionStreamInternal.add(LogNotification(await actionHandler.performAction(action)));
+                  }
+                });
+                for (final action in buttonsClicked) {
+                  actionStreamInternal.add(LogNotification(await actionHandler.performAction(action)));
+                }
+              }
+            })
+            .catchError((e) {
+              actionStreamInternal.add(LogNotification(e.toString()));
+            });
         break;
     }
   }
 
-  Future<void> processClickNotification(Uint8List message);
+  Future<List<ZwiftButton>?> processClickNotification(Uint8List message);
 }

lib/bluetooth/devices/zwift_click.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/bluetooth/messages/notification.dart';
-import 'package:swift_control/main.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
 
 import '../messages/click_notification.dart';
 
@@ -11,19 +10,17 @@ class ZwiftClick extends BaseDevice {
   ClickNotification? _lastClickNotification;
 
   @override
-  Future<void> processClickNotification(Uint8List message) async {
+  Future<List<ZwiftButton>?> processClickNotification(Uint8List message) async {
     final ClickNotification clickNotification = ClickNotification(message);
     if (_lastClickNotification == null || _lastClickNotification != clickNotification) {
       _lastClickNotification = clickNotification;
+
       if (clickNotification.buttonsClicked.isNotEmpty) {
         actionStreamInternal.add(clickNotification);
       }
-
-      final buttons = clickNotification.buttonsClicked;
-
-      for (final action in buttons) {
-        actionStreamInternal.add(LogNotification(await actionHandler.performAction(action)));
-      }
+      return clickNotification.buttonsClicked;
+    } else {
+      return null;
     }
   }
 }

lib/bluetooth/devices/zwift_play.dart

@@ -1,10 +1,11 @@
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
 import 'package:swift_control/bluetooth/devices/base_device.dart';
 import 'package:swift_control/bluetooth/messages/play_notification.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
 
-import '../../main.dart';
 import '../ble.dart';
-import '../messages/notification.dart';
 
 class ZwiftPlay extends BaseDevice {
   ZwiftPlay(super.scanResult);
@@ -15,7 +16,7 @@ class ZwiftPlay extends BaseDevice {
   List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_PLAY;
 
   @override
-  Future<void> processClickNotification(Uint8List message) async {
+  Future<List<ZwiftButton>?> processClickNotification(Uint8List message) async {
     final PlayNotification clickNotification = PlayNotification(message);
     if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
       _lastControllerNotification = clickNotification;
@@ -24,11 +25,9 @@ class ZwiftPlay extends BaseDevice {
         actionStreamInternal.add(clickNotification);
       }
 
-      final buttons = clickNotification.buttonsClicked;
-
-      for (final action in buttons) {
-        actionStreamInternal.add(LogNotification(await actionHandler.performAction(action)));
-      }
+      return clickNotification.buttonsClicked;
+    } else {
+      return null;
     }
   }
 }

lib/bluetooth/devices/zwift_ride.dart

@@ -2,10 +2,9 @@ import 'dart:typed_data';
 
 import 'package:swift_control/bluetooth/devices/base_device.dart';
 import 'package:swift_control/bluetooth/messages/ride_notification.dart';
-import 'package:swift_control/main.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
 
 import '../ble.dart';
-import '../messages/notification.dart';
 
 class ZwiftRide extends BaseDevice {
   ZwiftRide(super.scanResult);
@@ -19,19 +18,17 @@ class ZwiftRide extends BaseDevice {
   RideNotification? _lastControllerNotification;
 
   @override
-  Future<void> processClickNotification(Uint8List message) async {
+  Future<List<ZwiftButton>?> processClickNotification(Uint8List message) async {
     final RideNotification clickNotification = RideNotification(message);
     if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
       _lastControllerNotification = clickNotification;
+
       if (clickNotification.buttonsClicked.isNotEmpty) {
         actionStreamInternal.add(clickNotification);
       }
-
-      final buttons = clickNotification.buttonsClicked;
-
-      for (final action in buttons) {
-        actionStreamInternal.add(LogNotification(await actionHandler.performAction(action)));
-      }
+      return clickNotification.buttonsClicked;
+    } else {
+      return null;
     }
   }
 }

lib/pages/scan.dart

@@ -30,9 +30,13 @@ class _ScanWidgetState extends State<ScanWidget> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       // must be called from a button
       if (!kIsWeb) {
-        Future.delayed(Duration(seconds: 1)).then((_) {
-          connection.performScanning();
-        });
+        Future.delayed(Duration(seconds: 1))
+            .then((_) {
+              return connection.performScanning();
+            })
+            .catchError((e) {
+              print(e);
+            });
       }
     });
   }

lib/utils/requirements/android.dart

@@ -34,6 +34,21 @@ class BluetoothScanRequirement extends PlatformRequirement {
   }
 }
 
+class LocationRequirement extends PlatformRequirement {
+  LocationRequirement() : super('Allow Location so Bluetooth scan works');
+
+  @override
+  Future<void> call() async {
+    await Permission.locationWhenInUse.request();
+  }
+
+  @override
+  Future<void> getStatus() async {
+    final state = await Permission.locationWhenInUse.status;
+    status = state.isGranted || state.isLimited;
+  }
+}
+
 class BluetoothConnectRequirement extends PlatformRequirement {
   BluetoothConnectRequirement() : super('Allow Bluetooth Connections');
 

lib/utils/requirements/platform.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:swift_control/utils/requirements/android.dart';
@@ -29,12 +30,18 @@ Future<List<PlatformRequirement>> getRequirements() async {
   } else if (Platform.isWindows) {
     list = [BluetoothTurnedOn(), KeyboardRequirement(), BluetoothScanning()];
   } else if (Platform.isAndroid) {
+    final deviceInfoPlugin = DeviceInfoPlugin();
+    final deviceInfo = await deviceInfoPlugin.androidInfo;
     list = [
       BluetoothTurnedOn(),
       AccessibilityRequirement(),
       NotificationRequirement(),
-      BluetoothScanRequirement(),
-      BluetoothConnectRequirement(),
+      if (deviceInfo.version.sdkInt <= 30)
+        LocationRequirement()
+      else ...[
+        BluetoothScanRequirement(),
+        BluetoothConnectRequirement(),
+      ],
       BluetoothScanning(),
     ];
   } else {

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,6 +5,7 @@
 import FlutterMacOS
 import Foundation
 
+import device_info_plus
 import file_selector_macos
 import flutter_local_notifications
 import keypress_simulator_macos
@@ -16,6 +17,7 @@ import url_launcher_macos
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   KeypressSimulatorMacosPlugin.register(with: registry.registrar(forPlugin: "KeypressSimulatorMacosPlugin"))

pubspec.lock

@@ -128,6 +128,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.11"
+  device_info_plus:
+    dependency: "direct main"
+    description:
+      name: device_info_plus
+      sha256: "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.3.3"
+  device_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: device_info_plus_platform_interface
+      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.2"
   fake_async:
     dependency: transitive
     description:
@@ -912,6 +928,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.12.0"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   window_manager:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: swift_control
 description: "SwiftControl - Control your virtual riding"
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 2.0.0+0
+version: 2.0.2+0
 
 environment:
   sdk: ^3.7.0
@@ -19,6 +19,7 @@ dependencies:
   image_picker: ^1.1.2
   pointycastle: any
   window_manager: ^0.4.3
+  device_info_plus: ^11.3.3
   keypress_simulator:
     path: keypress_simulator/packages/keypress_simulator
   shared_preferences: ^2.5.3