packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart

@@ -38,10 +38,6 @@ class ListenNotification extends StreamUseCase<NoParam, RemoteNotification> {
     if (notificationStreamResponse.isOk) {
       notificationStream = notificationStreamResponse.ok;
     } else if (notificationStreamResponse.isErr) {
-      if (notificationStreamResponse.err! is UnimplementedError) {
-        return Err(notificationStreamResponse.err!);
-      }
-
       final notificationBackgroundStreamResponse =
           await _notificationRepository.onNotificationBackground();
 

packages/wyatt_cloud_messaging_bloc_firebase/lib/src/data/data_sources/cloud_messaging_firebase_data_source.dart

@@ -6,8 +6,6 @@ import 'package:firebase_messaging/firebase_messaging.dart'
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:wyatt_cloud_messaging_bloc_base/wyatt_cloud_messaging_bloc.dart';
 
-typedef CloudMessagingStreamController = StreamController<RemoteNotification>;
-
 class CloudMessagingFirebaseDataSource extends CloudMessagingRemoteDataSource {
   final FirebaseMessaging _firebaseMessagingInstance =
       FirebaseMessaging.instance;
@@ -20,36 +18,8 @@ class CloudMessagingFirebaseDataSource extends CloudMessagingRemoteDataSource {
   }
 
   @override
-  Future<Stream<RemoteNotification>> onNotificationBackground() async {
+  Future<Stream<RemoteNotification>> onNotificationBackground() {
-    final backgroundStreamController = CloudMessagingStreamController();
+    throw UnimplementedError();
-
-    Future<void> getLastBackgroundNotification() async {
-      final lastNotification =
-          await _firebaseMessagingInstance.getInitialMessage();
-      if (lastNotification != null) {
-        backgroundStreamController.add(
-          RemoteNotification(
-            title: lastNotification.notification?.title,
-            body: lastNotification.notification?.body,
-            data: lastNotification.data,
-          ),
-        );
-      }
-
-      FirebaseMessaging.onMessageOpenedApp.listen((notification) {
-        backgroundStreamController.add(
-          RemoteNotification(
-            title: notification.notification?.title,
-            body: notification.notification?.body,
-            data: notification.data,
-          ),
-        );
-      });
-    }
-
-    unawaited(getLastBackgroundNotification());
-
-    return backgroundStreamController.stream;
   }
 
   @override
@@ -77,8 +47,8 @@ class CloudMessagingFirebaseDataSource extends CloudMessagingRemoteDataSource {
       iOS: DarwinInitializationSettings(),
     );
 
-    final CloudMessagingStreamController foregroundStream =
+    final StreamController<RemoteNotification> foregroundStream =
-        CloudMessagingStreamController();
+        StreamController<RemoteNotification>();
 
     await _localNotificationInstance.initialize(
       initializationSettings,