Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/features/macos_extension/macos_extension_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ class _MacOSExtensionDialogState extends ConsumerState<MacOSExtensionDialog> {
}
if (systemExtensionStatus.status == SystemExtensionStatus.installed ||
systemExtensionStatus.status == SystemExtensionStatus.activated) {
appLogger.info(
"System Extension is installed and activated. Closing dialog.");
appRouter.pop();
WidgetsBinding.instance.addPostFrameCallback((_) {
appLogger.info(
"System Extension is installed and activated. Closing dialog.");
appRouter.pop();
});
}
return null;
}, [systemExtensionStatus.status]);
Expand Down
27 changes: 16 additions & 11 deletions lib/features/onboarding/onboarding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,17 @@ class _OnboardingState extends ConsumerState<Onboarding> {

void onboardingCompleted() {
ref.read(appSettingProvider.notifier).setOnboardingCompleted(true);
final shouldShowExtensionDialog =
appSetting.showSplashScreen && PlatformUtils.isMacOS;
appRouter.pop();
if (appSetting.showSplashScreen && PlatformUtils.isMacOS) {
if (shouldShowExtensionDialog) {
appLogger.info("Showing System Extension Dialog");
appRouter.push(const MacOSExtensionDialog());
// Defer the push to the next frame to avoid calling setState during build
WidgetsBinding.instance.addPostFrameCallback((_) {
appRouter.push(const MacOSExtensionDialog());
});
// User has seen dialog, do not show again
appLogger.info("Setting showSplashScreen to false");

ref.read(appSettingProvider.notifier).setSplashScreen(false);
return;
}
Expand Down Expand Up @@ -120,7 +124,6 @@ class _OnboardingState extends ConsumerState<Onboarding> {
label: 'skip_connect_now'.i18n,
textColor: AppColors.gray9,
onPressed: () {
appRouter.pop();
onboardingCompleted();
},
)
Expand Down Expand Up @@ -243,14 +246,16 @@ class _OnboardingState extends ConsumerState<Onboarding> {
final routeMode =
ref.watch(appSettingProvider.select((value) => value.routingMode));
useEffect(() {
final routeMode =
ref.read(appSettingProvider.select((v) => v.routingMode));
Future(() {
final routeMode =
ref.read(appSettingProvider.select((v) => v.routingMode));

if (routeMode == RoutingMode.full) {
ref
.read(appSettingProvider.notifier)
.setRoutingMode(RoutingMode.smart);
}
if (routeMode == RoutingMode.full) {
ref
.read(appSettingProvider.notifier)
.setRoutingMode(RoutingMode.smart);
}
});

return null;
}, const []);
Expand Down
Loading