Merge pull request #2020 from nextcloud/refactor/neon_framework/repla…

…ce-blocs-access-behaviorsubjects

packages/neon_framework/lib/neon.dart

@@ -59,14 +59,14 @@ Future<void> runNeon({
       ..setActiveAccount(account);
   }
   PushNotificationsBloc(
-    accountsBloc: accountsBloc,
+    accountsSubject: accountsBloc.accounts,
     globalOptions: globalOptions,
   );
   final firstLaunchBloc = FirstLaunchBloc(
     disabled: firstLaunchDisabled,
   );
   final nextPushBloc = NextPushBloc(
-    accountsBloc: accountsBloc,
+    accountsSubject: accountsBloc.accounts,
     globalOptions: globalOptions,
     disabled: nextPushDisabled,
   );

packages/neon_framework/lib/src/blocs/accounts.dart

@@ -337,9 +337,9 @@ class _AccountsBloc extends Bloc implements AccountsBloc {
 
   @override
   AppsBloc getAppsBlocFor(Account account) => appsBlocs[account] ??= AppsBloc(
-        capabilitiesBloc: getCapabilitiesBlocFor(account),
-        accountsBloc: this,
+        capabilitiesSubject: getCapabilitiesBlocFor(account).capabilities,
         account: account,
+        accountOptions: getOptionsFor(account),
         allAppImplementations: allAppImplementations,
       );
 
@@ -372,7 +372,7 @@ class _AccountsBloc extends Bloc implements AccountsBloc {
 
   @override
   UnifiedSearchBloc getUnifiedSearchBlocFor(Account account) => unifiedSearchBlocs[account] ??= UnifiedSearchBloc(
-        appsBloc: getAppsBlocFor(account),
+        activeAppSubject: getAppsBlocFor(account).activeApp,
         account: account,
       );
 

packages/neon_framework/lib/src/blocs/apps.dart

@@ -6,11 +6,10 @@ import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:neon_framework/src/bloc/bloc.dart';
 import 'package:neon_framework/src/bloc/result.dart';
-import 'package:neon_framework/src/blocs/accounts.dart';
-import 'package:neon_framework/src/blocs/capabilities.dart';
 import 'package:neon_framework/src/models/account.dart';
 import 'package:neon_framework/src/models/app_implementation.dart';
 import 'package:neon_framework/src/models/notifications_interface.dart';
+import 'package:neon_framework/src/utils/account_options.dart';
 import 'package:neon_framework/src/utils/findable.dart';
 import 'package:neon_framework/src/utils/request_manager.dart';
 import 'package:neon_framework/src/utils/server_version.dart';
@@ -25,9 +24,9 @@ abstract class AppsBloc implements InteractiveBloc {
   /// Create a new apps bloc.
   @internal
   factory AppsBloc({
-    required CapabilitiesBloc capabilitiesBloc,
-    required AccountsBloc accountsBloc,
+    required BehaviorSubject<Result<core.OcsGetCapabilitiesResponseApplicationJson_Ocs_Data>> capabilitiesSubject,
     required Account account,
+    required AccountOptions accountOptions,
     required BuiltSet<AppImplementation> allAppImplementations,
   }) = _AppsBloc;
 
@@ -67,9 +66,9 @@ abstract class AppsBloc implements InteractiveBloc {
 class _AppsBloc extends InteractiveBloc implements AppsBloc {
   /// Creates a new apps bloc.
   _AppsBloc({
-    required this.capabilitiesBloc,
-    required this.accountsBloc,
+    required this.capabilitiesSubject,
     required this.account,
+    required this.accountOptions,
     required this.allAppImplementations,
   }) {
     apps.listen((result) {
@@ -80,7 +79,7 @@ class _AppsBloc extends InteractiveBloc implements AppsBloc {
       }
     });
 
-    capabilitiesBloc.capabilities.listen((result) {
+    capabilitiesSubject.listen((result) {
       notificationsAppImplementation.add(
         result.transform(
           (data) => data.capabilities.notificationsCapabilities?.notifications != null
@@ -145,8 +144,7 @@ class _AppsBloc extends InteractiveBloc implements AppsBloc {
       return null;
     }
 
-    final options = accountsBloc.getOptionsFor(account);
-    for (final fallback in {options.initialApp.value, AppIDs.dashboard, AppIDs.files}) {
+    for (final fallback in {accountOptions.initialApp.value, AppIDs.dashboard, AppIDs.files}) {
       if (supportedApps.tryFind(fallback) != null) {
         return fallback;
       }
@@ -161,7 +159,7 @@ class _AppsBloc extends InteractiveBloc implements AppsBloc {
 
   Future<void> checkCompatibility() async {
     final apps = appImplementations.valueOrNull;
-    final capabilities = capabilitiesBloc.capabilities.valueOrNull;
+    final capabilities = capabilitiesSubject.valueOrNull;
 
     // ignore cached data
     if (capabilities == null || apps == null || !capabilities.hasSuccessfulData || !apps.hasSuccessfulData) {
@@ -216,9 +214,9 @@ class _AppsBloc extends InteractiveBloc implements AppsBloc {
         ),
       );
 
-  final CapabilitiesBloc capabilitiesBloc;
-  final AccountsBloc accountsBloc;
+  final BehaviorSubject<Result<core.OcsGetCapabilitiesResponseApplicationJson_Ocs_Data>> capabilitiesSubject;
   final Account account;
+  final AccountOptions accountOptions;
   final BuiltSet<AppImplementation> allAppImplementations;
   final apps = BehaviorSubject<Result<BuiltList<core.NavigationEntry>>>();
 

packages/neon_framework/lib/src/blocs/maintenance_mode.dart

@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
-import 'package:neon_framework/blocs.dart';
 import 'package:neon_framework/models.dart';
+import 'package:neon_framework/src/bloc/bloc.dart';
 import 'package:nextcloud/core.dart';
 
 /// A Bloc checking if the server is in maintenance mode.

packages/neon_framework/lib/src/blocs/next_push.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 
+import 'package:built_collection/built_collection.dart';
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:neon_framework/src/bloc/bloc.dart';
-import 'package:neon_framework/src/blocs/accounts.dart';
 import 'package:neon_framework/src/models/account.dart';
 import 'package:neon_framework/src/models/disposable.dart';
 import 'package:neon_framework/src/utils/global_options.dart';
@@ -15,7 +15,7 @@ import 'package:rxdart/rxdart.dart';
 sealed class NextPushBloc implements Disposable {
   @internal
   factory NextPushBloc({
-    required AccountsBloc accountsBloc,
+    required BehaviorSubject<BuiltList<Account>> accountsSubject,
     required GlobalOptions globalOptions,
     bool disabled,
   }) = _NextPushBloc;
@@ -26,7 +26,7 @@ sealed class NextPushBloc implements Disposable {
 
 class _NextPushBloc extends Bloc implements NextPushBloc {
   _NextPushBloc({
-    required this.accountsBloc,
+    required this.accountsSubject,
     required this.globalOptions,
     bool disabled = false,
   }) {
@@ -36,7 +36,7 @@ class _NextPushBloc extends Bloc implements NextPushBloc {
     Rx.merge([
       globalOptions.pushNotificationsEnabled.stream,
       globalOptions.pushNotificationsDistributor.stream,
-      accountsBloc.accounts,
+      accountsSubject,
     ]).debounceTime(const Duration(milliseconds: 100)).listen((_) async {
       if (!globalOptions.pushNotificationsEnabled.enabled || !globalOptions.pushNotificationsEnabled.value) {
         return;
@@ -50,7 +50,7 @@ class _NextPushBloc extends Bloc implements NextPushBloc {
       }
 
       var isSupported = false;
-      for (final account in accountsBloc.accounts.value) {
+      for (final account in accountsSubject.value) {
         if (!supported.containsKey(account)) {
           try {
             final response = await account.client.uppush.check();
@@ -85,7 +85,7 @@ class _NextPushBloc extends Bloc implements NextPushBloc {
   @override
   final log = Logger('NextPushBloc');
 
-  final AccountsBloc accountsBloc;
+  final BehaviorSubject<BuiltList<Account>> accountsSubject;
   final GlobalOptions globalOptions;
   final supported = <Account, bool>{};
 

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

@@ -5,7 +5,6 @@ import 'package:built_collection/built_collection.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:neon_framework/src/bloc/bloc.dart';
-import 'package:neon_framework/src/blocs/accounts.dart';
 import 'package:neon_framework/src/models/account.dart';
 import 'package:neon_framework/src/platform/platform.dart';
 import 'package:neon_framework/src/storage/keys.dart';
@@ -14,20 +13,21 @@ import 'package:neon_framework/src/utils/global_options.dart';
 import 'package:neon_framework/src/utils/push_utils.dart';
 import 'package:neon_framework/storage.dart';
 import 'package:nextcloud/notifications.dart' as notifications;
+import 'package:rxdart/rxdart.dart';
 import 'package:unifiedpush/unifiedpush.dart';
 
 /// Bloc for managing push notifications and registration.
 sealed class PushNotificationsBloc {
   @internal
   factory PushNotificationsBloc({
-    required AccountsBloc accountsBloc,
+    required BehaviorSubject<BuiltList<Account>> accountsSubject,
     required GlobalOptions globalOptions,
   }) = _PushNotificationsBloc;
 }
 
 class _PushNotificationsBloc extends Bloc implements PushNotificationsBloc {
   _PushNotificationsBloc({
-    required this.accountsBloc,
+    required this.accountsSubject,
     required this.globalOptions,
   }) {
     if (NeonPlatform.instance.canUsePushNotifications) {
@@ -42,7 +42,7 @@ class _PushNotificationsBloc extends Bloc implements PushNotificationsBloc {
   @override
   final log = Logger('PushNotificationsBloc');
 
-  final AccountsBloc accountsBloc;
+  final BehaviorSubject<BuiltList<Account>> accountsSubject;
   late final storage = NeonStorage().settingsStore(StorageKeys.lastEndpoint);
   final GlobalOptions globalOptions;
 
@@ -59,7 +59,7 @@ class _PushNotificationsBloc extends Bloc implements PushNotificationsBloc {
       await setupUnifiedPush();
 
       globalOptions.pushNotificationsDistributor.addListener(distributorListener);
-      accountsListener = accountsBloc.accounts.listen(registerUnifiedPushInstances);
+      accountsListener = accountsSubject.listen(registerUnifiedPushInstances);
     } else {
       globalOptions.pushNotificationsDistributor.removeListener(distributorListener);
       unawaited(accountsListener?.cancel());
@@ -72,7 +72,7 @@ class _PushNotificationsBloc extends Bloc implements PushNotificationsBloc {
 
     await UnifiedPush.initialize(
       onNewEndpoint: (endpoint, instance) async {
-        final account = accountsBloc.accounts.value.tryFind(instance);
+        final account = accountsSubject.value.tryFind(instance);
         if (account == null) {
           log.fine('Account for $instance not found, can not process endpoint');
           return;
@@ -105,7 +105,7 @@ class _PushNotificationsBloc extends Bloc implements PushNotificationsBloc {
     final distributor = globalOptions.pushNotificationsDistributor.value;
     final disabled = distributor == null;
     final sameDistributor = distributor == await UnifiedPush.getDistributor();
-    final accounts = accountsBloc.accounts.value;
+    final accounts = accountsSubject.value;
     if (disabled || !sameDistributor) {
       await unregisterUnifiedPushInstances(accounts);
     }

packages/neon_framework/lib/src/blocs/unified_search.dart

@@ -8,7 +8,6 @@ import 'package:meta/meta.dart';
 import 'package:neon_framework/models.dart';
 import 'package:neon_framework/src/bloc/bloc.dart';
 import 'package:neon_framework/src/bloc/result.dart';
-import 'package:neon_framework/src/blocs/apps.dart';
 import 'package:neon_framework/src/utils/request_manager.dart';
 import 'package:nextcloud/core.dart' as core;
 import 'package:rxdart/rxdart.dart';
@@ -17,7 +16,7 @@ import 'package:rxdart/rxdart.dart';
 sealed class UnifiedSearchBloc implements InteractiveBloc {
   @internal
   factory UnifiedSearchBloc({
-    required AppsBloc appsBloc,
+    required BehaviorSubject<AppImplementation> activeAppSubject,
     required Account account,
   }) = _UnifiedSearchBloc;
 
@@ -39,10 +38,10 @@ sealed class UnifiedSearchBloc implements InteractiveBloc {
 
 class _UnifiedSearchBloc extends InteractiveBloc implements UnifiedSearchBloc {
   _UnifiedSearchBloc({
-    required this.appsBloc,
+    required this.activeAppSubject,
     required this.account,
   }) {
-    appsBloc.activeApp.listen((_) {
+    activeAppSubject.listen((_) {
       term = '';
       extendedSearchEnabled = false;
       results.add(BuiltMap());
@@ -52,7 +51,7 @@ class _UnifiedSearchBloc extends InteractiveBloc implements UnifiedSearchBloc {
   @override
   final log = Logger('UnifiedSearchBloc');
 
-  final AppsBloc appsBloc;
+  final BehaviorSubject<AppImplementation> activeAppSubject;
   final Account account;
   String term = '';
   bool extendedSearchEnabled = false;
@@ -95,7 +94,7 @@ class _UnifiedSearchBloc extends InteractiveBloc implements UnifiedSearchBloc {
     }
 
     if (providers.value.hasData) {
-      final activeApp = appsBloc.activeApp.value;
+      final activeApp = activeAppSubject.value;
 
       var providerIDs = providers.value.requireData!.map((provider) => provider.id);
       if (!extendedSearchEnabled) {
@@ -175,7 +174,7 @@ class _UnifiedSearchBloc extends InteractiveBloc implements UnifiedSearchBloc {
   Iterable<MapEntry<String, Result<core.UnifiedSearchResult>>> sortResults(
     BuiltMap<String, Result<core.UnifiedSearchResult>> results,
   ) sync* {
-    final activeApp = appsBloc.activeApp.value;
+    final activeApp = activeAppSubject.value;
 
     // Unlike non-matching providers (below) we don't filter the empty results,
     // as the active app is more relevant and we want to know if there are no results for the active app.

packages/neon_framework/lib/src/blocs/weather_status.dart

@@ -3,8 +3,10 @@ import 'dart:async';
 import 'package:built_collection/built_collection.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
-import 'package:neon_framework/blocs.dart';
 import 'package:neon_framework/models.dart';
+import 'package:neon_framework/src/bloc/bloc.dart';
+import 'package:neon_framework/src/bloc/result.dart';
+import 'package:neon_framework/src/blocs/timer.dart';
 import 'package:neon_framework/utils.dart';
 import 'package:nextcloud/core.dart' as core;
 import 'package:nextcloud/weather_status.dart' as weather_status;

packages/neon_framework/test/unified_search_bloc_test.dart

@@ -100,7 +100,7 @@ void main() {
 
     account = mockUnifiedSearchAccount();
     bloc = UnifiedSearchBloc(
-      appsBloc: appsBloc,
+      activeAppSubject: appsBloc.activeApp,
       account: account,
     );
   });