Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix: notification settings initial state (#3763)

Mathias Mogensencd6e133c8672
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/notifications/notification_settings_cubit.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/notifications/notification_settings_cubit.dart
index 75874cf432..b495845909 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/settings/notifications/notification_settings_cubit.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/notifications/notification_settings_cubit.dart
@@ -18,6 +18,11 @@ class NotificationSettingsCubit extends Cubit<NotificationSettingsState> {
.getNotificationSettings()
.then((notificationSettings) {
_notificationSettings = notificationSettings;
+ emit(
+ state.copyWith(
+ isNotificationsEnabled: _notificationSettings.notificationsEnabled,
+ ),
+ );
_initCompleter.complete();
});
}
@@ -26,13 +31,14 @@ class NotificationSettingsCubit extends Cubit<NotificationSettingsState> {
await _initCompleter.future;
_notificationSettings.notificationsEnabled = !state.isNotificationsEnabled;
- _saveNotificationSettings();
emit(
state.copyWith(
isNotificationsEnabled: _notificationSettings.notificationsEnabled,
),
);
+
+ _saveNotificationSettings();
}
Future<void> _saveNotificationSettings() async {
diff --git a/frontend/rust-lib/flowy-user/src/entities/user_setting.rs b/frontend/rust-lib/flowy-user/src/entities/user_setting.rs
index 6dab6b4583..a4e91f4a5c 100644
--- a/frontend/rust-lib/flowy-user/src/entities/user_setting.rs
+++ b/frontend/rust-lib/flowy-user/src/entities/user_setting.rs
@@ -241,6 +241,7 @@ impl std::default::Default for DateTimeSettingsPB {
#[derive(ProtoBuf, Serialize, Deserialize, Debug, Clone)]
pub struct NotificationSettingsPB {
#[pb(index = 1)]
+ #[serde(default)]
pub notifications_enabled: bool,
}