fix: Squashed all commits into one

Author: samruddhi-Rahegaonkar

lib/bademagic_module/bluetooth/connect_state.dart

@@ -11,54 +11,37 @@ class ConnectState extends RetryBleState {
 
   @override
   Future<BleState?> processState() async {
-    bool connected = false;
-    try {
-      await scanResult.device.disconnect();
-      logger.d("Pre-emptive disconnect for clean state");
-      await Future.delayed(const Duration(seconds: 1));
-    } catch (_) {
-      // Ignore disconnect errors
-    }
     try {
+      try {
+        await scanResult.device.disconnect();
+        logger.d("Pre-emptive disconnect for clean state");
+        await Future.delayed(const Duration(seconds: 1));
+      } catch (_) {
+        logger.d("No existing connection to disconnect");
+      }
+
       await scanResult.device.connect(autoConnect: false);
       BluetoothConnectionState connectionState =
           await scanResult.device.connectionState.first;
 
       if (connectionState == BluetoothConnectionState.connected) {
-        connected = true;
-
-        logger.d("Device connected");
+        logger.d("Device connected successfully");
         toast.showToast('Device connected successfully.');
 
-        final writeState =
-            WriteState(device: scanResult.device, manager: manager);
-        final result = await writeState.process();
-        try {
-          await scanResult.device.disconnect();
-          logger.d("Device disconnected after transfer");
-          await Future.delayed(const Duration(seconds: 1));
-          logger.d("Waited 1s after disconnect");
-        } catch (e) {
-          logger.e("Error during disconnect after transfer: $e");
-        }
-        return result;
+        manager.connectedDevice = scanResult.device;
+
+        final writeState = WriteState(
+          device: scanResult.device,
+          manager: manager,
+        );
+
+        return await writeState.process();
       } else {
         throw Exception("Failed to connect to the device");
       }
     } catch (e) {
-      toast.showErrorToast('Failed to connect retrying...');
+      toast.showErrorToast('Failed to connect. Retrying...');
       rethrow;
-    } finally {
-      if (!connected) {
-        try {
-          await scanResult.device.disconnect();
-          logger.d("Device disconnected in finally block");
-          await Future.delayed(const Duration(seconds: 1));
-          logger.d("Waited 1s after disconnect (finally)");
-        } catch (e) {
-          logger.e("Error during disconnect in finally: $e");
-        }
-      }
     }
   }
 }

lib/bademagic_module/bluetooth/datagenerator.dart

@@ -3,20 +3,30 @@ import 'package:badgemagic/bademagic_module/utils/data_to_bytearray_converter.da
 import 'package:badgemagic/bademagic_module/utils/file_helper.dart';
 import 'package:badgemagic/providers/badge_message_provider.dart';
 import 'package:badgemagic/providers/imageprovider.dart';
+import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get_it/get_it.dart';
 
 class DataTransferManager {
   final Data data;
-  //make it singleton
 
-  DataTransferManager(this.data);
+  /// Keeps the connected Bluetooth device for reuse.
+  BluetoothDevice? connectedDevice;
 
+  /// Other existing properties.
   final BadgeMessageProvider badgeData = BadgeMessageProvider();
-  DataToByteArrayConverter converter = DataToByteArrayConverter();
-  FileHelper fileHelper = FileHelper();
-  InlineImageProvider controllerData = GetIt.instance<InlineImageProvider>();
+  final DataToByteArrayConverter converter = DataToByteArrayConverter();
+  final FileHelper fileHelper = FileHelper();
+  final InlineImageProvider controllerData =
+      GetIt.instance<InlineImageProvider>();
+
+  DataTransferManager(this.data);
 
   Future<List<List<int>>> generateDataChunk() async {
     return converter.convert(data);
   }
+
+  /// Helper to clear the currently connected device.
+  void clearConnectedDevice() {
+    connectedDevice = null;
+  }
 }

lib/bademagic_module/bluetooth/scan_state.dart

@@ -11,34 +11,35 @@ class ScanState extends NormalBleState {
 
   @override
   Future<BleState?> processState() async {
-    StreamSubscription<List<ScanResult>>? subscription;
-    toast.showToast("Searching for device...");
+    manager.clearConnectedDevice();
+    await FlutterBluePlus.stopScan();
 
+    toast.showToast("Searching for device...");
     Completer<BleState?> nextStateCompleter = Completer();
-    bool isCompleted = false;
+    StreamSubscription<List<ScanResult>>? subscription;
 
+    bool isCompleted = false;
     try {
       subscription = FlutterBluePlus.scanResults.listen(
         (results) async {
-          if (!isCompleted && results.isNotEmpty) {
-            try {
-              final foundDevice = results.firstWhere(
-                (result) => result.advertisementData.serviceUuids
-                    .contains(Guid("0000fee0-0000-1000-8000-00805f9b34fb")),
-                orElse: () => throw Exception("Matching device not found."),
-              );
+          if (isCompleted || results.isEmpty) return;
 
-              toast.showToast('Device found. Connecting...');
-              isCompleted = true;
-              await FlutterBluePlus.stopScan();
+          try {
+            final foundDevice = results.firstWhere(
+              (r) => r.advertisementData.serviceUuids.contains(
+                Guid("0000fee0-0000-1000-8000-00805f9b34fb"),
+              ),
+              orElse: () => throw Exception("Matching device not found."),
+            );
 
-              nextStateCompleter.complete(ConnectState(
-                scanResult: foundDevice,
-                manager: manager,
-              ));
-            } catch (e) {
-              // Ignore and keep scanning
-            }
+            isCompleted = true;
+            await FlutterBluePlus.stopScan();
+            toast.showToast('Device found. Connecting...');
+            nextStateCompleter.complete(
+              ConnectState(scanResult: foundDevice, manager: manager),
+            );
+          } catch (_) {
+            // Ignore and keep scanning
           }
         },
         onError: (e) {
@@ -47,8 +48,9 @@ class ScanState extends NormalBleState {
             FlutterBluePlus.stopScan();
             logger.e("Scan error: $e");
             toast.showErrorToast('Scan error occurred.');
-            nextStateCompleter
-                .completeError(Exception("Error during scanning: $e"));
+            nextStateCompleter.completeError(
+              Exception("Error during scanning: $e"),
+            );
           }
         },
       );
@@ -65,7 +67,7 @@ class ScanState extends NormalBleState {
       if (!isCompleted) {
         isCompleted = true;
         FlutterBluePlus.stopScan();
-        toast.showToast('Device not found.');
+        toast.showErrorToast('Device not found.');
         nextStateCompleter.completeError(Exception('Device not found.'));
       }