From 34a6b5d895f46d5b6c02345beabdefd6cbb29bda Mon Sep 17 00:00:00 2001
From: Winston Lowe <wel97459@gmail.com>
Date: Wed, 28 Jan 2026 19:55:08 -0800
Subject: [PATCH] Added error catching to requestBatteryStatus to call
 _handleDisconnection when it fails update.

Updated ScannerScreen to manage navigation state logic on connection.
---
 lib/connector/meshcore_connector.dart |  8 +++++-
 lib/screens/scanner_screen.dart       | 37 +++++++++++++++++++--------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart
index de39d7e..c378bff 100644
--- a/lib/connector/meshcore_connector.dart
+++ b/lib/connector/meshcore_connector.dart
@@ -959,7 +959,13 @@ class MeshCoreConnector extends ChangeNotifier {
     if (!isConnected) return;
     if (_batteryRequested && !force) return;
     _batteryRequested = true;
-    await sendFrame(buildGetBattAndStorageFrame());
+    try {
+      await sendFrame(buildGetBattAndStorageFrame());
+    } catch (e) {
+      // Reset flag on error to allow retry
+      _handleDisconnection();
+      _batteryRequested = false;
+    }
   }
 
   void _startBatteryPolling() {
diff --git a/lib/screens/scanner_screen.dart b/lib/screens/scanner_screen.dart
index 63f4a3c..642ce1f 100644
--- a/lib/screens/scanner_screen.dart
+++ b/lib/screens/scanner_screen.dart
@@ -8,9 +8,35 @@ import '../widgets/device_tile.dart';
 import 'contacts_screen.dart';
 
 /// Screen for scanning and connecting to MeshCore devices
-class ScannerScreen extends StatelessWidget {
+class ScannerScreen extends StatefulWidget {
   const ScannerScreen({super.key});
 
+  @override
+  State<ScannerScreen> createState() => _ScannerScreenState();
+}
+
+class _ScannerScreenState extends State<ScannerScreen> {
+  bool changedNavgation = false;  
+
+  @override
+  void initState() {
+    super.initState();
+    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+    
+    connector.addListener(() {
+      if (connector.state == MeshCoreConnectionState.disconnected) {
+        changedNavgation = false;
+      }else if (connector.state == MeshCoreConnectionState.connected && !changedNavgation) {
+        changedNavgation = true;
+        Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (context) => const ContactsScreen(),
+          ),
+        );
+      }
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -161,15 +187,6 @@ final l10n = context.l10n;
           ? result.device.platformName
           : result.advertisementData.advName;
       await connector.connect(result.device, displayName: name);
-      
-      if (context.mounted && connector.isConnected) {
-        Navigator.push(
-          context,
-          MaterialPageRoute(
-            builder: (context) => const ContactsScreen(),
-          ),
-        );
-      }
     } catch (e) {
       if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(