Skip to content

Commit 8ca541b

Browse files
authored
fix: reminder race condition (AppFlowy-IO#5587)
1 parent b64da2c commit 8ca541b

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page.dart

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import 'dart:io';
22

3+
import 'package:flutter/material.dart';
4+
35
import 'package:appflowy/mobile/presentation/home/mobile_home_page_header.dart';
46
import 'package:appflowy/mobile/presentation/home/tab/mobile_space_tab.dart';
57
import 'package:appflowy/mobile/presentation/home/tab/space_order_bloc.dart';
68
import 'package:appflowy/startup/startup.dart';
79
import 'package:appflowy/user/application/auth/auth_service.dart';
10+
import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
811
import 'package:appflowy/workspace/application/favorite/favorite_bloc.dart';
912
import 'package:appflowy/workspace/application/recent/cached_recent_service.dart';
1013
import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
@@ -15,7 +18,6 @@ import 'package:appflowy_backend/dispatch/dispatch.dart';
1518
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
1619
import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart';
1720
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
18-
import 'package:flutter/material.dart';
1921
import 'package:flutter_bloc/flutter_bloc.dart';
2022
import 'package:provider/provider.dart';
2123

@@ -112,6 +114,9 @@ class _MobileHomePageState extends State<MobileHomePage> {
112114
create: (context) =>
113115
FavoriteBloc()..add(const FavoriteEvent.initial()),
114116
),
117+
BlocProvider.value(
118+
value: getIt<ReminderBloc>()..add(const ReminderEvent.started()),
119+
),
115120
],
116121
child: BlocConsumer<UserWorkspaceBloc, UserWorkspaceState>(
117122
buildWhen: (previous, current) =>

frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import 'dart:io';
22

3+
import 'package:flutter/material.dart';
4+
import 'package:flutter/services.dart';
5+
36
import 'package:appflowy/mobile/application/mobile_router.dart';
47
import 'package:appflowy/plugins/document/application/document_appearance_cubit.dart';
58
import 'package:appflowy/shared/feature_flags.dart';
69
import 'package:appflowy/startup/startup.dart';
7-
import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
810
import 'package:appflowy/user/application/user_settings_service.dart';
911
import 'package:appflowy/workspace/application/action_navigation/action_navigation_bloc.dart';
1012
import 'package:appflowy/workspace/application/action_navigation/navigation_action.dart';
@@ -22,8 +24,6 @@ import 'package:appflowy_editor/appflowy_editor.dart' hide Log;
2224
import 'package:easy_localization/easy_localization.dart';
2325
import 'package:flowy_infra/theme.dart';
2426
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
25-
import 'package:flutter/material.dart';
26-
import 'package:flutter/services.dart';
2727
import 'package:flutter_bloc/flutter_bloc.dart';
2828
import 'package:go_router/go_router.dart';
2929

@@ -164,9 +164,6 @@ class _ApplicationWidgetState extends State<ApplicationWidget> {
164164
),
165165
BlocProvider.value(value: getIt<RenameViewBloc>()),
166166
BlocProvider.value(value: getIt<ActionNavigationBloc>()),
167-
BlocProvider.value(
168-
value: getIt<ReminderBloc>()..add(const ReminderEvent.started()),
169-
),
170167
],
171168
child: BlocListener<ActionNavigationBloc, ActionNavigationState>(
172169
listenWhen: (_, curr) => curr.action != null,

frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ class DesktopHomeScreen extends StatelessWidget {
7272
child: MultiBlocProvider(
7373
key: ValueKey(userProfile.id),
7474
providers: [
75-
BlocProvider<ReminderBloc>.value(value: getIt<ReminderBloc>()),
75+
BlocProvider.value(
76+
value: getIt<ReminderBloc>()
77+
..add(const ReminderEvent.started()),
78+
),
7679
BlocProvider<TabsBloc>.value(value: getIt<TabsBloc>()),
7780
BlocProvider<HomeBloc>(
7881
create: (_) =>

0 commit comments

Comments
 (0)