fix: logic of connect and scan

Author: samruddhi-Rahegaonkar

lib/bademagic_module/bluetooth/connect_state.dart

@@ -1,20 +1,13 @@
 import 'package:badgemagic/bademagic_module/bluetooth/datagenerator.dart';
 import 'package:badgemagic/bademagic_module/bluetooth/write_state.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
-import 'package:badgemagic/providers/BadgeAliasProvider.dart';
-import 'package:get_it/get_it.dart';
 import 'base_ble_state.dart';
 
 class ConnectState extends RetryBleState {
   final ScanResult scanResult;
   final DataTransferManager manager;
-  final String displayName;
 
-  ConnectState({
-    required this.manager,
-    required this.scanResult,
-    required this.displayName,
-  });
+  ConnectState({required this.manager, required this.scanResult});
 
   @override
   Future<BleState?> processState() async {
@@ -28,20 +21,12 @@ class ConnectState extends RetryBleState {
       if (connectionState == BluetoothConnectionState.connected) {
         connected = true;
 
-        String alias = displayName;
-        final aliasProvider = GetIt.I<BadgeAliasProvider>();
-        final maybeAlias = aliasProvider.getAlias(displayName);
-        if (maybeAlias != null && maybeAlias.trim().isNotEmpty) {
-          alias = maybeAlias;
-        }
-
-        logger.d("Device '$displayName' connected");
-        toast.showToast('Connected successfully to "$alias".');
+        logger.d("Device connected");
+        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");
@@ -50,17 +35,23 @@ class ConnectState extends RetryBleState {
         } catch (e) {
           logger.e("Error during disconnect after transfer: $e");
         }
-
         return result;
       } else {
         throw Exception("Failed to connect to the device");
       }
     } catch (e) {
-      toast.showErrorToast('Failed to connect to "$displayName", retrying...');
+      toast.showErrorToast('Failed to connect retrying...');
       rethrow;
     } finally {
       if (!connected) {
-        await scanResult.device.disconnect();
+        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/scan_state.dart

@@ -73,23 +73,18 @@ class ScanState extends NormalBleState {
             toast.showToast('Device found. Connecting...');
 
             final foundName = foundDevice.device.name.trim();
-            String? resolvedAlias;
 
             for (final real in allowedNames) {
               final alias = aliasProvider.getAlias(real)?.trim();
               if (alias != null &&
                   alias.toLowerCase() == foundName.toLowerCase()) {
-                resolvedAlias = alias;
                 break;
               }
             }
 
-            final displayName = resolvedAlias ?? foundName;
-
             nextStateCompleter.complete(ConnectState(
               scanResult: foundDevice,
               manager: manager,
-              displayName: displayName,
             ));
           } catch (e) {
             logger.w("No matching device found in this batch: $e");