Add new log ui

OpenTails · May 31, 2024 · cb96c58 · cb96c58
1 parent 52f0c7d
commit cb96c58
Show file tree

Hide file tree

Showing 30 changed files with 248 additions and 183 deletions.
diff --git a/lib/Backend/Bluetooth/bluetooth_manager.dart b/lib/Backend/Bluetooth/bluetooth_manager.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:logging/logging.dart' as log;
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sentry_hive/sentry_hive.dart';
+import 'package:tail_app/Backend/LoggingWrappers.dart';
 
 import '../Definitions/Device/device_definition.dart';
 import '../device_registry.dart';
@@ -15,7 +15,7 @@ final log.Logger bluetoothLog = log.Logger('Bluetooth');
 class KnownDevices extends _$KnownDevices {
   @override
   Map<String, BaseStatefulDevice> build() {
-    List<BaseStoredDevice> storedDevices = SentryHive.box<BaseStoredDevice>('devices').values.toList();
+    List<BaseStoredDevice> storedDevices = HiveProxy.getAll<BaseStoredDevice>('devices').toList();
     Map<String, BaseStatefulDevice> results = {};
     try {
       if (storedDevices.isNotEmpty) {
@@ -50,8 +50,7 @@ class KnownDevices extends _$KnownDevices {
   }
 
   Future<void> store() async {
-    SentryHive.box<BaseStoredDevice>('devices')
-      ..clear()
-      ..addAll(state.values.map((e) => e.baseStoredDevice));
+    await HiveProxy.clear('devices');
+    await HiveProxy.addAll('devices', state.values.map((e) => e.baseStoredDevice));
   }
 }
diff --git a/lib/Backend/Bluetooth/bluetooth_manager_plus.dart b/lib/Backend/Bluetooth/bluetooth_manager_plus.dart
@@ -9,13 +9,13 @@ import 'package:flutter_foreground_task/flutter_foreground_task.dart';
 import 'package:logging/logging.dart' as log;
 import 'package:permission_handler/permission_handler.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sentry_hive/sentry_hive.dart';
 import 'package:tail_app/Backend/Definitions/Device/device_definition.dart';
 import 'package:tail_app/Backend/device_registry.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../../Frontend/utils.dart';
 import '../../constants.dart';
+import '../LoggingWrappers.dart';
 import '../sensors.dart';
 import 'bluetooth_manager.dart';
 import 'bluetooth_message.dart';
@@ -96,7 +96,7 @@ Future<void> initFlutterBluePlus(InitFlutterBluePlusRef ref) async {
       // The timer used for the time value on the battery level graph
       statefulDevice.stopWatch.start();
       isAnyGearConnected.value = true;
-      if (SentryHive.box(settings).get(keepAwake, defaultValue: keepAwakeDefault)) {
+      if (HiveProxy.getOrDefault(settings, keepAwake, defaultValue: keepAwakeDefault)) {
         _bluetoothPlusLogger.fine('Enabling wakelock');
         WakelockPlus.enable();
       }
@@ -129,12 +129,12 @@ Future<void> initFlutterBluePlus(InitFlutterBluePlusRef ref) async {
     if (bluetoothConnectionState == BluetoothConnectionState.disconnected) {
       _bluetoothPlusLogger.info("Disconnected from device: ${bluetoothDevice.remoteId.str}");
       // We don't want to display the app review screen right away. We keep track of gear disconnects and after 5 we try to display the review dialog.
-      int count = SentryHive.box(settings).get(gearDisconnectCount, defaultValue: gearDisconnectCountDefault) + 1;
-      if (count > 5 && SentryHive.box(settings).get(hasDisplayedReview, defaultValue: hasDisplayedReviewDefault)) {
-        SentryHive.box(settings).put(shouldDisplayReview, true);
+      int count = HiveProxy.getOrDefault(settings, gearDisconnectCount, defaultValue: gearDisconnectCountDefault) + 1;
+      if (count > 5 && HiveProxy.getOrDefault(settings, hasDisplayedReview, defaultValue: hasDisplayedReviewDefault)!) {
+        HiveProxy.put(settings, shouldDisplayReview, true);
         _bluetoothPlusLogger.finer('Setting shouldDisplayReview to true');
       } else {
-        SentryHive.box(settings).put(gearDisconnectCount, count);
+        HiveProxy.put(settings, gearDisconnectCount, count);
         _bluetoothPlusLogger.finer('Setting gearDisconnectCount to $count');
       }
       //ref.read(snackbarStreamProvider.notifier).add(SnackBar(content: Text("Disconnected from ${baseStatefulDevice.baseStoredDevice.name}")));
@@ -215,7 +215,7 @@ Future<void> initFlutterBluePlus(InitFlutterBluePlusRef ref) async {
       try {
         value = const Utf8Decoder().convert(values);
       } catch (e, s) {
-        _bluetoothPlusLogger.warning("Unable to read values: $values $e");
+        _bluetoothPlusLogger.warning("Unable to read values: $values $e", e, s);
         statefulDevice.messageHistory.add(MessageHistoryEntry(type: MessageHistoryType.receive, message: "Unknown: ${values.toString()}"));
         return;
       }

diff --git a/lib/Backend/LoggingWrappers.dart b/lib/Backend/LoggingWrappers.dart
@@ -0,0 +1,52 @@
+import 'package:logarte/logarte.dart';
+import 'package:sentry_hive/sentry_hive.dart';
+
+import '../constants.dart';
+
+_HiveProxyImpl HiveProxy = _HiveProxyImpl();
+List<String> genericBoxes = [settings, notificationBox];
+
+class _HiveProxyImpl {
+  Future<void> put<E>(String box, dynamic key, E value) {
+    logarte.database(
+      target: '$key',
+      value: '$value',
+      source: box,
+    );
+    if (genericBoxes.contains(box)) {
+      return SentryHive.box(box).put(key, value);
+    } else {
+      return SentryHive.box<E>(box).put(key, value);
+    }
+  }
+
+  E getOrDefault<E>(String box, dynamic key, {E? defaultValue}) {
+    if (genericBoxes.contains(box)) {
+      return SentryHive.box(box).get(key, defaultValue: defaultValue)!;
+    } else {
+      return SentryHive.box<E>(box).get(key, defaultValue: defaultValue)!;
+    }
+  }
+
+  Future<int> clear<E>(String box) {
+    if (genericBoxes.contains(box)) {
+      return SentryHive.box(box).clear();
+    } else {
+      return SentryHive.box<E>(box).clear();
+    }
+  }
+
+  Future<Iterable<int>> addAll<E>(String name, Iterable<E> values) {
+    return SentryHive.box<E>(name).addAll(values);
+  }
+
+  Iterable<E> getAll<E>(String name) {
+    return SentryHive.box<E>(name).values;
+  }
+}
+
+final Logarte logarte = Logarte(
+  // Whether to ignore the password
+  ignorePassword: true,
+  disableDebugConsoleLogs: true,
+);
diff --git a/lib/Backend/action_registry.dart b/lib/Backend/action_registry.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sentry_hive/sentry_hive.dart';
 import 'package:tail_app/Backend/audio.dart';
 import 'package:tail_app/Backend/move_lists.dart';
 import 'package:tail_app/Backend/wear_bridge.dart';
@@ -12,6 +11,7 @@ import 'Bluetooth/bluetooth_manager.dart';
 import 'Bluetooth/bluetooth_manager_plus.dart';
 import 'Definitions/Action/base_action.dart';
 import 'Definitions/Device/device_definition.dart';
+import 'LoggingWrappers.dart';
 import 'app_shortcuts.dart';
 
 part 'action_registry.g.dart';
@@ -352,7 +352,7 @@ class FavoriteActions extends _$FavoriteActions {
   List<FavoriteAction> build() {
     List<FavoriteAction> results = [];
     try {
-      results = SentryHive.box<FavoriteAction>(favoriteActionsBox).values.toList(growable: true);
+      results = HiveProxy.getAll<FavoriteAction>(favoriteActionsBox).toList(growable: true);
     } catch (e, s) {
       actionRegistryLogger.severe("Unable to load favorites: $e", e, s);
     }
@@ -376,9 +376,8 @@ class FavoriteActions extends _$FavoriteActions {
 
   Future<void> store() async {
     actionRegistryLogger.info("Storing favorites");
-    SentryHive.box<FavoriteAction>(favoriteActionsBox)
-      ..clear()
-      ..addAll(state);
+    await HiveProxy.clear<FavoriteAction>(favoriteActionsBox);
+    await HiveProxy.addAll<FavoriteAction>(favoriteActionsBox, state);
     updateShortcuts(state, ref);
     updateWearActions(state, ref);
   }

diff --git a/lib/Backend/audio.dart b/lib/Backend/audio.dart
@@ -2,10 +2,10 @@ import 'package:audio_session/audio_session.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sentry_hive/sentry_hive.dart';
 import 'package:tail_app/Backend/Definitions/Action/base_action.dart';
 
 import '../constants.dart';
+import 'LoggingWrappers.dart';
 
 part 'audio.g.dart';
 
@@ -44,7 +44,7 @@ class UserAudioActions extends _$UserAudioActions {
   List<AudioAction> build() {
     List<AudioAction> results = [];
     try {
-      results = SentryHive.box<AudioAction>(audioActionsBox).values.toList(growable: true);
+      results = HiveProxy.getAll<AudioAction>(audioActionsBox).toList(growable: true);
     } catch (e, s) {
       _audioLogger.severe("Unable to load audio: $e", e, s);
     }
@@ -68,8 +68,7 @@ class UserAudioActions extends _$UserAudioActions {
 
   Future<void> store() async {
     _audioLogger.info("Storing Custom Audio");
-    SentryHive.box<AudioAction>(audioActionsBox)
-      ..clear()
-      ..addAll(state);
+    await HiveProxy.clear<AudioAction>(audioActionsBox);
+    await HiveProxy.addAll<AudioAction>(audioActionsBox, state);
   }
 }
diff --git a/lib/Backend/background_update.dart b/lib/Backend/background_update.dart
@@ -3,11 +3,12 @@
 import 'package:awesome_notifications/awesome_notifications.dart';
 import 'package:background_fetch/background_fetch.dart';
 import 'package:logging/logging.dart';
-import 'package:sentry_hive/sentry_hive.dart';
 import 'package:tail_app/Frontend/utils.dart';
 import 'package:tail_app/constants.dart';
 import 'package:wordpress_client/wordpress_client.dart';
 
+import 'LoggingWrappers.dart';
+
 final _backgroundLogger = Logger('BackgroundLogger');
 
 Future<void> initBackgroundTasks() async {
@@ -51,7 +52,7 @@ Future<void> initBackgroundTasks() async {
 }
 
 Future<void> checkForNewPosts() async {
-  if (!SentryHive.box(settings).get(allowNewsletterNotifications, defaultValue: allowNewsletterNotificationsDefault)) {
+  if (!HiveProxy.getOrDefault(settings, allowNewsletterNotifications, defaultValue: allowNewsletterNotificationsDefault)) {
     return;
   }
   _backgroundLogger.info("Checking for new posts");
@@ -70,10 +71,10 @@ Future<void> checkForNewPosts() async {
     if (data != null) {
       final Post post = data.first;
       final int id = post.id;
-      final int oldID = SentryHive.box(notificationBox).get(latestPost, defaultValue: defaultPostId);
+      final int oldID = HiveProxy.getOrDefault(notificationBox, latestPost, defaultValue: defaultPostId);
       if (oldID < id) {
         _backgroundLogger.info("Found a new post");
-        SentryHive.box(notificationBox).put(showAccurateBattery, id);
+        HiveProxy.put(notificationBox, showAccurateBattery, id);
         AwesomeNotifications().createNotification(
           content: NotificationContent(
             id: id,

diff --git a/lib/Backend/move_lists.dart b/lib/Backend/move_lists.dart
@@ -3,14 +3,14 @@ import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sentry_hive/sentry_hive.dart';
 import 'package:tail_app/Backend/Bluetooth/bluetooth_message.dart';
 import 'package:tail_app/Backend/Definitions/Action/base_action.dart';
 import 'package:tail_app/Backend/Definitions/Device/device_definition.dart';
 import 'package:tail_app/Backend/audio.dart';
 import 'package:tail_app/Frontend/translation_string_definitions.dart';
 
 import '../main.dart';
+import 'LoggingWrappers.dart';
 
 part 'move_lists.g.dart';
 
@@ -162,7 +162,7 @@ class MoveLists extends _$MoveLists {
   List<MoveList> build() {
     List<MoveList> results = [];
     try {
-      results = SentryHive.box<MoveList>('sequences').values.toList(growable: true);
+      results = HiveProxy.getAll<MoveList>('sequences').toList(growable: true);
     } catch (e, s) {
       sequencesLogger.severe("Unable to load sequences: $e", e, s);
     }
@@ -183,9 +183,8 @@ class MoveLists extends _$MoveLists {
 
   Future<void> store() async {
     sequencesLogger.info("Storing sequences");
-    SentryHive.box<MoveList>('sequences')
-      ..clear()
-      ..addAll(state);
+    HiveProxy.clear<MoveList>('sequences');
+    HiveProxy.addAll<MoveList>('sequences', state);
   }
 }
 

diff --git a/lib/Backend/plausible_dio.dart b/lib/Backend/plausible_dio.dart
@@ -8,13 +8,13 @@ import 'package:install_referrer/install_referrer.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:plausible_analytics/plausible_analytics.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
-import 'package:sentry_hive/sentry_hive.dart';
 import 'package:tail_app/Backend/move_lists.dart';
 
 import '../Frontend/utils.dart';
 import '../constants.dart';
 import '../main.dart';
 import 'Definitions/Device/device_definition.dart';
+import 'LoggingWrappers.dart';
 import 'sensors.dart';
 
 class PlausibleDio extends Plausible {
@@ -25,7 +25,7 @@ class PlausibleDio extends Plausible {
   /// Post event to plausible
   @override
   Future<int> event({String name = "pageview", String referrer = "", String page = "", Map<String, String> props = const {}}) async {
-    if (!enabled && SentryHive.box(settings).get(allowAnalytics, defaultValue: allowAnalyticsDefault)) {
+    if (!enabled && HiveProxy.getOrDefault(settings, allowAnalytics, defaultValue: allowAnalyticsDefault)) {
       return 0;
     }
     final transaction = Sentry.startTransaction('Plausible Event', 'http');
@@ -37,9 +37,9 @@ class PlausibleDio extends Plausible {
     page = "app://localhost/$page?utm_source=${(await InstallReferrer.referrer).name}";
     referrer = "app://localhost/$referrer";
     props = Map.of(props);
-    props['Number Of Devices'] = SentryHive.box<BaseStoredDevice>('devices').length.toString();
-    props['Number Of Sequences'] = SentryHive.box<MoveList>('sequences').length.toString();
-    props['Number Of Triggers'] = SentryHive.box<Trigger>(triggerBox).length.toString();
+    props['Number Of Devices'] = HiveProxy.getAll<BaseStoredDevice>('devices').length.toString();
+    props['Number Of Sequences'] = HiveProxy.getAll<MoveList>('sequences').length.toString();
+    props['Number Of Triggers'] = HiveProxy.getAll<Trigger>(triggerBox).length.toString();
     props['App Version'] = (await PackageInfo.fromPlatform()).version;
     props['App Build'] = (await PackageInfo.fromPlatform()).buildNumber;
 

diff --git a/lib/Backend/sensors.dart b/lib/Backend/sensors.dart
@@ -13,7 +13,6 @@ import 'package:pedometer/pedometer.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:proximity_sensor/proximity_sensor.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:sentry_hive/sentry_hive.dart';
 import 'package:shake/shake.dart';
 import 'package:tail_app/Backend/Bluetooth/bluetooth_manager_plus.dart';
 import 'package:tail_app/Backend/Bluetooth/bluetooth_message.dart';
@@ -24,6 +23,7 @@ import '../constants.dart';
 import 'Bluetooth/bluetooth_manager.dart';
 import 'Definitions/Action/base_action.dart';
 import 'Definitions/Device/device_definition.dart';
+import 'LoggingWrappers.dart';
 import 'move_lists.dart';
 
 part 'sensors.g.dart';
@@ -247,7 +247,7 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
               )
               .toList()
             ..shuffle()) {
-            if (SentryHive.box(settings).get(kitsuneModeToggle, defaultValue: kitsuneModeDefault)) {
+            if (HiveProxy.getOrDefault(settings, kitsuneModeToggle, defaultValue: kitsuneModeDefault)) {
               await Future.delayed(Duration(milliseconds: Random().nextInt(kitsuneDelayRange)));
             }
             runAction(baseAction, baseStatefulDevice);
@@ -710,7 +710,7 @@ class TriggerList extends _$TriggerList {
   List<Trigger> build() {
     List<Trigger> results = [];
     try {
-      results = SentryHive.box<Trigger>(triggerBox).values.map((trigger) {
+      results = HiveProxy.getAll<Trigger>(triggerBox).map((trigger) {
         Trigger trigger2 = Trigger.trigDef(ref.read(triggerDefinitionListProvider).firstWhere((element) => element.uuid == trigger.triggerDefUUID), trigger.uuid);
         trigger2.actions = trigger.actions;
         trigger2.deviceType = trigger.deviceType;
@@ -724,9 +724,9 @@ class TriggerList extends _$TriggerList {
       Trigger trigger = Trigger.trigDef(triggerDefinition, '91e3d421-6a52-45ab-a23e-f38e4987a8f5');
       trigger.actions.firstWhere((element) => element.uuid == '77d22961-5a69-465a-bd27-5cf5508d10a6').actions.add(ActionRegistry.allCommands.firstWhere((element) => element.uuid == 'c53e980e-899e-4148-a13e-f57a8f9707f4').uuid);
       trigger.actions.firstWhere((element) => element.uuid == '7424097d-ba24-4d85-b963-bf58e85e289d').actions.add(ActionRegistry.allCommands.firstWhere((element) => element.uuid == '86b13d13-b09c-46ba-a887-b40d8118b00a').uuid);
-      SentryHive.box<Trigger>(triggerBox)
-        ..clear()
-        ..addAll([trigger]);
+
+      HiveProxy.clear<Trigger>(triggerBox);
+      HiveProxy.addAll<Trigger>(triggerBox, [trigger]);
       return [trigger];
     }
     return results;
@@ -745,9 +745,8 @@ class TriggerList extends _$TriggerList {
 
   Future<void> store() async {
     sensorsLogger.info("Storing triggers");
-    SentryHive.box<Trigger>(triggerBox)
-      ..clear()
-      ..addAll(state);
+    await HiveProxy.clear<Trigger>(triggerBox);
+    await HiveProxy.addAll<Trigger>(triggerBox, state);
   }
 }
 

diff --git a/lib/Frontend/Widgets/bt_app_state_controller.dart b/lib/Frontend/Widgets/bt_app_state_controller.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:sentry_hive/sentry_hive.dart';
 
 import '../../Backend/Bluetooth/bluetooth_manager_plus.dart';
+import '../../Backend/LoggingWrappers.dart';
 import '../../constants.dart';
 
 class BtAppStateController extends ConsumerStatefulWidget {
@@ -31,7 +31,7 @@ class _BtAppStateControllerState extends ConsumerState<BtAppStateController> {
       },
     );
     // start FlutterBluePlus if its not started already
-    if (SentryHive.box(settings).get(hasCompletedOnboarding, defaultValue: hasCompletedOnboardingDefault) >= hasCompletedOnboardingVersionToAgree) {
+    if (HiveProxy.getOrDefault(settings, hasCompletedOnboarding, defaultValue: hasCompletedOnboardingDefault) >= hasCompletedOnboardingVersionToAgree) {
       ref.read(initFlutterBluePlusProvider);
     }
   }