4 files changed, 67 insertions, 38 deletions
diff --git a/lib/model/connection/device_connection.dart b/lib/model/connection/device_connection.dart
index 5c810f0..f50bd2c 100644
--- a/lib/model/connection/device_connection.dart
+++ b/lib/model/connection/device_connection.dart
@@ -13,14 +13,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import 'package:flutter/foundation.dart';
+
 enum ConnectionStatus { disconnected, connected, error }
 
-abstract class DeviceConnection {
+abstract interface class DeviceConnection {
   Future<void> connect();
   Future<void> disconnect();
-  ConnectionStatus get status;
-
-  // Future<Uint8List> read(String endpoint);
-  // Future<void> write(String endpoint, Uint8List data);
-  // Stream<Uint8List> subscribe(String endpoint);
+  ValueNotifier<ConnectionStatus> get status;
 }
diff --git a/lib/model/connection/flutter_blue_plus_device_connection.dart b/lib/model/connection/flutter_blue_plus_device_connection.dart
index 3f860a6..5cb9eb2 100644
--- a/lib/model/connection/flutter_blue_plus_device_connection.dart
+++ b/lib/model/connection/flutter_blue_plus_device_connection.dart
@@ -15,16 +15,19 @@
 
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:logger/logger.dart';
-import 'package:uvok_epaper_badge/first_where_ext.dart';
+import 'package:uvok_epaper_badge/extensions/iterable_ext.dart';
 import 'package:uvok_epaper_badge/model/connection/device_connection.dart';
 import 'package:uvok_epaper_badge/model/device/flutter_blue_plus_device.dart';
 
 var logger = Logger();
 
 class FlutterBluePlusDeviceConnection implements DeviceConnection {
-  ConnectionStatus _status = ConnectionStatus.disconnected;
+  final ValueNotifier<ConnectionStatus> _status = ValueNotifier(
+    ConnectionStatus.disconnected,
+  );
   // Just to have a resonable default subscription?
   StreamSubscription<BluetoothConnectionState> subs =
       Stream<BluetoothConnectionState>.empty().listen((e) => ());
@@ -43,36 +46,38 @@ class FlutterBluePlusDeviceConnection implements DeviceConnection {
     // connect timeout doesn't work under Linux
     await dev.connect().timeout(Duration(seconds: 2));
     // // ???? WTF ????
-    List<BluetoothService> svcs = await dev.discoverServices();
-    dev.onServicesReset.listen((_) async {
-      logger.i("Services Reset");
-      // try {
-      //   List<BluetoothService> svcs = dev.servicesList;
-      //   findCharac(svcs);
-      // } catch (e) {
-      //   logger.e(e);
-      // }
-    });
-
-    logger.i("services discovered");
-
-    findCharac(svcs);
-
-    _status = ConnectionStatus.connected;
-
-    await Future.delayed(Duration(seconds: 5));
-    logger.i("Try re-discover");
-    svcs = await dev.discoverServices();
+    // List<BluetoothService> svcs = await dev.discoverServices();
+    // dev.onServicesReset.listen((_) async {
+    //   logger.i("Services Reset");
+    //   // try {
+    //   //   List<BluetoothService> svcs = dev.servicesList;
+    //   //   findCharac(svcs);
+    //   // } catch (e) {
+    //   //   logger.e(e);
+    //   // }
+    // });
+
+    // logger.i("services discovered");
+
+    // findCharac(svcs);
+
+    // _status.value = ConnectionStatus.connected;
+
+    // await Future.delayed(Duration(seconds: 5));
+    // logger.i("Try re-discover");
+    // svcs = await dev.discoverServices();
   }
 
   @override
   Future<void> disconnect() async {
+    final dev = device.scanResult.device;
     subs.cancel().ignore();
-    _status = ConnectionStatus.disconnected;
+    await dev.disconnect();
+    _status.value = ConnectionStatus.disconnected;
   }
 
   @override
-  ConnectionStatus get status => _status;
+  ValueNotifier<ConnectionStatus> get status => _status;
 
   void _onConnStateChange(BluetoothConnectionState event) {
     logger.i("New conn state: ${event.toString()}");
diff --git a/lib/model/connection/mock_device_connection.dart b/lib/model/connection/mock_device_connection.dart
index 8b8750a..9dc3726 100644
--- a/lib/model/connection/mock_device_connection.dart
+++ b/lib/model/connection/mock_device_connection.dart
@@ -13,21 +13,24 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import 'package:flutter/foundation.dart';
 import 'package:uvok_epaper_badge/model/connection/device_connection.dart';
 
 class MockDeviceConnection implements DeviceConnection {
-  ConnectionStatus _status = ConnectionStatus.disconnected;
+  final ValueNotifier<ConnectionStatus> _status = ValueNotifier(
+    ConnectionStatus.disconnected,
+  );
 
   @override
   Future<void> connect() async {
-    _status = ConnectionStatus.connected;
+    _status.value = ConnectionStatus.connected;
   }
 
   @override
   Future<void> disconnect() async {
-    _status = ConnectionStatus.disconnected;
+    _status.value = ConnectionStatus.disconnected;
   }
 
   @override
-  ConnectionStatus get status => _status;
+  ValueNotifier<ConnectionStatus> get status => _status;
 }
diff --git a/lib/model/connection/universal_ble_connection.dart b/lib/model/connection/universal_ble_connection.dart
index 6aa3c87..fa986a0 100644
--- a/lib/model/connection/universal_ble_connection.dart
+++ b/lib/model/connection/universal_ble_connection.dart
@@ -1,10 +1,28 @@
+// Copyright (C) 2025, uvok cheetah
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+import 'package:flutter/foundation.dart';
 import 'package:universal_ble/universal_ble.dart';
 import 'package:uvok_epaper_badge/model/connection/device_connection.dart';
 import 'package:uvok_epaper_badge/model/device/universal_ble_device.dart';
 
 class UniversalBleConnection implements DeviceConnection {
   final UniversalBleDevice _device;
-  ConnectionStatus _status = ConnectionStatus.disconnected;
+  final ValueNotifier<ConnectionStatus> _status = ValueNotifier(
+    ConnectionStatus.disconnected,
+  );
 
   UniversalBleConnection(this._device);
 
@@ -12,17 +30,22 @@ class UniversalBleConnection implements DeviceConnection {
   Future<void> connect() async {
     await _device.device.connect();
 
-    _status = await _device.device.isConnected
+    _status.value = await _device.device.isConnected
         ? ConnectionStatus.connected
         : ConnectionStatus.disconnected;
+
+    if (_status.value == ConnectionStatus.connected) {
+      /* Ignore return value for now */
+      await _device.device.discoverServices();
+    }
   }
 
   @override
   Future<void> disconnect() async {
     await _device.device.disconnect();
-    _status = ConnectionStatus.disconnected;
+    _status.value = ConnectionStatus.disconnected;
   }
 
   @override
-  ConnectionStatus get status => _status;
+  ValueNotifier<ConnectionStatus> get status => _status;
 }