Merge pull request #934 from nextcloud/refactor/push-notifications-bloc

refactor(neon): Cleanup push notifications bloc

packages/neon/neon/lib/neon.dart

@@ -51,7 +51,7 @@ Future<void> runNeon({
       ..addAccount(account)
       ..setActiveAccount(account);
   }
-  final pushNotificationsBloc = PushNotificationsBloc(
+  PushNotificationsBloc(
     accountsBloc,
     globalOptions,
   );
@@ -69,7 +69,6 @@ Future<void> runNeon({
       providers: [
         NeonProvider<GlobalOptions>.value(value: globalOptions),
         NeonProvider<AccountsBloc>.value(value: accountsBloc),
-        NeonProvider<PushNotificationsBloc>.value(value: pushNotificationsBloc),
         NeonProvider<FirstLaunchBloc>.value(value: firstLaunchBloc),
         NeonProvider<NextPushBloc>.value(value: nextPushBloc),
         Provider<Iterable<AppImplementation>>(

packages/neon/neon/lib/src/blocs/push_notifications.dart

@@ -6,7 +6,6 @@ import 'package:meta/meta.dart';
 import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/models/account.dart';
-import 'package:neon/src/models/push_notification.dart';
 import 'package:neon/src/platform/platform.dart';
 import 'package:neon/src/settings/models/storage.dart';
 import 'package:neon/src/utils/global_options.dart';
@@ -18,9 +17,7 @@ import 'package:unifiedpush/unifiedpush.dart';
 abstract interface class PushNotificationsBlocEvents {}
 
 @internal
-abstract interface class PushNotificationsBlocStates {
+abstract interface class PushNotificationsBlocStates {}
-  Stream<PushNotification> get notifications;
-}
 
 @internal
 class PushNotificationsBloc extends Bloc implements PushNotificationsBlocEvents, PushNotificationsBlocStates {
@@ -41,19 +38,14 @@ class PushNotificationsBloc extends Bloc implements PushNotificationsBlocEvents,
   late final _storage = const AppStorage(StorageKeys.notifications);
   final GlobalOptions _globalOptions;
 
-  final _notificationsController = StreamController<PushNotification>();
   StreamSubscription<List<Account>>? _accountsListener;
 
   @override
   void dispose() {
-    unawaited(_notificationsController.close());
     unawaited(_accountsListener?.cancel());
     _globalOptions.pushNotificationsEnabled.removeListener(_pushNotificationsEnabledListener);
   }
 
-  @override
-  late Stream<PushNotification> notifications = _notificationsController.stream.asBroadcastStream();
-
   String _keyLastEndpoint(final Account account) => 'last-endpoint-${account.id}';
 
   Future<void> _pushNotificationsEnabledListener() async {