diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart index 80c86d2553..a0b920d803 100644 --- a/mobile/lib/main.dart +++ b/mobile/lib/main.dart @@ -24,14 +24,14 @@ import 'package:immich_mobile/platform/background_worker_lock_api.g.dart'; import 'package:immich_mobile/providers/app_life_cycle.provider.dart'; import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart'; import 'package:immich_mobile/providers/asset_viewer/view_intent_handler.provider.dart'; +import 'package:immich_mobile/providers/auth.provider.dart'; import 'package:immich_mobile/providers/db.provider.dart'; import 'package:immich_mobile/services/view_intent_service.dart'; import 'package:immich_mobile/providers/infrastructure/db.provider.dart'; -import 'package:immich_mobile/providers/infrastructure/platform.provider.dart'; +import 'package:immich_mobile/providers/infrastructure/platform.provider.dart'; import 'package:immich_mobile/providers/locale_provider.dart'; import 'package:immich_mobile/providers/routes.provider.dart'; import 'package:immich_mobile/providers/theme.provider.dart'; -import 'package:immich_mobile/providers/user.provider.dart'; import 'package:immich_mobile/routing/app_navigation_observer.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/services/background.service.dart'; @@ -134,7 +134,7 @@ class ImmichApp extends ConsumerStatefulWidget { } class ImmichAppState extends ConsumerState with WidgetsBindingObserver { - ProviderSubscription? _userSubscription; + ProviderSubscription? _authSubscription; @override void didChangeAppLifecycleState(AppLifecycleState state) { @@ -239,8 +239,8 @@ class ImmichAppState extends ConsumerState with WidgetsBindingObserve ref.read(viewIntentHandlerProvider).init(); ref.read(shareIntentUploadProvider.notifier).init(); - _userSubscription = ref.listenManual(currentUserProvider, (_, user) { - if (user != null) { + _authSubscription = ref.listenManual(authProvider.select((state) => state.isAuthenticated), (_, isAuthenticated) { + if (isAuthenticated) { unawaited(ref.read(viewIntentServiceProvider).flushPending()); } }, fireImmediately: true); @@ -248,7 +248,7 @@ class ImmichAppState extends ConsumerState with WidgetsBindingObserve @override void dispose() { - _userSubscription?.close(); + _authSubscription?.close(); WidgetsBinding.instance.removeObserver(this); super.dispose(); } diff --git a/mobile/lib/providers/asset_viewer/view_intent_handler.provider.dart b/mobile/lib/providers/asset_viewer/view_intent_handler.provider.dart index 92056c039d..d0482785b4 100644 --- a/mobile/lib/providers/asset_viewer/view_intent_handler.provider.dart +++ b/mobile/lib/providers/asset_viewer/view_intent_handler.provider.dart @@ -10,11 +10,11 @@ import 'package:immich_mobile/platform/native_sync_api.g.dart'; import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart'; import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart'; import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart'; +import 'package:immich_mobile/providers/auth.provider.dart'; import 'package:immich_mobile/providers/infrastructure/asset.provider.dart'; import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart'; import 'package:immich_mobile/providers/infrastructure/platform.provider.dart'; import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart'; -import 'package:immich_mobile/providers/user.provider.dart'; import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/services/view_intent_service.dart'; @@ -60,7 +60,7 @@ class ViewIntentHandler { } Future handle(ViewIntentAttachment attachment) async { - if (_ref.read(currentUserProvider) == null) { + if (!_ref.read(authProvider).isAuthenticated) { _viewIntentService.defer(attachment); return; }