refactor: change Logger to singleton

ice-blockchain · Jan 9, 2025 · 2275ef2 · 2275ef2
1 parent a2410dd
commit 2275ef2
Show file tree

Hide file tree

Showing 26 changed files with 79 additions and 73 deletions.
diff --git a/lib/app/features/auth/providers/onboarding_complete_notifier.c.dart b/lib/app/features/auth/providers/onboarding_complete_notifier.c.dart
@@ -205,7 +205,7 @@ class OnboardingCompleteNotifier extends _$OnboardingCompleteNotifier {
       }
     } catch (error, stackTrace) {
       // intentionally ignore upload avatar exceptions
-      Logger.log('Upload avatar exception', error: error, stackTrace: stackTrace);
+      Logger().log('Upload avatar exception', error: error, stackTrace: stackTrace);
     }
     return null;
   }

diff --git a/...pp/features/chat/messages/views/components/message_item_wrapper/message_item_wrapper.dart b/...pp/features/chat/messages/views/components/message_item_wrapper/message_item_wrapper.dart
@@ -41,7 +41,7 @@ class MessageItemWrapper extends HookWidget {
             ),
           );
         } catch (e, st) {
-          Logger.log('Error showing message reaction dialog:', error: e, stackTrace: st);
+          Logger().log('Error showing message reaction dialog:', error: e, stackTrace: st);
         }
       },
       [messageItemKey, isMe],

diff --git a/...res/chat/messages/views/components/messaging_bottom_bar/components/more_content_view.dart b/...res/chat/messages/views/components/messaging_bottom_bar/components/more_content_view.dart
@@ -54,7 +54,7 @@ class MoreContentView extends ConsumerWidget {
                   ).push<String>(context);
 
                   //TODO: use contactId to share profile
-                  Logger.log(contactId ?? 'No contact selected');
+                  Logger().log(contactId ?? 'No contact selected');
 
                   ref.read(messagingBottomBarActiveStateProvider.notifier).setText();
                 },

diff --git a/lib/app/features/chat/providers/conversation_message_actions_provider.c.dart b/lib/app/features/chat/providers/conversation_message_actions_provider.c.dart
@@ -87,15 +87,15 @@ class ConversationMessageActionsService {
       ['encrypted'],
     ];
 
-    Logger.log('Encoded rumor $encodedRumor');
+    Logger().log('Encoded rumor $encodedRumor');
 
     final encryptedRumor = await Nip44.encryptMessage(
       encodedRumor,
       eventSigner!.privateKey,
       receiverPubkey,
     );
 
-    Logger.log('Encrypted rumor $encryptedRumor');
+    Logger().log('Encrypted rumor $encryptedRumor');
 
     final id = EventMessage.calculateEventId(
       tags: tags,
@@ -115,7 +115,7 @@ class ConversationMessageActionsService {
       sig: null,
     );
 
-    Logger.log('Bookmark message $bookmarkMessage');
+    Logger().log('Bookmark message $bookmarkMessage');
 
     await nostrNotifier.sendEvent(bookmarkMessage, cache: false);
   }
@@ -211,15 +211,15 @@ class ConversationMessageActionsService {
       sig: await signer.sign(message: id),
     );
 
-    Logger.log('Event message $eventMessage');
+    Logger().log('Event message $eventMessage');
 
     final seal = await sealService.createSeal(
       eventMessage,
       signer,
       receiverPubkey,
     );
 
-    Logger.log('Seal message $seal');
+    Logger().log('Seal message $seal');
 
     final expirationTag = EntityExpiration(
       value: DateTime.now().add(
@@ -235,11 +235,11 @@ class ConversationMessageActionsService {
       expirationTag: expirationTag,
     );
 
-    Logger.log('Wrap message $wrap');
+    Logger().log('Wrap message $wrap');
 
     final result = await nostrNotifier.sendEvent(wrap, cache: false);
 
-    Logger.log('Sent message $result');
+    Logger().log('Sent message $result');
 
     return result;
   }

diff --git a/lib/app/features/chat/providers/conversation_message_management_provider.c.dart b/lib/app/features/chat/providers/conversation_message_management_provider.c.dart
@@ -101,7 +101,7 @@ class ConversationMessageManagementService {
                 alt: FileAlt.message,
               );
 
-              Logger.log(
+              Logger().log(
                 'Uploaded media file: ${uploadResult.fileMetadata.url}, ${uploadResult.fileMetadata.mimeType} ${uploadResult.fileMetadata.size}',
               );
 
@@ -147,7 +147,7 @@ class ConversationMessageManagementService {
     final decryptedDecompressedFiles = <File>[];
 
     for (final attachment in privateDirectMessageEntity.data.media.values) {
-      Logger.log('Attachment: $attachment');
+      Logger().log('Attachment: $attachment');
       if (attachment.encryptionKey != null &&
           attachment.encryptionNonce != null &&
           attachment.encryptionMac != null) {
@@ -157,7 +157,7 @@ class ConversationMessageManagementService {
 
         final file = await fileCacheService.getFile(attachment.url);
 
-        Logger.log(
+        Logger().log(
           'Downloaded encrypted media file: ${file.path}, ${attachment.mimeType} ${file.lengthSync()}',
         );
 
@@ -184,7 +184,7 @@ class ConversationMessageManagementService {
           fileExtension: attachment.mimeType.split('/').last,
         );
 
-        Logger.log(
+        Logger().log(
           'Decrypted media file: ${decryptedFile.path}, ${attachment.mimeType} ${decryptedFile.lengthSync()}',
         );
 
@@ -238,15 +238,15 @@ class ConversationMessageManagementService {
       sig: null,
     );
 
-    Logger.log('Event message $eventMessage');
+    Logger().log('Event message $eventMessage');
 
     final seal = await sealService.createSeal(
       eventMessage,
       signer,
       receiverPubkey,
     );
 
-    Logger.log('Seal message $seal');
+    Logger().log('Seal message $seal');
 
     final wrap = await wrapService.createWrap(
       seal,
@@ -255,11 +255,11 @@ class ConversationMessageManagementService {
       PrivateDirectMessageEntity.kind,
     );
 
-    Logger.log('Wrap message $wrap');
+    Logger().log('Wrap message $wrap');
 
     final result = await nostrNotifier.sendEvent(wrap, cache: false);
 
-    Logger.log('Sent message $result');
+    Logger().log('Sent message $result');
 
     return result;
   }
@@ -273,7 +273,7 @@ class ConversationMessageManagementService {
       mediaFiles.map(
         (mediaFile) async {
           final size = File(mediaFile.path).lengthSync();
-          Logger.log(
+          Logger().log(
             'Original media file: ${mediaFile.path}, ${mediaFile.mimeType} $size',
           );
 
@@ -298,7 +298,7 @@ class ConversationMessageManagementService {
           };
 
           final compressedSize = File(compressedMediaFile.path).lengthSync();
-          Logger.log(
+          Logger().log(
             'Compressed media file: ${compressedMediaFile.path}, ${compressedMediaFile.mimeType} $compressedSize',
           );
 
@@ -342,7 +342,7 @@ class ConversationMessageManagementService {
             mimeType: compressedMediaFile.mimeType,
           );
 
-          Logger.log(
+          Logger().log(
             'Encrypted media file ${compressedEncryptedMediaFile.mimeType} ${compressedEncryptedFile.lengthSync()}',
           );
 

diff --git a/lib/app/features/core/providers/dio_provider.c.dart b/lib/app/features/core/providers/dio_provider.c.dart
@@ -11,7 +11,7 @@ part 'dio_provider.c.g.dart';
 Dio dio(Ref ref) {
   final dio = Dio();
 
-  final logger = Logger.talkerDioLogger;
+  final logger = Logger().talkerDioLogger;
 
   if (logger != null) {
     dio.interceptors.add(logger);

diff --git a/lib/app/features/core/providers/init_provider.c.dart b/lib/app/features/core/providers/init_provider.c.dart
@@ -23,7 +23,7 @@ Future<void> initApp(Ref ref) async {
   final logApp = featureFlagsNotifier.get(LoggerFeatureFlag.logApp);
   final logNostrDart = featureFlagsNotifier.get(LoggerFeatureFlag.logNostrDart);
 
-  if (logApp) Logger.init();
+  if (logApp) Logger().init();
 
   Nostr.initialize(logNostrDart ? NostrLogger() : null);
 

diff --git a/lib/app/features/core/views/pages/error_modal.dart b/lib/app/features/core/views/pages/error_modal.dart
@@ -15,7 +15,7 @@ import 'package:ion/generated/assets.gen.dart';
 
 class ErrorModal extends ConsumerWidget {
   ErrorModal({required this.error, super.key}) {
-    Logger.error(error);
+    Logger().error(error);
   }
 
   final Object error;

diff --git a/lib/app/features/debug/views/debug_page.dart b/lib/app/features/debug/views/debug_page.dart
@@ -15,7 +15,7 @@ class DebugPage extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final featureFlags = ref.watch(featureFlagsProvider);
-    final talker = Logger.talker;
+    final talker = Logger().talker;
 
     return Column(
       mainAxisSize: MainAxisSize.min,

diff --git a/lib/app/features/feed/create_post/views/pages/create_post_modal/hooks/use_has_poll.dart b/lib/app/features/feed/create_post/views/pages/create_post_modal/hooks/use_has_poll.dart
@@ -58,7 +58,7 @@ bool _containsPollKey(dynamic customData) {
     try {
       parsedData = jsonDecode(customData) as Map<String, dynamic>?;
     } catch (e) {
-      Logger.log('Failed to parse custom data: $e');
+      Logger().log('Failed to parse custom data: $e');
     }
   }
 

diff --git a/lib/app/features/feed/providers/article/suggestions_notifier_provider.c.dart b/lib/app/features/feed/providers/article/suggestions_notifier_provider.c.dart
@@ -27,7 +27,7 @@ class SuggestionsNotifier extends _$SuggestionsNotifier {
           newSuggestions = await ref.read(mentionSuggestionsProvider(query).future);
         }
       } catch (error) {
-        Logger.log('Error fetching suggestions: $error');
+        Logger().log('Error fetching suggestions: $error');
       }
 
       state = newSuggestions;

diff --git a/lib/app/features/gallery/providers/camera_provider.c.dart b/lib/app/features/gallery/providers/camera_provider.c.dart
@@ -66,15 +66,15 @@ class CameraControllerNotifier extends _$CameraControllerNotifier {
       final initialCamera = _backCamera ?? _frontCamera;
 
       if (initialCamera == null) {
-        Logger.log('Camera not found');
+        Logger().log('Camera not found');
         state = const CameraState.error(message: 'Camera not found');
         return;
       }
 
       final controller = await _createCameraController(initialCamera);
       state = CameraState.ready(controller: controller);
     } catch (e) {
-      Logger.log('Camera initialization error: $e');
+      Logger().log('Camera initialization error: $e');
       state = CameraState.error(message: 'Camera initialization error: $e');
     }
   }
@@ -90,7 +90,7 @@ class CameraControllerNotifier extends _$CameraControllerNotifier {
       _cameraController?.addListener(_onCameraControllerUpdate);
       return _cameraController!;
     } catch (e) {
-      Logger.log('Camera initialization error: $e');
+      Logger().log('Camera initialization error: $e');
       await _disposeCamera();
       throw Exception('Camera initialization error: $e');
     }
@@ -154,7 +154,7 @@ class CameraControllerNotifier extends _$CameraControllerNotifier {
             isFlashOn: mode == FlashMode.torch,
           );
         } catch (e) {
-          Logger.log('Error setting flash mode', error: e);
+          Logger().log('Error setting flash mode', error: e);
           state = CameraState.error(message: 'Error setting flash mode: $e');
         }
       },
@@ -174,7 +174,7 @@ class CameraControllerNotifier extends _$CameraControllerNotifier {
             isFlashOn: !isFlashOn,
           );
         } catch (e) {
-          Logger.log('Error toggling flash mode', error: e);
+          Logger().log('Error toggling flash mode', error: e);
           state = CameraState.error(message: 'Error toggling flash mode: $e');
         }
       },
@@ -189,7 +189,7 @@ class CameraControllerNotifier extends _$CameraControllerNotifier {
       final picture = await _cameraController!.takePicture();
       return picture;
     } catch (e) {
-      Logger.log('Error taking picture', error: e);
+      Logger().log('Error taking picture', error: e);
       return null;
     }
   }
@@ -206,7 +206,7 @@ class CameraControllerNotifier extends _$CameraControllerNotifier {
               isFlashOn: isFlashOn,
             );
           } catch (e) {
-            Logger.log('Error starting video recording', error: e);
+            Logger().log('Error starting video recording', error: e);
             state = CameraState.error(message: 'Error starting video recording: $e');
           }
         }
@@ -240,7 +240,7 @@ class CameraControllerNotifier extends _$CameraControllerNotifier {
 
             return videoFile;
           } catch (e) {
-            Logger.log('Error stopping video recording', error: e);
+            Logger().log('Error stopping video recording', error: e);
             state = CameraState.error(message: 'Error stopping video recording: $e');
             return null;
           }

diff --git a/lib/app/features/gallery/providers/gallery_provider.c.dart b/lib/app/features/gallery/providers/gallery_provider.c.dart
@@ -53,7 +53,7 @@ class GalleryNotifier extends _$GalleryNotifier {
     final hasPermission = ref.read(hasPermissionProvider(Permission.photos));
 
     if (!hasPermission) {
-      Logger.log('Photos Permission denied');
+      Logger().log('Photos Permission denied');
       return GalleryState(
         mediaData: [],
         currentPage: 0,

diff --git a/lib/app/features/nostr/providers/nostr_notifier.c.dart b/lib/app/features/nostr/providers/nostr_notifier.c.dart
@@ -173,7 +173,7 @@ class NostrNotifier extends _$NostrNotifier {
       try {
         yield _parseAndCache(event);
       } catch (error, stackTrace) {
-        Logger.log('Failed to process event ${event.id}', error: error, stackTrace: stackTrace);
+        Logger().log('Failed to process event ${event.id}', error: error, stackTrace: stackTrace);
       }
     }
   }

diff --git a/lib/app/features/user/providers/user_relays_manager.c.dart b/lib/app/features/user/providers/user_relays_manager.c.dart
@@ -91,7 +91,7 @@ class UserRelaysManager extends _$UserRelaysManager {
         try {
           return await ionIdentity.users.details(userId: pubkey);
         } catch (error, stackTrace) {
-          Logger.log('Error fetching user relays', error: error, stackTrace: stackTrace);
+          Logger().log('Error fetching user relays', error: error, stackTrace: stackTrace);
         }
       }),
     );

diff --git a/lib/app/router/providers/go_router_provider.c.dart b/lib/app/router/providers/go_router_provider.c.dart
@@ -36,7 +36,7 @@ GoRouter goRouter(Ref ref) {
       final isInitError = initState.hasError;
 
       if (isInitError) {
-        Logger.log('Init error', error: initState.error);
+        Logger().log('Init error', error: initState.error);
         return ErrorRoute().location;
       }
 

diff --git a/lib/app/services/audio_wave_playback_service/audio_wave_playback_service.c.dart b/lib/app/services/audio_wave_playback_service/audio_wave_playback_service.c.dart
@@ -33,7 +33,7 @@ class AudioWavePlaybackService {
         await preparePlayer(savedFilePath, audioPlaybackController, playerWaveStyle);
       }
     } catch (e, s) {
-      Logger.log('Error initializing player', error: e, stackTrace: s);
+      Logger().log('Error initializing player', error: e, stackTrace: s);
     }
   }
 
@@ -48,7 +48,7 @@ class AudioWavePlaybackService {
         noOfSamples: playerWaveStyle.getSamplesForWidth(158.0.s),
       );
     } catch (e, s) {
-      Logger.log('Error preparing player', error: e, stackTrace: s);
+      Logger().log('Error preparing player', error: e, stackTrace: s);
     }
   }
 

diff --git a/lib/app/services/browser/browser.dart b/lib/app/services/browser/browser.dart
@@ -15,7 +15,7 @@ Future<bool> openUrl(
       return false;
     }
   } catch (error) {
-    Logger.log('Could not launch $url', error: error);
+    Logger().log('Could not launch $url', error: error);
     return false;
   }
 }