1 files changed, 29 insertions, 24 deletions

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()}");