dio attach listener

OpenTails · Mar 1, 2024 · 675d38a · 675d38a
1 parent 6b300ac
commit 675d38a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/Backend/Bluetooth/BluetoothManager.dart b/lib/Backend/Bluetooth/BluetoothManager.dart
@@ -13,6 +13,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:sentry_hive/sentry_hive.dart';
 import 'package:tail_app/Backend/Sensors.dart';
+import 'package:tail_app/main.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../AutoMove.dart';
@@ -23,8 +24,6 @@ import 'btMessage.dart';
 
 part 'BluetoothManager.g.dart';
 
-Dio dio = Dio();
-
 @Riverpod(dependencies: [reactiveBLE, KnownDevices])
 Stream<DiscoveredDevice> scanForDevices(ScanForDevicesRef ref) {
   Flogger.d("Starting scan");
@@ -154,7 +153,7 @@ class KnownDevices extends _$KnownDevices {
             }
           }, cancelOnError: true);
           if (deviceDefinition.fwURL != "") {
-            dio.get(statefulDevice.baseDeviceDefinition.fwURL, options: Options(responseType: ResponseType.json)).then(
+            initDio().get(statefulDevice.baseDeviceDefinition.fwURL, options: Options(responseType: ResponseType.json)).then(
               (value) {
                 if (value.statusCode == 200) {
                   statefulDevice.fwInfo.value = FWInfo.fromJson(const JsonDecoder().convert(value.data.toString()));

diff --git a/lib/Frontend/pages/ota_update.dart b/lib/Frontend/pages/ota_update.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:tail_app/Backend/Bluetooth/BluetoothManager.dart';
 import 'package:tail_app/Backend/Definitions/Device/BaseDeviceDefinition.dart';
+import 'package:tail_app/main.dart';
 
 import '../../Backend/FirmwareUpdate.dart';
 
@@ -129,7 +130,7 @@ class _OtaUpdateState extends ConsumerState<OtaUpdate> {
       otaState = OtaState.download;
       downloadProgress = 0;
     });
-    final Response<List<int>> rs = await Dio().get<List<int>>(updateURL!.url, options: Options(responseType: ResponseType.bytes), onReceiveProgress: (current, total) {
+    final Response<List<int>> rs = await initDio().get<List<int>>(updateURL!.url, options: Options(responseType: ResponseType.bytes), onReceiveProgress: (current, total) {
       setState(() {
         downloadProgress = current / total;
       });

diff --git a/lib/main.dart b/lib/main.dart
@@ -94,6 +94,7 @@ Future<void> main() async {
   await SentryHive.openBox<Trigger>('triggers');
   await SentryHive.openBox<MoveList>('sequences');
   await SentryHive.openBox<BaseStoredDevice>('devices');
+  initDio();
   await SentryFlutter.init(
     (options) async {
       options.dsn = 'https://[email protected]/3';
@@ -131,12 +132,13 @@ Future<void> main() async {
   );
 }
 
-void initDio() {
+Dio initDio() {
   final dio = Dio();
 
   /// This *must* be the last initialization step of the Dio setup, otherwise
   /// your configuration of Dio might overwrite the Sentry configuration.
   dio.addSentry();
+  return dio;
 }
 
 class TailApp extends ConsumerWidget {