fix(mobile): handle transient loading states for map timelines

docs/docs/install/environment-variables.md

@@ -89,7 +89,7 @@ Information on the current workers can be found [here](/administration/jobs-work
 
 \*1: The values of `DB_USERNAME`, `DB_PASSWORD`, and `DB_DATABASE_NAME` are passed to the Postgres container as the variables `POSTGRES_USER`, `POSTGRES_PASSWORD`, and `POSTGRES_DB` in `docker-compose.yml`.
 
-\*2: If not provided, the appropriate extension to use is auto-detected at startup by inspecting the database. When multiple extensions are installed, the order of preference is VectorChord, pgvector.
+\*2: If not provided, the appropriate extension to use is auto-detected at startup by introspecting the database. When multiple extensions are installed, the order of preference is VectorChord, pgvecto.rs, pgvector.
 
 \*3: Uses either [`postgresql.ssd.conf`](https://github.com/immich-app/base-images/blob/main/postgres/postgresql.ssd.conf) or [`postgresql.hdd.conf`](https://github.com/immich-app/base-images/blob/main/postgres/postgresql.hdd.conf) which mainly controls the Postgres `effective_io_concurrency` setting to allow for concurrenct IO on SSDs and sequential IO on HDDs.
 

mobile/lib/domain/services/timeline.service.dart

@@ -85,8 +85,12 @@ class TimelineFactory {
   TimelineService fromAssetsWithBuckets(List<BaseAsset> assets, TimelineOrigin type) =>
       TimelineService(_timelineRepository.fromAssetsWithBuckets(assets, type));
 
-  TimelineService map(List<String> userIds, TimelineMapOptions options) =>
-      TimelineService(_timelineRepository.map(userIds, options, groupBy));
+  /// Creates a TimelineService for serving geographical map queries, such assets within bounded locations
+  TimelineService geographicMap(
+    List<String> userIds,
+    TimelineMapOptions Function() currentOptions,
+    Stream<TimelineMapOptions> optionsStream,
+  ) => TimelineService(_timelineRepository.geographicMap(userIds, currentOptions, optionsStream, groupBy));
 }
 
 class TimelineService {

mobile/lib/infrastructure/repositories/timeline.repository.dart

@@ -509,9 +509,21 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return query.map((row) => row.toDto()).get();
   }
 
-  TimelineQuery map(List<String> userIds, TimelineMapOptions options, GroupAssetsBy groupBy) => (
-    bucketSource: () => _watchMapBucket(userIds, options, groupBy: groupBy),
-    assetSource: (offset, count) => _getMapBucketAssets(userIds, options, offset: offset, count: count),
+  /// Creates a geographic map query that can dynamically filter on changing [TimelineMapOptions]
+  /// (most notably the active map bounds)
+  TimelineQuery geographicMap(
+    List<String> userIds,
+    TimelineMapOptions Function() currentOptions,
+    Stream<TimelineMapOptions> optionsStream,
+    GroupAssetsBy groupBy,
+  ) => (
+    bucketSource: () => Stream.value(currentOptions())
+        .followedBy(optionsStream)
+        .switchMap(
+          // Any error would kill the stream for all options; make sure the stream stays alive
+          (options) => _watchMapBucket(userIds, options, groupBy: groupBy).handleError((_) {}),
+        ),
+    assetSource: (offset, count) => _getMapBucketAssets(userIds, currentOptions(), offset: offset, count: count),
     origin: TimelineOrigin.map,
   );
 

mobile/lib/presentation/widgets/bottom_sheet/map_bottom_sheet.widget.dart

@@ -35,7 +35,6 @@ class _ScopedMapTimeline extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // TODO: this causes the timeline to switch to flicker to "loading" state and back. This is both janky and inefficient.
     return ProviderScope(
       overrides: [
         timelineServiceProvider.overrideWith((ref) {
@@ -44,13 +43,16 @@ class _ScopedMapTimeline extends StatelessWidget {
             throw Exception('User must be logged in to access archive');
           }
 
-          final users = ref.watch(mapStateProvider).withPartners
-              ? ref.watch(timelineUsersProvider).valueOrNull ?? [user.id]
-              : [user.id];
+          final withPartners = ref.watch(mapStateProvider.select((s) => s.withPartners));
+          final users = withPartners ? ref.watch(timelineUsersProvider).valueOrNull ?? [user.id] : [user.id];
 
           final timelineService = ref
               .watch(timelineFactoryProvider)
-              .map(users, ref.watch(mapStateProvider).toOptions());
+              .geographicMap(
+                users,
+                () => ref.read(mapStateProvider).toOptions(),
+                ref.read(mapStateProvider.notifier).optionsStream,
+              );
           ref.onDispose(timelineService.dispose);
           return timelineService;
         }),

mobile/lib/presentation/widgets/map/map.state.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
@@ -63,11 +65,16 @@ class MapState {
 class MapStateNotifier extends Notifier<MapState> {
   MapStateNotifier();
 
+  final StreamController<TimelineMapOptions> _optionsController = StreamController.broadcast();
+
+  Stream<TimelineMapOptions> get optionsStream => _optionsController.stream;
+
   bool setBounds(LatLngBounds bounds) {
     if (state.bounds == bounds) {
       return false;
     }
     state = state.copyWith(bounds: bounds);
+    _optionsController.add(state.toOptions());
     return true;
   }
 
@@ -82,12 +89,14 @@ class MapStateNotifier extends Notifier<MapState> {
   void switchFavoriteOnly(bool isFavoriteOnly) {
     ref.read(settingsProvider).write(.mapShowFavoriteOnly, isFavoriteOnly);
     state = state.copyWith(onlyFavorites: isFavoriteOnly);
+    _optionsController.add(state.toOptions());
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   void switchIncludeArchived(bool isIncludeArchived) {
     ref.read(settingsProvider).write(.mapIncludeArchived, isIncludeArchived);
     state = state.copyWith(includeArchived: isIncludeArchived);
+    _optionsController.add(state.toOptions());
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
@@ -100,11 +109,13 @@ class MapStateNotifier extends Notifier<MapState> {
   void setRelativeTime(int relativeDays) {
     ref.read(settingsProvider).write(.mapRelativeDate, relativeDays);
     state = state.copyWith(relativeDays: relativeDays);
+    _optionsController.add(state.toOptions());
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   @override
   MapState build() {
+    ref.onDispose(_optionsController.close);
     final mapConfig = ref.read(appConfigProvider.select((config) => config.map));
     return MapState(
       themeMode: mapConfig.themeMode,

mobile/lib/providers/auth.provider.dart

@@ -183,7 +183,6 @@ class AuthNotifier extends StateNotifier<AuthState> {
 
   Future<void> saveLocalEndpoint(String url) async {
     await _ref.read(settingsProvider).write(.networkLocalEndpoint, url);
-    await _apiService.updateHeaders();
   }
 
   String? getSavedWifiName() {

mobile/lib/widgets/settings/networking_settings/external_network_preference.dart

@@ -5,7 +5,6 @@ import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
-import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/endpoint_input.dart';
 
@@ -27,16 +26,13 @@ class ExternalNetworkPreference extends HookConsumerWidget {
           .map((e) => e.url)
           .toList();
 
-      return ref.read(settingsProvider).write(SettingsKey.networkExternalEndpointList, urls);
+      ref.read(settingsProvider).write(SettingsKey.networkExternalEndpointList, urls);
     }
 
-    updateValidationStatus(String url, int index, AuxCheckStatus status) async {
+    updateValidationStatus(String url, int index, AuxCheckStatus status) {
       entries.value[index] = entries.value[index].copyWith(url: url, status: status);
 
-      await saveEndpointList();
-      if (status == AuxCheckStatus.valid) {
-        await ref.read(apiServiceProvider).updateHeaders();
-      }
+      saveEndpointList();
     }
 
     handleReorder(int oldIndex, int newIndex) {

mobile/pubspec.lock

@@ -309,8 +309,8 @@ packages:
     dependency: "direct main"
     description:
       path: "pkgs/cupertino_http"
-      ref: "58b03c756b81d16b3975a8ae4b91d25360123bb5"
-      resolved-ref: "58b03c756b81d16b3975a8ae4b91d25360123bb5"
+      ref: a0a933358517c6d01cff37fc2a2752ee2d744a3c
+      resolved-ref: a0a933358517c6d01cff37fc2a2752ee2d744a3c
       url: "https://github.com/mertalev/http"
     source: git
     version: "3.0.0-wip"
@@ -1158,13 +1158,12 @@ packages:
     source: hosted
     version: "0.5.0"
   objective_c:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "pkgs/objective_c"
-      ref: "2915556701f4734a784222f290a82adb1b101682"
-      resolved-ref: "2915556701f4734a784222f290a82adb1b101682"
-      url: "https://github.com/mertalev/native"
-    source: git
+      name: objective_c
+      sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed"
+      url: "https://pub.dev"
+    source: hosted
     version: "9.4.1"
   octo_image:
     dependency: "direct main"

mobile/pubspec.yaml

@@ -84,7 +84,7 @@ dependencies:
   cupertino_http:
     git:
       url: https://github.com/mertalev/http
-      ref: '58b03c756b81d16b3975a8ae4b91d25360123bb5'
+      ref: 'a0a933358517c6d01cff37fc2a2752ee2d744a3c' # https://github.com/dart-lang/http/pull/1876
       path: pkgs/cupertino_http/
   ok_http:
     git:
@@ -114,11 +114,6 @@ dev_dependencies:
 # Pin bonsoir to 5.x until cast releases a version compatible with bonsoir 6.x.
 dependency_overrides:
   bonsoir: ^5.1.11
-  objective_c:
-    git:
-      url: https://github.com/mertalev/native
-      ref: '2915556701f4734a784222f290a82adb1b101682' # https://github.com/dart-lang/native/pull/3458
-      path: pkgs/objective_c/
 
 flutter:
   uses-material-design: true