feat(mobile): use shared native client (#25942)

* use shared client in dart

fix android

* websocket integration

platform-side headers

update comment

consistent platform check

tweak websocket handling

support streaming

* redundant logging

* fix proguard

* formatting

* handle onProgress

* support videos on ios

* inline return

* improved ios impl

* cleanup

* sync stopForegroundBackup

* voidify

* future already completed

* stream request on android

* outdated ios ws code

* use `choosePrivateKeyAlias`

* return result

* formatting

* update tests

* redundant check

* handle custom headers

* move completer outside of state

* persist auth

* dispose old socket

* use group id for cookies

* redundant headers

* cache global ref

* handle network switching

* handle basic auth

* apply custom headers immediately

* video player update

* fix

* persist url

* potential logout fix

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>

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

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'dart:ui';
 
 import 'package:background_downloader/background_downloader.dart';
-import 'package:cancellation_token_http/http.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
@@ -28,7 +27,6 @@ import 'package:immich_mobile/services/localization.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
-import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/wm_executor.dart';
 import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
@@ -64,7 +62,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   final Drift _drift;
   final DriftLogger _driftLogger;
   final BackgroundWorkerBgHostApi _backgroundHostApi;
-  final CancellationToken _cancellationToken = CancellationToken();
+  final _cancellationToken = Completer<void>();
   final Logger _logger = Logger('BackgroundWorkerBgService');
 
   bool _isCleanedUp = false;
@@ -88,8 +86,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
 
   Future<void> init() async {
     try {
-      HttpSSLOptions.apply();
-
       await Future.wait(
         [
           loadTranslations(),
@@ -198,7 +194,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       _ref?.dispose();
       _ref = null;
 
-      _cancellationToken.cancel();
+      _cancellationToken.complete();
       _logger.info("Cleaning up background worker");
 
       final cleanupFutures = [

mobile/lib/infrastructure/loaders/remote_image_request.dart

@@ -2,9 +2,8 @@ part of 'image_request.dart';
 
 class RemoteImageRequest extends ImageRequest {
   final String uri;
-  final Map<String, String> headers;
 
-  RemoteImageRequest({required this.uri, required this.headers});
+  RemoteImageRequest({required this.uri});
 
   @override
   Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
@@ -12,7 +11,7 @@ class RemoteImageRequest extends ImageRequest {
       return null;
     }
 
-    final info = await remoteImageApi.requestImage(uri, headers: headers, requestId: requestId, preferEncoded: false);
+    final info = await remoteImageApi.requestImage(uri, requestId: requestId, preferEncoded: false);
     // Android always returns encoded data, so we need to check for both shapes of the response.
     final frame = switch (info) {
       {'pointer': int pointer, 'length': int length} => await _fromEncodedPlatformImage(pointer, length),
@@ -29,7 +28,7 @@ class RemoteImageRequest extends ImageRequest {
       return null;
     }
 
-    final info = await remoteImageApi.requestImage(uri, headers: headers, requestId: requestId, preferEncoded: true);
+    final info = await remoteImageApi.requestImage(uri, requestId: requestId, preferEncoded: true);
     if (info == null) return null;
 
     final (codec, _) = await _codecFromEncodedPlatformImage(info['pointer']!, info['length']!) ?? (null, null);

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

@@ -1,67 +1,55 @@
+import 'dart:ffi';
 import 'dart:io';
 
-import 'package:cronet_http/cronet_http.dart';
 import 'package:cupertino_http/cupertino_http.dart';
 import 'package:http/http.dart' as http;
-import 'package:immich_mobile/utils/user_agent.dart';
-import 'package:path_provider/path_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
+import 'package:ok_http/ok_http.dart';
+import 'package:web_socket/web_socket.dart';
 
 class NetworkRepository {
-  static late Directory _cachePath;
-  static late String _userAgent;
-  static final _clients = <String, http.Client>{};
+  static http.Client? _client;
+  static Pointer<Void>? _clientPointer;
 
-  static Future<void> init() {
-    return (
-      getTemporaryDirectory().then((cachePath) => _cachePath = cachePath),
-      getUserAgentString().then((userAgent) => _userAgent = userAgent),
-    ).wait;
+  static Future<void> init() async {
+    final clientPointer = Pointer<Void>.fromAddress(await networkApi.getClientPointer());
+    if (clientPointer == _clientPointer) {
+      return;
+    }
+    _clientPointer = clientPointer;
+    _client?.close();
+    if (Platform.isIOS) {
+      final session = URLSession.fromRawPointer(clientPointer.cast());
+      _client = CupertinoClient.fromSharedSession(session);
+    } else {
+      _client = OkHttpClient.fromJniGlobalRef(clientPointer);
+    }
   }
 
-  static void reset() {
-    Future.microtask(init);
-    for (final client in _clients.values) {
-      client.close();
+  static Future<void> setHeaders(Map<String, String> headers, List<String> serverUrls) async {
+    await networkApi.setRequestHeaders(headers, serverUrls);
+    if (Platform.isIOS) {
+      await init();
+    }
+  }
+
+  // ignore: avoid-unused-parameters
+  static Future<WebSocket> createWebSocket(Uri uri, {Map<String, String>? headers, Iterable<String>? protocols}) {
+    if (Platform.isIOS) {
+      final session = URLSession.fromRawPointer(_clientPointer!.cast());
+      return CupertinoWebSocket.connectWithSession(session, uri, protocols: protocols);
+    } else {
+      return OkHttpWebSocket.connectFromJniGlobalRef(_clientPointer!, uri, protocols: protocols);
     }
-    _clients.clear();
   }
 
   const NetworkRepository();
 
-  /// Note: when disk caching is enabled, only one client may use a given directory at a time.
-  /// Different isolates or engines must use different directories.
-  http.Client getHttpClient(
-    String directoryName, {
-    CacheMode cacheMode = CacheMode.memory,
-    int diskCapacity = 0,
-    int maxConnections = 6,
-    int memoryCapacity = 10 << 20,
-  }) {
-    final cachedClient = _clients[directoryName];
-    if (cachedClient != null) {
-      return cachedClient;
-    }
-
-    final directory = Directory('${_cachePath.path}/$directoryName');
-    directory.createSync(recursive: true);
-    if (Platform.isAndroid) {
-      final engine = CronetEngine.build(
-        cacheMode: cacheMode,
-        cacheMaxSize: diskCapacity,
-        storagePath: directory.path,
-        userAgent: _userAgent,
-      );
-      return _clients[directoryName] = CronetClient.fromCronetEngine(engine, closeEngine: true);
-    }
-
-    final config = URLSessionConfiguration.defaultSessionConfiguration()
-      ..httpMaximumConnectionsPerHost = maxConnections
-      ..cache = URLCache.withCapacity(
-        diskCapacity: diskCapacity,
-        memoryCapacity: memoryCapacity,
-        directory: directory.uri,
-      )
-      ..httpAdditionalHeaders = {'User-Agent': _userAgent};
-    return _clients[directoryName] = CupertinoClient.fromSessionConfiguration(config);
-  }
+  /// Returns a shared HTTP client that uses native SSL configuration.
+  ///
+  /// On iOS: Uses SharedURLSessionManager's URLSession.
+  /// On Android: Uses SharedHttpClientManager's OkHttpClient.
+  ///
+  /// Must call [init] before using this method.
+  static http.Client get client => _client!;
 }

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

@@ -6,6 +6,7 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:logging/logging.dart';
@@ -32,15 +33,11 @@ class SyncApiRepository {
     http.Client? httpClient,
   }) async {
     final stopwatch = Stopwatch()..start();
-    final client = httpClient ?? http.Client();
+    final client = httpClient ?? NetworkRepository.client;
     final endpoint = "${_api.apiClient.basePath}/sync/stream";
 
     final headers = {'Content-Type': 'application/json', 'Accept': 'application/jsonlines+json'};
 
-    final headerParams = <String, String>{};
-    await _api.applyToParams([], headerParams);
-    headers.addAll(headerParams);
-
     final shouldReset = Store.get(StoreKey.shouldResetSync, false);
     final request = http.Request('POST', Uri.parse(endpoint));
     request.headers.addAll(headers);
@@ -119,8 +116,6 @@ class SyncApiRepository {
       }
     } catch (error, stack) {
       return Future.error(error, stack);
-    } finally {
-      client.close();
     }
     stopwatch.stop();
     _logger.info("Remote Sync completed in ${stopwatch.elapsed.inMilliseconds}ms");

mobile/lib/main.dart

@@ -40,7 +40,6 @@ import 'package:immich_mobile/theme/theme_data.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/cache/widgets_binding.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
-import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
 import 'package:immich_mobile/wm_executor.dart';
@@ -60,7 +59,6 @@ void main() async {
     // Warm-up isolate pool for worker manager
     await workerManagerPatch.init(dynamicSpawning: true, isolatesCount: max(Platform.numberOfProcessors - 1, 5));
     await migrateDatabaseIfNeeded(isar, drift);
-    HttpSSLOptions.apply();
 
     runApp(
       ProviderScope(
@@ -246,7 +244,7 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
   @override
   void reassemble() {
     if (kDebugMode) {
-      NetworkRepository.reset();
+      NetworkRepository.init();
     }
     super.reassemble();
   }

mobile/lib/models/backup/backup_state.model.dart

@@ -1,6 +1,5 @@
 // ignore_for_file: public_member_api_docs, sort_constructors_first
 
-import 'package:cancellation_token_http/http.dart';
 import 'package:collection/collection.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 
@@ -21,7 +20,6 @@ class BackUpState {
   final DateTime progressInFileSpeedUpdateTime;
   final int progressInFileSpeedUpdateSentBytes;
   final double iCloudDownloadProgress;
-  final CancellationToken cancelToken;
   final ServerDiskInfo serverInfo;
   final bool autoBackup;
   final bool backgroundBackup;
@@ -53,7 +51,6 @@ class BackUpState {
     required this.progressInFileSpeedUpdateTime,
     required this.progressInFileSpeedUpdateSentBytes,
     required this.iCloudDownloadProgress,
-    required this.cancelToken,
     required this.serverInfo,
     required this.autoBackup,
     required this.backgroundBackup,
@@ -78,7 +75,6 @@ class BackUpState {
     DateTime? progressInFileSpeedUpdateTime,
     int? progressInFileSpeedUpdateSentBytes,
     double? iCloudDownloadProgress,
-    CancellationToken? cancelToken,
     ServerDiskInfo? serverInfo,
     bool? autoBackup,
     bool? backgroundBackup,
@@ -102,7 +98,6 @@ class BackUpState {
       progressInFileSpeedUpdateTime: progressInFileSpeedUpdateTime ?? this.progressInFileSpeedUpdateTime,
       progressInFileSpeedUpdateSentBytes: progressInFileSpeedUpdateSentBytes ?? this.progressInFileSpeedUpdateSentBytes,
       iCloudDownloadProgress: iCloudDownloadProgress ?? this.iCloudDownloadProgress,
-      cancelToken: cancelToken ?? this.cancelToken,
       serverInfo: serverInfo ?? this.serverInfo,
       autoBackup: autoBackup ?? this.autoBackup,
       backgroundBackup: backgroundBackup ?? this.backgroundBackup,
@@ -120,7 +115,7 @@ class BackUpState {
 
   @override
   String toString() {
-    return 'BackUpState(backupProgress: $backupProgress, allAssetsInDatabase: $allAssetsInDatabase, progressInPercentage: $progressInPercentage, progressInFileSize: $progressInFileSize, progressInFileSpeed: $progressInFileSpeed, progressInFileSpeeds: $progressInFileSpeeds, progressInFileSpeedUpdateTime: $progressInFileSpeedUpdateTime, progressInFileSpeedUpdateSentBytes: $progressInFileSpeedUpdateSentBytes, iCloudDownloadProgress: $iCloudDownloadProgress, cancelToken: $cancelToken, serverInfo: $serverInfo, autoBackup: $autoBackup, backgroundBackup: $backgroundBackup, backupRequireWifi: $backupRequireWifi, backupRequireCharging: $backupRequireCharging, backupTriggerDelay: $backupTriggerDelay, availableAlbums: $availableAlbums, selectedBackupAlbums: $selectedBackupAlbums, excludedBackupAlbums: $excludedBackupAlbums, allUniqueAssets: $allUniqueAssets, selectedAlbumsBackupAssetsIds: $selectedAlbumsBackupAssetsIds, currentUploadAsset: $currentUploadAsset)';
+    return 'BackUpState(backupProgress: $backupProgress, allAssetsInDatabase: $allAssetsInDatabase, progressInPercentage: $progressInPercentage, progressInFileSize: $progressInFileSize, progressInFileSpeed: $progressInFileSpeed, progressInFileSpeeds: $progressInFileSpeeds, progressInFileSpeedUpdateTime: $progressInFileSpeedUpdateTime, progressInFileSpeedUpdateSentBytes: $progressInFileSpeedUpdateSentBytes, iCloudDownloadProgress: $iCloudDownloadProgress, serverInfo: $serverInfo, autoBackup: $autoBackup, backgroundBackup: $backgroundBackup, backupRequireWifi: $backupRequireWifi, backupRequireCharging: $backupRequireCharging, backupTriggerDelay: $backupTriggerDelay, availableAlbums: $availableAlbums, selectedBackupAlbums: $selectedBackupAlbums, excludedBackupAlbums: $excludedBackupAlbums, allUniqueAssets: $allUniqueAssets, selectedAlbumsBackupAssetsIds: $selectedAlbumsBackupAssetsIds, currentUploadAsset: $currentUploadAsset)';
   }
 
   @override
@@ -137,7 +132,6 @@ class BackUpState {
         other.progressInFileSpeedUpdateTime == progressInFileSpeedUpdateTime &&
         other.progressInFileSpeedUpdateSentBytes == progressInFileSpeedUpdateSentBytes &&
         other.iCloudDownloadProgress == iCloudDownloadProgress &&
-        other.cancelToken == cancelToken &&
         other.serverInfo == serverInfo &&
         other.autoBackup == autoBackup &&
         other.backgroundBackup == backgroundBackup &&
@@ -163,7 +157,6 @@ class BackUpState {
         progressInFileSpeedUpdateTime.hashCode ^
         progressInFileSpeedUpdateSentBytes.hashCode ^
         iCloudDownloadProgress.hashCode ^
-        cancelToken.hashCode ^
         serverInfo.hashCode ^
         autoBackup.hashCode ^
         backgroundBackup.hashCode ^

mobile/lib/models/backup/manual_upload_state.model.dart

@@ -1,11 +1,8 @@
-import 'package:cancellation_token_http/http.dart';
 import 'package:collection/collection.dart';
 
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
 
 class ManualUploadState {
-  final CancellationToken cancelToken;
-
   // Current Backup Asset
   final CurrentUploadAsset currentUploadAsset;
   final int currentAssetIndex;
@@ -29,7 +26,6 @@ class ManualUploadState {
     required this.progressInFileSpeeds,
     required this.progressInFileSpeedUpdateTime,
     required this.progressInFileSpeedUpdateSentBytes,
-    required this.cancelToken,
     required this.currentUploadAsset,
     required this.totalAssetsToUpload,
     required this.currentAssetIndex,
@@ -44,7 +40,6 @@ class ManualUploadState {
     List<double>? progressInFileSpeeds,
     DateTime? progressInFileSpeedUpdateTime,
     int? progressInFileSpeedUpdateSentBytes,
-    CancellationToken? cancelToken,
     CurrentUploadAsset? currentUploadAsset,
     int? totalAssetsToUpload,
     int? successfulUploads,
@@ -58,7 +53,6 @@ class ManualUploadState {
       progressInFileSpeeds: progressInFileSpeeds ?? this.progressInFileSpeeds,
       progressInFileSpeedUpdateTime: progressInFileSpeedUpdateTime ?? this.progressInFileSpeedUpdateTime,
       progressInFileSpeedUpdateSentBytes: progressInFileSpeedUpdateSentBytes ?? this.progressInFileSpeedUpdateSentBytes,
-      cancelToken: cancelToken ?? this.cancelToken,
       currentUploadAsset: currentUploadAsset ?? this.currentUploadAsset,
       totalAssetsToUpload: totalAssetsToUpload ?? this.totalAssetsToUpload,
       currentAssetIndex: currentAssetIndex ?? this.currentAssetIndex,
@@ -69,7 +63,7 @@ class ManualUploadState {
 
   @override
   String toString() {
-    return 'ManualUploadState(progressInPercentage: $progressInPercentage, progressInFileSize: $progressInFileSize, progressInFileSpeed: $progressInFileSpeed, progressInFileSpeeds: $progressInFileSpeeds, progressInFileSpeedUpdateTime: $progressInFileSpeedUpdateTime, progressInFileSpeedUpdateSentBytes: $progressInFileSpeedUpdateSentBytes, cancelToken: $cancelToken, currentUploadAsset: $currentUploadAsset, totalAssetsToUpload: $totalAssetsToUpload, successfulUploads: $successfulUploads, currentAssetIndex: $currentAssetIndex, showDetailedNotification: $showDetailedNotification)';
+    return 'ManualUploadState(progressInPercentage: $progressInPercentage, progressInFileSize: $progressInFileSize, progressInFileSpeed: $progressInFileSpeed, progressInFileSpeeds: $progressInFileSpeeds, progressInFileSpeedUpdateTime: $progressInFileSpeedUpdateTime, progressInFileSpeedUpdateSentBytes: $progressInFileSpeedUpdateSentBytes, currentUploadAsset: $currentUploadAsset, totalAssetsToUpload: $totalAssetsToUpload, successfulUploads: $successfulUploads, currentAssetIndex: $currentAssetIndex, showDetailedNotification: $showDetailedNotification)';
   }
 
   @override
@@ -84,7 +78,6 @@ class ManualUploadState {
         collectionEquals(other.progressInFileSpeeds, progressInFileSpeeds) &&
         other.progressInFileSpeedUpdateTime == progressInFileSpeedUpdateTime &&
         other.progressInFileSpeedUpdateSentBytes == progressInFileSpeedUpdateSentBytes &&
-        other.cancelToken == cancelToken &&
         other.currentUploadAsset == currentUploadAsset &&
         other.totalAssetsToUpload == totalAssetsToUpload &&
         other.currentAssetIndex == currentAssetIndex &&
@@ -100,7 +93,6 @@ class ManualUploadState {
         progressInFileSpeeds.hashCode ^
         progressInFileSpeedUpdateTime.hashCode ^
         progressInFileSpeedUpdateSentBytes.hashCode ^
-        cancelToken.hashCode ^
         currentUploadAsset.hashCode ^
         totalAssetsToUpload.hashCode ^
         currentAssetIndex.hashCode ^

mobile/lib/pages/backup/drift_backup.page.dart

@@ -96,10 +96,6 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
       await backupNotifier.startForegroundBackup(currentUser.id);
     }
 
-    Future<void> stopBackup() async {
-      await backupNotifier.stopForegroundBackup();
-    }
-
     return Scaffold(
       appBar: AppBar(
         elevation: 0,
@@ -136,9 +132,9 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
                   const Divider(),
                   BackupToggleButton(
                     onStart: () async => await startBackup(),
-                    onStop: () async {
+                    onStop: () {
                       syncSuccess = null;
-                      await stopBackup();
+                      backupNotifier.stopForegroundBackup();
                     },
                   ),
                   switch (error) {

mobile/lib/pages/backup/drift_backup_album_selection.page.dart

@@ -112,16 +112,15 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
             // Waits for hashing to be cancelled before starting a new one
             unawaited(nativeSync.cancelHashing().whenComplete(() => backgroundSync.hashAssets()));
             if (isBackupEnabled) {
+              backupNotifier.stopForegroundBackup();
               unawaited(
-                backupNotifier.stopForegroundBackup().whenComplete(
-                  () => backgroundSync.syncRemote().then((success) {
-                    if (success) {
-                      return backupNotifier.startForegroundBackup(user.id);
-                    } else {
-                      Logger('DriftBackupAlbumSelectionPage').warning('Background sync failed, not starting backup');
-                    }
-                  }),
-                ),
+                backgroundSync.syncRemote().then((success) {
+                  if (success) {
+                    return backupNotifier.startForegroundBackup(user.id);
+                  } else {
+                    Logger('DriftBackupAlbumSelectionPage').warning('Background sync failed, not starting backup');
+                  }
+                }),
               );
             }
           }

mobile/lib/pages/backup/drift_backup_options.page.dart

@@ -59,16 +59,15 @@ class DriftBackupOptionsPage extends ConsumerWidget {
 
           final backupNotifier = ref.read(driftBackupProvider.notifier);
           final backgroundSync = ref.read(backgroundSyncProvider);
+          backupNotifier.stopForegroundBackup();
           unawaited(
-            backupNotifier.stopForegroundBackup().whenComplete(
-              () => backgroundSync.syncRemote().then((success) {
-                if (success) {
-                  return backupNotifier.startForegroundBackup(currentUser.id);
-                } else {
-                  Logger('DriftBackupOptionsPage').warning('Background sync failed, not starting backup');
-                }
-              }),
-            ),
+            backgroundSync.syncRemote().then((success) {
+              if (success) {
+                return backupNotifier.startForegroundBackup(currentUser.id);
+              } else {
+                Logger('DriftBackupOptionsPage').warning('Background sync failed, not starting backup');
+              }
+            }),
           );
         }
       },

mobile/lib/pages/common/headers_settings.page.dart

@@ -8,6 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/providers/api.provider.dart';
 
 class SettingsHeader {
   String key = "";
@@ -20,7 +21,6 @@ class HeaderSettingsPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    // final apiService = ref.watch(apiServiceProvider);
     final headers = useState<List<SettingsHeader>>([]);
     final setInitialHeaders = useState(false);
 
@@ -75,7 +75,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
         ],
       ),
       body: PopScope(
-        onPopInvokedWithResult: (didPop, _) => saveHeaders(headers.value),
+        onPopInvokedWithResult: (didPop, _) => saveHeaders(ref, headers.value),
         child: ListView.separated(
           padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 16.0),
           itemCount: list.length,
@@ -87,7 +87,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
     );
   }
 
-  saveHeaders(List<SettingsHeader> headers) {
+  saveHeaders(WidgetRef ref, List<SettingsHeader> headers) async {
     final headersMap = {};
     for (var header in headers) {
       final key = header.key.trim();
@@ -98,7 +98,8 @@ class HeaderSettingsPage extends HookConsumerWidget {
     }
 
     var encoded = jsonEncode(headersMap);
-    Store.put(StoreKey.customHeaders, encoded);
+    await Store.put(StoreKey.customHeaders, encoded);
+    await ref.read(apiServiceProvider).updateHeaders();
   }
 }
 

mobile/lib/platform/network_api.g.dart

@@ -179,7 +179,7 @@ class NetworkApi {
     }
   }
 
-  Future<ClientCertData> selectCertificate(ClientCertPrompt promptText) async {
+  Future<void> selectCertificate(ClientCertPrompt promptText) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NetworkApi.selectCertificate$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
@@ -197,13 +197,8 @@ class NetworkApi {
         message: pigeonVar_replyList[1] as String?,
         details: pigeonVar_replyList[2],
       );
-    } else if (pigeonVar_replyList[0] == null) {
-      throw PlatformException(
-        code: 'null-error',
-        message: 'Host platform returned null value for non-null return value.',
-      );
     } else {
-      return (pigeonVar_replyList[0] as ClientCertData?)!;
+      return;
     }
   }
 
@@ -229,4 +224,83 @@ class NetworkApi {
       return;
     }
   }
+
+  Future<bool> hasCertificate() async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NetworkApi.hasCertificate$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as bool?)!;
+    }
+  }
+
+  Future<int> getClientPointer() async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NetworkApi.getClientPointer$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as int?)!;
+    }
+  }
+
+  Future<void> setRequestHeaders(Map<String, String> headers, List<String> serverUrls) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NetworkApi.setRequestHeaders$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[headers, serverUrls]);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return;
+    }
+  }
 }

mobile/lib/platform/remote_image_api.g.dart

@@ -49,12 +49,7 @@ class RemoteImageApi {
 
   final String pigeonVar_messageChannelSuffix;
 
-  Future<Map<String, int>?> requestImage(
-    String url, {
-    required Map<String, String> headers,
-    required int requestId,
-    required bool preferEncoded,
-  }) async {
+  Future<Map<String, int>?> requestImage(String url, {required int requestId, required bool preferEncoded}) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
@@ -62,12 +57,7 @@ class RemoteImageApi {
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[
-      url,
-      headers,
-      requestId,
-      preferEncoded,
-    ]);
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[url, requestId, preferEncoded]);
     final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);

mobile/lib/presentation/pages/editing/drift_edit.page.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
-import 'package:cancellation_token_http/http.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -62,7 +61,7 @@ class DriftEditImagePage extends ConsumerWidget {
         return;
       }
 
-      await ref.read(foregroundUploadServiceProvider).uploadManual([localAsset], CancellationToken());
+      await ref.read(foregroundUploadServiceProvider).uploadManual([localAsset]);
     } catch (e) {
       ImmichToast.show(
         durationInSecond: 6,

mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart

@@ -101,7 +101,8 @@ class _UploadProgressDialog extends ConsumerWidget {
       actions: [
         ImmichTextButton(
           onPressed: () {
-            ref.read(manualUploadCancelTokenProvider)?.cancel();
+            ref.read(manualUploadCancelTokenProvider)?.complete();
+            ref.read(manualUploadCancelTokenProvider.notifier).state = null;
             Navigator.of(context).pop();
           },
           labelText: 'cancel'.t(context: context),

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -6,7 +6,6 @@ import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
-import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:openapi/api.dart';
 
@@ -37,7 +36,7 @@ class RemoteImageProvider extends CancellableImageProvider<RemoteImageProvider>
   }
 
   Stream<ImageInfo> _codec(RemoteImageProvider key, ImageDecoderCallback decode) {
-    final request = this.request = RemoteImageRequest(uri: key.url, headers: ApiService.getRequestHeaders());
+    final request = this.request = RemoteImageRequest(uri: key.url);
     return loadRequest(request, decode);
   }
 
@@ -88,10 +87,8 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
       return;
     }
 
-    final headers = ApiService.getRequestHeaders();
     final previewRequest = request = RemoteImageRequest(
       uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),
-      headers: headers,
     );
     final loadOriginal = assetType == AssetType.image && AppSetting.get(Setting.loadOriginal);
     yield* loadRequest(previewRequest, decode, evictOnError: !loadOriginal);
@@ -105,7 +102,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
       return;
     }
 
-    final originalRequest = request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);
+    final originalRequest = request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId));
     yield* loadRequest(originalRequest, decode);
   }
 

mobile/lib/providers/app_life_cycle.provider.dart

@@ -232,7 +232,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     }
   }
 
-  Future<void> _performPause() async {
+  Future<void> _performPause() {
     if (_ref.read(authProvider).isAuthenticated) {
       if (!Store.isBetaTimelineEnabled) {
         // Do not cancel backup if manual upload is in progress
@@ -240,15 +240,13 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
           _ref.read(backupProvider.notifier).cancelBackup();
         }
       } else {
-        await _ref.read(driftBackupProvider.notifier).stopForegroundBackup();
+        _ref.read(driftBackupProvider.notifier).stopForegroundBackup();
       }
 
       _ref.read(websocketProvider.notifier).disconnect();
     }
 
-    try {
-      await LogService.I.flush();
-    } catch (_) {}
+    return LogService.I.flush().catchError((_) {});
   }
 
   Future<void> handleAppDetached() async {

mobile/lib/providers/auth.provider.dart

@@ -124,6 +124,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
 
   Future<bool> saveAuthInfo({required String accessToken}) async {
     await _apiService.setAccessToken(accessToken);
+    await _apiService.updateHeaders();
 
     final serverEndpoint = Store.get(StoreKey.serverEndpoint);
     final customHeaders = Store.tryGet(StoreKey.customHeaders);

mobile/lib/providers/backup/asset_upload_progress.provider.dart

@@ -1,4 +1,5 @@
-import 'package:cancellation_token_http/http.dart';
+import 'dart:async';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 /// Tracks per-asset upload progress.
@@ -30,4 +31,4 @@ final assetUploadProgressProvider = NotifierProvider<AssetUploadProgressNotifier
   AssetUploadProgressNotifier.new,
 );
 
-final manualUploadCancelTokenProvider = StateProvider<CancellationToken?>((ref) => null);
+final manualUploadCancelTokenProvider = StateProvider<Completer<void>?>((ref) => null);

mobile/lib/providers/backup/backup.provider.dart

@@ -1,6 +1,6 @@
+import 'dart:async';
 import 'dart:io';
 
-import 'package:cancellation_token_http/http.dart';
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
@@ -68,7 +68,6 @@ class BackupNotifier extends StateNotifier<BackUpState> {
           progressInFileSpeeds: const [],
           progressInFileSpeedUpdateTime: DateTime.now(),
           progressInFileSpeedUpdateSentBytes: 0,
-          cancelToken: CancellationToken(),
           autoBackup: Store.get(StoreKey.autoBackup, false),
           backgroundBackup: Store.get(StoreKey.backgroundBackup, false),
           backupRequireWifi: Store.get(StoreKey.backupRequireWifi, true),
@@ -102,6 +101,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   final FileMediaRepository _fileMediaRepository;
   final BackupAlbumService _backupAlbumService;
   final Ref ref;
+  Completer<void>? _cancelToken;
 
   ///
   /// UI INTERACTION
@@ -454,7 +454,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       }
 
       // Perform Backup
-      state = state.copyWith(cancelToken: CancellationToken());
+      _cancelToken?.complete();
+      _cancelToken = Completer<void>();
 
       final pmProgressHandler = Platform.isIOS ? PMProgressHandler() : null;
 
@@ -465,7 +466,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
 
       await _backupService.backupAsset(
         assetsWillBeBackup,
-        state.cancelToken,
+        _cancelToken!,
         pmProgressHandler: pmProgressHandler,
         onSuccess: _onAssetUploaded,
         onProgress: _onUploadProgress,
@@ -494,7 +495,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     if (state.backupProgress != BackUpProgressEnum.inProgress) {
       notifyBackgroundServiceCanRun();
     }
-    state.cancelToken.cancel();
+    _cancelToken?.complete();
+    _cancelToken = null;
     state = state.copyWith(
       backupProgress: BackUpProgressEnum.idle,
       progressInPercentage: 0.0,

mobile/lib/providers/backup/drift_backup.provider.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:cancellation_token_http/http.dart';
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logging/logging.dart';
@@ -109,7 +108,6 @@ class DriftBackupState {
   final BackupError error;
 
   final Map<String, DriftUploadStatus> uploadItems;
-  final CancellationToken? cancelToken;
 
   final Map<String, double> iCloudDownloadProgress;
 
@@ -121,7 +119,6 @@ class DriftBackupState {
     required this.isSyncing,
     this.error = BackupError.none,
     required this.uploadItems,
-    this.cancelToken,
     this.iCloudDownloadProgress = const {},
   });
 
@@ -133,7 +130,6 @@ class DriftBackupState {
     bool? isSyncing,
     BackupError? error,
     Map<String, DriftUploadStatus>? uploadItems,
-    CancellationToken? cancelToken,
     Map<String, double>? iCloudDownloadProgress,
   }) {
     return DriftBackupState(
@@ -144,7 +140,6 @@ class DriftBackupState {
       isSyncing: isSyncing ?? this.isSyncing,
       error: error ?? this.error,
       uploadItems: uploadItems ?? this.uploadItems,
-      cancelToken: cancelToken ?? this.cancelToken,
       iCloudDownloadProgress: iCloudDownloadProgress ?? this.iCloudDownloadProgress,
     );
   }
@@ -153,7 +148,7 @@ class DriftBackupState {
 
   @override
   String toString() {
-    return 'DriftBackupState(totalCount: $totalCount, backupCount: $backupCount, remainderCount: $remainderCount, processingCount: $processingCount, isSyncing: $isSyncing, error: $error, uploadItems: $uploadItems, cancelToken: $cancelToken, iCloudDownloadProgress: $iCloudDownloadProgress)';
+    return 'DriftBackupState(totalCount: $totalCount, backupCount: $backupCount, remainderCount: $remainderCount, processingCount: $processingCount, isSyncing: $isSyncing, error: $error, uploadItems: $uploadItems, iCloudDownloadProgress: $iCloudDownloadProgress)';
   }
 
   @override
@@ -168,8 +163,7 @@ class DriftBackupState {
         other.isSyncing == isSyncing &&
         other.error == error &&
         mapEquals(other.iCloudDownloadProgress, iCloudDownloadProgress) &&
-        mapEquals(other.uploadItems, uploadItems) &&
-        other.cancelToken == cancelToken;
+        mapEquals(other.uploadItems, uploadItems);
   }
 
   @override
@@ -181,7 +175,6 @@ class DriftBackupState {
         isSyncing.hashCode ^
         error.hashCode ^
         uploadItems.hashCode ^
-        cancelToken.hashCode ^
         iCloudDownloadProgress.hashCode;
   }
 }
@@ -211,6 +204,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
   final ForegroundUploadService _foregroundUploadService;
   final BackgroundUploadService _backgroundUploadService;
   final UploadSpeedManager _uploadSpeedManager;
+  Completer<void>? _cancelToken;
 
   final _logger = Logger("DriftBackupNotifier");
 
@@ -246,7 +240,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
     );
   }
 
-  void updateError(BackupError error) async {
+  void updateError(BackupError error) {
     if (!mounted) {
       _logger.warning("Skip updateError: notifier disposed");
       return;
@@ -254,24 +248,23 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
     state = state.copyWith(error: error);
   }
 
-  void updateSyncing(bool isSyncing) async {
+  void updateSyncing(bool isSyncing) {
     state = state.copyWith(isSyncing: isSyncing);
   }
 
-  Future<void> startForegroundBackup(String userId) async {
+  Future<void> startForegroundBackup(String userId) {
     // Cancel any existing backup before starting a new one
-    if (state.cancelToken != null) {
-      await stopForegroundBackup();
+    if (_cancelToken != null) {
+      stopForegroundBackup();
     }
 
     state = state.copyWith(error: BackupError.none);
 
-    final cancelToken = CancellationToken();
-    state = state.copyWith(cancelToken: cancelToken);
+    _cancelToken = Completer<void>();
 
     return _foregroundUploadService.uploadCandidates(
       userId,
-      cancelToken,
+      _cancelToken!,
       callbacks: UploadCallbacks(
         onProgress: _handleForegroundBackupProgress,
         onSuccess: _handleForegroundBackupSuccess,
@@ -281,10 +274,11 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
     );
   }
 
-  Future<void> stopForegroundBackup() async {
-    state.cancelToken?.cancel();
+  void stopForegroundBackup() {
+    _cancelToken?.complete();
+    _cancelToken = null;
     _uploadSpeedManager.clear();
-    state = state.copyWith(cancelToken: null, uploadItems: {}, iCloudDownloadProgress: {});
+    state = state.copyWith(uploadItems: {}, iCloudDownloadProgress: {});
   }
 
   void _handleICloudProgress(String localAssetId, double progress) {
@@ -300,7 +294,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
   }
 
   void _handleForegroundBackupProgress(String localAssetId, String filename, int bytes, int totalBytes) {
-    if (state.cancelToken == null) {
+    if (_cancelToken == null) {
       return;
     }
 
@@ -399,7 +393,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
   }
 }
 
-final driftBackupCandidateProvider = FutureProvider.autoDispose<List<LocalAsset>>((ref) async {
+final driftBackupCandidateProvider = FutureProvider.autoDispose<List<LocalAsset>>((ref) {
   final user = ref.watch(currentUserProvider);
   if (user == null) {
     return [];

mobile/lib/providers/backup/manual_upload.provider.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:cancellation_token_http/http.dart';
 import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/widgets.dart';
@@ -50,6 +49,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
   final BackupService _backupService;
   final BackupAlbumService _backupAlbumService;
   final Ref ref;
+  Completer<void>? _cancelToken;
 
   ManualUploadNotifier(
     this._localNotificationService,
@@ -65,7 +65,6 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
           progressInFileSpeeds: const [],
           progressInFileSpeedUpdateTime: DateTime.now(),
           progressInFileSpeedUpdateSentBytes: 0,
-          cancelToken: CancellationToken(),
           currentUploadAsset: CurrentUploadAsset(
             id: '...',
             fileCreatedAt: DateTime.parse('2020-10-04'),
@@ -236,7 +235,6 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
             fileName: '...',
             fileType: '...',
           ),
-          cancelToken: CancellationToken(),
         );
         // Reset Error List
         ref.watch(errorBackupListProvider.notifier).empty();
@@ -252,11 +250,13 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
         state = state.copyWith(showDetailedNotification: showDetailedNotification);
         final pmProgressHandler = Platform.isIOS ? PMProgressHandler() : null;
 
+        _cancelToken?.complete();
+        _cancelToken = Completer<void>();
         final bool ok = await ref
             .read(backupServiceProvider)
             .backupAsset(
               uploadAssets,
-              state.cancelToken,
+              _cancelToken!,
               pmProgressHandler: pmProgressHandler,
               onSuccess: _onAssetUploaded,
               onProgress: _onProgress,
@@ -273,14 +273,14 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
         );
 
         // User cancelled upload
-        if (!ok && state.cancelToken.isCancelled) {
+        if (!ok && _cancelToken == null) {
           await _localNotificationService.showOrUpdateManualUploadStatus(
             "backup_manual_title".tr(),
             "backup_manual_cancelled".tr(),
             presentBanner: true,
           );
           hasErrors = true;
-        } else if (state.successfulUploads == 0 || (!ok && !state.cancelToken.isCancelled)) {
+        } else if (state.successfulUploads == 0 || (!ok && _cancelToken != null)) {
           await _localNotificationService.showOrUpdateManualUploadStatus(
             "backup_manual_title".tr(),
             "failed".tr(),
@@ -324,7 +324,8 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
         _backupProvider.backupProgress != BackUpProgressEnum.manualInProgress) {
       _backupProvider.notifyBackgroundServiceCanRun();
     }
-    state.cancelToken.cancel();
+    _cancelToken?.complete();
+    _cancelToken = null;
     if (_backupProvider.backupProgress != BackUpProgressEnum.manualInProgress) {
       _backupProvider.updateBackupProgress(BackUpProgressEnum.idle);
     }

mobile/lib/providers/image/cache/image_loader.dart

@@ -1,40 +0,0 @@
-import 'dart:async';
-import 'dart:ui' as ui;
-
-import 'package:flutter/material.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:immich_mobile/providers/image/exceptions/image_loading_exception.dart';
-import 'package:immich_mobile/services/api.service.dart';
-
-/// Loads the codec from the URI and sends the events to the [chunkEvents] stream
-///
-/// Credit to [flutter_cached_network_image](https://github.com/Baseflow/flutter_cached_network_image/blob/develop/cached_network_image/lib/src/image_provider/_image_loader.dart)
-/// for this wonderful implementation of their image loader
-class ImageLoader {
-  static Future<ui.Codec> loadImageFromCache(
-    String uri, {
-    required CacheManager cache,
-    required ImageDecoderCallback decode,
-    StreamController<ImageChunkEvent>? chunkEvents,
-  }) async {
-    final headers = ApiService.getRequestHeaders();
-
-    final stream = cache.getFileStream(uri, withProgress: chunkEvents != null, headers: headers);
-
-    await for (final result in stream) {
-      if (result is DownloadProgress) {
-        // We are downloading the file, so update the [chunkEvents]
-        chunkEvents?.add(
-          ImageChunkEvent(cumulativeBytesLoaded: result.downloaded, expectedTotalBytes: result.totalSize),
-        );
-      } else if (result is FileInfo) {
-        // We have the file
-        final buffer = await ui.ImmutableBuffer.fromFilePath(result.file.path);
-        return decode(buffer);
-      }
-    }
-
-    // If we get here, the image failed to load from the cache stream
-    throw const ImageLoadingException('Could not load image from stream');
-  }
-}

mobile/lib/providers/image/cache/remote_image_cache_manager.dart

@@ -1,25 +0,0 @@
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-
-class RemoteImageCacheManager extends CacheManager {
-  static const key = 'remoteImageCacheKey';
-  static final RemoteImageCacheManager _instance = RemoteImageCacheManager._();
-  static final _config = Config(key, maxNrOfCacheObjects: 500, stalePeriod: const Duration(days: 30));
-
-  factory RemoteImageCacheManager() {
-    return _instance;
-  }
-
-  RemoteImageCacheManager._() : super(_config);
-}
-
-class RemoteThumbnailCacheManager extends CacheManager {
-  static const key = 'remoteThumbnailCacheKey';
-  static final RemoteThumbnailCacheManager _instance = RemoteThumbnailCacheManager._();
-  static final _config = Config(key, maxNrOfCacheObjects: 5000, stalePeriod: const Duration(days: 30));
-
-  factory RemoteThumbnailCacheManager() {
-    return _instance;
-  }
-
-  RemoteThumbnailCacheManager._() : super(_config);
-}

mobile/lib/providers/image/cache/thumbnail_image_cache_manager.dart

@@ -1,13 +0,0 @@
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-
-/// The cache manager for thumbnail images [ImmichRemoteThumbnailProvider]
-class ThumbnailImageCacheManager extends CacheManager {
-  static const key = 'thumbnailImageCacheKey';
-  static final ThumbnailImageCacheManager _instance = ThumbnailImageCacheManager._();
-
-  factory ThumbnailImageCacheManager() {
-    return _instance;
-  }
-
-  ThumbnailImageCacheManager._() : super(Config(key, maxNrOfCacheObjects: 5000, stalePeriod: const Duration(days: 30)));
-}

mobile/lib/providers/infrastructure/action.provider.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:background_downloader/background_downloader.dart';
-import 'package:cancellation_token_http/http.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -455,7 +454,7 @@ class ActionNotifier extends Notifier<void> {
     final assetsToUpload = assets ?? _getAssets(source).whereType<LocalAsset>().toList();
 
     final progressNotifier = ref.read(assetUploadProgressProvider.notifier);
-    final cancelToken = CancellationToken();
+    final cancelToken = Completer<void>();
     ref.read(manualUploadCancelTokenProvider.notifier).state = cancelToken;
 
     // Initialize progress for all assets
@@ -466,7 +465,7 @@ class ActionNotifier extends Notifier<void> {
     try {
       await _foregroundUploadService.uploadManual(
         assetsToUpload,
-        cancelToken,
+        cancelToken: cancelToken,
         callbacks: UploadCallbacks(
           onProgress: (localAssetId, filename, bytes, totalBytes) {
             final progress = totalBytes > 0 ? bytes / totalBytes : 0.0;

mobile/lib/providers/websocket.provider.dart

@@ -1,18 +1,17 @@
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/sync.service.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -99,11 +98,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     if (authenticationState.isAuthenticated) {
       try {
         final endpoint = Uri.parse(Store.get(StoreKey.serverEndpoint));
-        final headers = ApiService.getRequestHeaders();
-        if (endpoint.userInfo.isNotEmpty) {
-          headers["Authorization"] = "Basic ${base64.encode(utf8.encode(endpoint.userInfo))}";
-        }
-
         dPrint(() => "Attempting to connect to websocket");
         // Configure socket transports must be specified
         Socket socket = io(
@@ -111,11 +105,11 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
           OptionBuilder()
               .setPath("${endpoint.path}/socket.io")
               .setTransports(['websocket'])
+              .setWebSocketConnector(NetworkRepository.createWebSocket)
               .enableReconnection()
               .enableForceNew()
               .enableForceNewConnection()
               .enableAutoConnect()
-              .setExtraHeaders(headers)
               .build(),
         );
 
@@ -160,11 +154,8 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 
     _batchedAssetUploadReady.clear();
 
-    var socket = state.socket?.disconnect();
-
-    if (socket?.disconnected == true) {
-      state = WebsocketState(isConnected: false, socket: null, pendingChanges: state.pendingChanges);
-    }
+    state.socket?.dispose();
+    state = WebsocketState(isConnected: false, socket: null, pendingChanges: state.pendingChanges);
   }
 
   void stopListenToEvent(String eventName) {

mobile/lib/repositories/upload.repository.dart

@@ -3,21 +3,15 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:background_downloader/background_downloader.dart';
-import 'package:cancellation_token_http/http.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:logging/logging.dart';
+import 'package:http/http.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 
-class UploadTaskWithFile {
-  final File file;
-  final UploadTask task;
-
-  const UploadTaskWithFile({required this.file, required this.task});
-}
-
 final uploadRepositoryProvider = Provider((ref) => UploadRepository());
 
 class UploadRepository {
@@ -97,26 +91,27 @@ class UploadRepository {
   Future<UploadResult> uploadFile({
     required File file,
     required String originalFileName,
-    required Map<String, String> headers,
     required Map<String, String> fields,
-    required Client httpClient,
-    required CancellationToken cancelToken,
-    required void Function(int bytes, int totalBytes) onProgress,
+    required Completer<void>? cancelToken,
+    void Function(int bytes, int totalBytes)? onProgress,
     required String logContext,
   }) async {
     final String savedEndpoint = Store.get(StoreKey.serverEndpoint);
+    final baseRequest = ProgressMultipartRequest(
+      'POST',
+      Uri.parse('$savedEndpoint/assets'),
+      abortTrigger: cancelToken?.future,
+      onProgress: onProgress,
+    );
 
     try {
       final fileStream = file.openRead();
       final assetRawUploadData = MultipartFile("assetData", fileStream, file.lengthSync(), filename: originalFileName);
 
-      final baseRequest = _CustomMultipartRequest('POST', Uri.parse('$savedEndpoint/assets'), onProgress: onProgress);
-
-      baseRequest.headers.addAll(headers);
       baseRequest.fields.addAll(fields);
       baseRequest.files.add(assetRawUploadData);
 
-      final response = await httpClient.send(baseRequest, cancellationToken: cancelToken);
+      final response = await NetworkRepository.client.send(baseRequest);
       final responseBodyString = await response.stream.bytesToString();
 
       if (![200, 201].contains(response.statusCode)) {
@@ -145,7 +140,7 @@ class UploadRepository {
       } catch (e) {
         return UploadResult.error(errorMessage: 'Failed to parse server response');
       }
-    } on CancelledException {
+    } on RequestAbortedException {
       logger.warning("Upload $logContext was cancelled");
       return UploadResult.cancelled();
     } catch (error, stackTrace) {
@@ -155,6 +150,34 @@ class UploadRepository {
   }
 }
 
+class ProgressMultipartRequest extends MultipartRequest with Abortable {
+  ProgressMultipartRequest(super.method, super.url, {this.abortTrigger, this.onProgress});
+
+  @override
+  final Future<void>? abortTrigger;
+
+  final void Function(int bytes, int totalBytes)? onProgress;
+
+  @override
+  ByteStream finalize() {
+    final byteStream = super.finalize();
+    if (onProgress == null) return byteStream;
+
+    final total = contentLength;
+    var bytes = 0;
+    final stream = byteStream.transform(
+      StreamTransformer.fromHandlers(
+        handleData: (List<int> data, EventSink<List<int>> sink) {
+          bytes += data.length;
+          onProgress!(bytes, total);
+          sink.add(data);
+        },
+      ),
+    );
+    return ByteStream(stream);
+  }
+}
+
 class UploadResult {
   final bool isSuccess;
   final bool isCancelled;
@@ -182,26 +205,3 @@ class UploadResult {
     return const UploadResult(isSuccess: false, isCancelled: true);
   }
 }
-
-class _CustomMultipartRequest extends MultipartRequest {
-  _CustomMultipartRequest(super.method, super.url, {required this.onProgress});
-
-  final void Function(int bytes, int totalBytes) onProgress;
-
-  @override
-  ByteStream finalize() {
-    final byteStream = super.finalize();
-    final total = contentLength;
-    var bytes = 0;
-
-    final t = StreamTransformer.fromHandlers(
-      handleData: (List<int> data, EventSink<List<int>> sink) {
-        bytes += data.length;
-        onProgress.call(bytes, total);
-        sink.add(data);
-      },
-    );
-    final stream = byteStream.transform(t);
-    return ByteStream(stream);
-  }
-}

mobile/lib/services/api.service.dart

@@ -3,12 +3,11 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:device_info_plus/device_info_plus.dart';
-import 'package:http/http.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
-import 'package:immich_mobile/utils/user_agent.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
@@ -49,9 +48,14 @@ class ApiService implements Authentication {
   String? _accessToken;
   final _log = Logger("ApiService");
 
+  Future<void> updateHeaders() async {
+    await NetworkRepository.setHeaders(getRequestHeaders(), getServerUrls());
+    _apiClient.client = NetworkRepository.client;
+  }
+
   setEndpoint(String endpoint) {
     _apiClient = ApiClient(basePath: endpoint, authentication: this);
-    _setUserAgentHeader();
+    _apiClient.client = NetworkRepository.client;
     if (_accessToken != null) {
       setAccessToken(_accessToken!);
     }
@@ -78,11 +82,6 @@ class ApiService implements Authentication {
     tagsApi = TagsApi(_apiClient);
   }
 
-  Future<void> _setUserAgentHeader() async {
-    final userAgent = await getUserAgentString();
-    _apiClient.addDefaultHeader('User-Agent', userAgent);
-  }
-
   Future<String> resolveAndSetEndpoint(String serverUrl) async {
     final endpoint = await resolveEndpoint(serverUrl);
     setEndpoint(endpoint);
@@ -136,14 +135,9 @@ class ApiService implements Authentication {
   }
 
   Future<String> _getWellKnownEndpoint(String baseUrl) async {
-    final Client client = Client();
-
     try {
-      var headers = {"Accept": "application/json"};
-      headers.addAll(getRequestHeaders());
-
-      final res = await client
-          .get(Uri.parse("$baseUrl/.well-known/immich"), headers: headers)
+      final res = await NetworkRepository.client
+          .get(Uri.parse("$baseUrl/.well-known/immich"))
           .timeout(const Duration(seconds: 5));
 
       if (res.statusCode == 200) {
@@ -185,6 +179,31 @@ class ApiService implements Authentication {
     }
   }
 
+  static List<String> getServerUrls() {
+    final urls = <String>[];
+    final serverEndpoint = Store.tryGet(StoreKey.serverEndpoint);
+    if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
+      urls.add(serverEndpoint);
+    }
+    final serverUrl = Store.tryGet(StoreKey.serverUrl);
+    if (serverUrl != null && serverUrl.isNotEmpty) {
+      urls.add(serverUrl);
+    }
+    final localEndpoint = Store.tryGet(StoreKey.localEndpoint);
+    if (localEndpoint != null && localEndpoint.isNotEmpty) {
+      urls.add(localEndpoint);
+    }
+    final externalJson = Store.tryGet(StoreKey.externalEndpointList);
+    if (externalJson != null) {
+      final List<dynamic> list = jsonDecode(externalJson);
+      for (final entry in list) {
+        final url = entry['url'] as String?;
+        if (url != null && url.isNotEmpty) urls.add(url);
+      }
+    }
+    return urls;
+  }
+
   static Map<String, String> getRequestHeaders() {
     var accessToken = Store.get(StoreKey.accessToken, "");
     var customHeadersStr = Store.get(StoreKey.customHeaders, "");
@@ -207,10 +226,7 @@ class ApiService implements Authentication {
 
   @override
   Future<void> applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
-    return Future<void>(() {
-      var headers = ApiService.getRequestHeaders();
-      headerParams.addAll(headers);
-    });
+    return Future.value();
   }
 
   ApiClient get apiClient => _apiClient;

mobile/lib/services/auth.service.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -64,27 +64,16 @@ class AuthService {
   }
 
   Future<bool> validateAuxilaryServerUrl(String url) async {
-    final httpclient = HttpClient();
     bool isValid = false;
 
     try {
       final uri = Uri.parse('$url/users/me');
-      final request = await httpclient.getUrl(uri);
-
-      // add auth token + any configured custom headers
-      final customHeaders = ApiService.getRequestHeaders();
-      customHeaders.forEach((key, value) {
-        request.headers.add(key, value);
-      });
-
-      final response = await request.close();
+      final response = await NetworkRepository.client.get(uri);
       if (response.statusCode == 200) {
         isValid = true;
       }
     } catch (error) {
       _log.severe("Error validating auxiliary endpoint", error);
-    } finally {
-      httpclient.close();
     }
 
     return isValid;

mobile/lib/services/background.service.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'dart:isolate';
 import 'dart:ui' show DartPluginRegistrant, IsolateNameServer, PluginUtilities;
 
-import 'package:cancellation_token_http/http.dart';
 import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/services.dart';
@@ -30,7 +29,6 @@ import 'package:immich_mobile/utils/backup_progress.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/diff.dart';
-import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:path_provider_foundation/path_provider_foundation.dart';
 import 'package:photo_manager/photo_manager.dart' show PMProgressHandler;
 
@@ -43,7 +41,7 @@ class BackgroundService {
   static const MethodChannel _backgroundChannel = MethodChannel('immich/backgroundChannel');
   static const notifyInterval = Duration(milliseconds: 400);
   bool _isBackgroundInitialized = false;
-  CancellationToken? _cancellationToken;
+  Completer<void>? _cancellationToken;
   bool _canceledBySystem = false;
   int _wantsLockTime = 0;
   bool _hasLock = false;
@@ -321,7 +319,8 @@ class BackgroundService {
         }
       case "systemStop":
         _canceledBySystem = true;
-        _cancellationToken?.cancel();
+        _cancellationToken?.complete();
+        _cancellationToken = null;
         return true;
       default:
         dPrint(() => "Unknown method ${call.method}");
@@ -341,7 +340,6 @@ class BackgroundService {
       ],
     );
 
-    HttpSSLOptions.apply();
     await ref.read(apiServiceProvider).setAccessToken(Store.get(StoreKey.accessToken));
     await ref.read(authServiceProvider).setOpenApiServiceEndpoint();
     dPrint(() => "[BG UPLOAD] Using endpoint: ${ref.read(apiServiceProvider).apiClient.basePath}");
@@ -441,7 +439,8 @@ class BackgroundService {
       ),
     );
 
-    _cancellationToken = CancellationToken();
+    _cancellationToken?.complete();
+    _cancellationToken = Completer<void>();
     final pmProgressHandler = Platform.isIOS ? PMProgressHandler() : null;
 
     final bool ok = await backupService.backupAsset(
@@ -455,7 +454,7 @@ class BackgroundService {
       isBackground: true,
     );
 
-    if (!ok && !_cancellationToken!.isCancelled) {
+    if (!ok && !_cancellationToken!.isCompleted) {
       unawaited(
         _showErrorNotification(
           title: "backup_background_service_error_title".tr(),
@@ -467,7 +466,7 @@ class BackgroundService {
     return ok;
   }
 
-  void _onAssetUploaded({bool shouldNotify = false}) async {
+  void _onAssetUploaded({bool shouldNotify = false}) {
     if (!shouldNotify) {
       return;
     }

mobile/lib/services/backup.service.dart

@@ -2,14 +2,16 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:cancellation_token_http/http.dart' as http;
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:http/http.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
+import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
 import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';
@@ -43,7 +45,6 @@ final backupServiceProvider = Provider(
 );
 
 class BackupService {
-  final httpClient = http.Client();
   final ApiService _apiService;
   final Logger _log = Logger("BackupService");
   final AppSettingsService _appSetting;
@@ -233,7 +234,7 @@ class BackupService {
 
   Future<bool> backupAsset(
     Iterable<BackupCandidate> assets,
-    http.CancellationToken cancelToken, {
+    Completer<void> cancelToken, {
     bool isBackground = false,
     PMProgressHandler? pmProgressHandler,
     required void Function(SuccessUploadAsset result) onSuccess,
@@ -306,20 +307,20 @@ class BackupService {
           }
 
           final fileStream = file.openRead();
-          final assetRawUploadData = http.MultipartFile(
+          final assetRawUploadData = MultipartFile(
             "assetData",
             fileStream,
             file.lengthSync(),
             filename: originalFileName,
           );
 
-          final baseRequest = MultipartRequest(
+          final baseRequest = ProgressMultipartRequest(
             'POST',
             Uri.parse('$savedEndpoint/assets'),
+            abortTrigger: cancelToken.future,
             onProgress: ((bytes, totalBytes) => onProgress(bytes, totalBytes)),
           );
 
-          baseRequest.headers.addAll(ApiService.getRequestHeaders());
           baseRequest.fields['deviceAssetId'] = asset.localId!;
           baseRequest.fields['deviceId'] = deviceId;
           baseRequest.fields['fileCreatedAt'] = asset.fileCreatedAt.toUtc().toIso8601String();
@@ -348,7 +349,7 @@ class BackupService {
             baseRequest.fields['livePhotoVideoId'] = livePhotoVideoId;
           }
 
-          final response = await httpClient.send(baseRequest, cancellationToken: cancelToken);
+          final response = await NetworkRepository.client.send(baseRequest);
 
           final responseBody = jsonDecode(await response.stream.bytesToString());
 
@@ -398,7 +399,7 @@ class BackupService {
             await _albumService.syncUploadAlbums(candidate.albumNames, [responseBody['id'] as String]);
           }
         }
-      } on http.CancelledException {
+      } on RequestAbortedException {
         dPrint(() => "Backup was cancelled by the user");
         anyErrors = true;
         break;
@@ -429,26 +430,26 @@ class BackupService {
     String originalFileName,
     File? livePhotoVideoFile,
     MultipartRequest baseRequest,
-    http.CancellationToken cancelToken,
+    Completer cancelToken,
   ) async {
     if (livePhotoVideoFile == null) {
       return null;
     }
     final livePhotoTitle = p.setExtension(originalFileName, p.extension(livePhotoVideoFile.path));
     final fileStream = livePhotoVideoFile.openRead();
-    final livePhotoRawUploadData = http.MultipartFile(
+    final livePhotoRawUploadData = MultipartFile(
       "assetData",
       fileStream,
       livePhotoVideoFile.lengthSync(),
       filename: livePhotoTitle,
     );
-    final livePhotoReq = MultipartRequest(baseRequest.method, baseRequest.url, onProgress: baseRequest.onProgress)
+    final livePhotoReq = ProgressMultipartRequest(baseRequest.method, baseRequest.url, abortTrigger: cancelToken.future)
       ..headers.addAll(baseRequest.headers)
       ..fields.addAll(baseRequest.fields);
 
     livePhotoReq.files.add(livePhotoRawUploadData);
 
-    var response = await httpClient.send(livePhotoReq, cancellationToken: cancelToken);
+    var response = await NetworkRepository.client.send(livePhotoReq);
 
     var responseBody = jsonDecode(await response.stream.bytesToString());
 
@@ -470,31 +471,3 @@ class BackupService {
     AssetType.other => "OTHER",
   };
 }
-
-class MultipartRequest extends http.MultipartRequest {
-  /// Creates a new [MultipartRequest].
-  MultipartRequest(super.method, super.url, {required this.onProgress});
-
-  final void Function(int bytes, int totalBytes) onProgress;
-
-  /// Freezes all mutable fields and returns a
-  /// single-subscription [http.ByteStream]
-  /// that will emit the request body.
-  @override
-  http.ByteStream finalize() {
-    final byteStream = super.finalize();
-
-    final total = contentLength;
-    var bytes = 0;
-
-    final t = StreamTransformer.fromHandlers(
-      handleData: (List<int> data, EventSink<List<int>> sink) {
-        bytes += data.length;
-        onProgress.call(bytes, total);
-        sink.add(data);
-      },
-    );
-    final stream = byteStream.transform(t);
-    return http.ByteStream(stream);
-  }
-}

mobile/lib/services/foreground_upload.service.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:cancellation_token_http/http.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -19,7 +18,6 @@ import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
-import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
@@ -82,7 +80,7 @@ class ForegroundUploadService {
   /// Bulk upload of backup candidates from selected albums
   Future<void> uploadCandidates(
     String userId,
-    CancellationToken cancelToken, {
+    Completer<void> cancelToken, {
     UploadCallbacks callbacks = const UploadCallbacks(),
     bool useSequentialUpload = false,
   }) async {
@@ -105,7 +103,7 @@ class ForegroundUploadService {
           final requireWifi = _shouldRequireWiFi(asset);
           return requireWifi && !hasWifi;
         },
-        processItem: (asset, httpClient) => _uploadSingleAsset(asset, httpClient, cancelToken, callbacks: callbacks),
+        processItem: (asset) => _uploadSingleAsset(asset, cancelToken, callbacks: callbacks),
       );
     }
   }
@@ -113,37 +111,32 @@ class ForegroundUploadService {
   /// Sequential upload - used for background isolate where concurrent HTTP clients may cause issues
   Future<void> _uploadSequentially({
     required List<LocalAsset> items,
-    required CancellationToken cancelToken,
+    required Completer<void> cancelToken,
     required bool hasWifi,
     required UploadCallbacks callbacks,
   }) async {
-    final httpClient = Client();
     await _storageRepository.clearCache();
     shouldAbortUpload = false;
 
-    try {
-      for (final asset in items) {
-        if (shouldAbortUpload || cancelToken.isCancelled) {
-          break;
-        }
-
-        final requireWifi = _shouldRequireWiFi(asset);
-        if (requireWifi && !hasWifi) {
-          _logger.warning('Skipping upload for ${asset.id} because it requires WiFi');
-          continue;
-        }
-
-        await _uploadSingleAsset(asset, httpClient, cancelToken, callbacks: callbacks);
+    for (final asset in items) {
+      if (shouldAbortUpload || cancelToken.isCompleted) {
+        break;
       }
-    } finally {
-      httpClient.close();
+
+      final requireWifi = _shouldRequireWiFi(asset);
+      if (requireWifi && !hasWifi) {
+        _logger.warning('Skipping upload for ${asset.id} because it requires WiFi');
+        continue;
+      }
+
+      await _uploadSingleAsset(asset, cancelToken, callbacks: callbacks);
     }
   }
 
   /// Manually upload picked local assets
   Future<void> uploadManual(
-    List<LocalAsset> localAssets,
-    CancellationToken cancelToken, {
+    List<LocalAsset> localAssets, {
+    Completer<void>? cancelToken,
     UploadCallbacks callbacks = const UploadCallbacks(),
   }) async {
     if (localAssets.isEmpty) {
@@ -153,14 +146,14 @@ class ForegroundUploadService {
     await _executeWithWorkerPool<LocalAsset>(
       items: localAssets,
       cancelToken: cancelToken,
-      processItem: (asset, httpClient) => _uploadSingleAsset(asset, httpClient, cancelToken, callbacks: callbacks),
+      processItem: (asset) => _uploadSingleAsset(asset, cancelToken, callbacks: callbacks),
     );
   }
 
   /// Upload files from shared intent
   Future<void> uploadShareIntent(
     List<File> files, {
-    CancellationToken? cancelToken,
+    Completer<void>? cancelToken,
     void Function(String fileId, int bytes, int totalBytes)? onProgress,
     void Function(String fileId)? onSuccess,
     void Function(String fileId, String errorMessage)? onError,
@@ -168,20 +161,16 @@ class ForegroundUploadService {
     if (files.isEmpty) {
       return;
     }
-
-    final effectiveCancelToken = cancelToken ?? CancellationToken();
-
     await _executeWithWorkerPool<File>(
       items: files,
-      cancelToken: effectiveCancelToken,
-      processItem: (file, httpClient) async {
+      cancelToken: cancelToken,
+      processItem: (file) async {
         final fileId = p.hash(file.path).toString();
 
         final result = await _uploadSingleFile(
           file,
           deviceAssetId: fileId,
-          httpClient: httpClient,
-          cancelToken: effectiveCancelToken,
+          cancelToken: cancelToken,
           onProgress: (bytes, totalBytes) => onProgress?.call(fileId, bytes, totalBytes),
         );
 
@@ -207,58 +196,49 @@ class ForegroundUploadService {
   /// [concurrentWorkers] - Number of concurrent workers (default: 3)
   Future<void> _executeWithWorkerPool<T>({
     required List<T> items,
-    required CancellationToken cancelToken,
-    required Future<void> Function(T item, Client httpClient) processItem,
+    required Completer<void>? cancelToken,
+    required Future<void> Function(T item) processItem,
     bool Function(T item)? shouldSkip,
     int concurrentWorkers = 3,
   }) async {
-    final httpClients = List.generate(concurrentWorkers, (_) => Client());
-
     await _storageRepository.clearCache();
     shouldAbortUpload = false;
 
-    try {
-      int currentIndex = 0;
+    int currentIndex = 0;
 
-      Future<void> worker(Client httpClient) async {
-        while (true) {
-          if (shouldAbortUpload || cancelToken.isCancelled) {
-            break;
-          }
-
-          final index = currentIndex;
-          if (index >= items.length) {
-            break;
-          }
-          currentIndex++;
-
-          final item = items[index];
-
-          if (shouldSkip?.call(item) ?? false) {
-            continue;
-          }
-
-          await processItem(item, httpClient);
+    Future<void> worker() async {
+      while (true) {
+        if (shouldAbortUpload || (cancelToken != null && cancelToken.isCompleted)) {
+          break;
         }
-      }
 
-      final workerFutures = <Future<void>>[];
-      for (int i = 0; i < concurrentWorkers; i++) {
-        workerFutures.add(worker(httpClients[i]));
-      }
+        final index = currentIndex;
+        if (index >= items.length) {
+          break;
+        }
+        currentIndex++;
 
-      await Future.wait(workerFutures);
-    } finally {
-      for (final client in httpClients) {
-        client.close();
+        final item = items[index];
+
+        if (shouldSkip?.call(item) ?? false) {
+          continue;
+        }
+
+        await processItem(item);
       }
     }
+
+    final workerFutures = <Future<void>>[];
+    for (int i = 0; i < concurrentWorkers; i++) {
+      workerFutures.add(worker());
+    }
+
+    await Future.wait(workerFutures);
   }
 
   Future<void> _uploadSingleAsset(
     LocalAsset asset,
-    Client httpClient,
-    CancellationToken cancelToken, {
+    Completer<void>? cancelToken, {
     required UploadCallbacks callbacks,
   }) async {
     File? file;
@@ -343,7 +323,6 @@ class ForegroundUploadService {
       final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
       final deviceId = Store.get(StoreKey.deviceId);
 
-      final headers = ApiService.getRequestHeaders();
       final fields = {
         'deviceAssetId': asset.localId!,
         'deviceId': deviceId,
@@ -358,15 +337,15 @@ class ForegroundUploadService {
       if (entity.isLivePhoto && livePhotoFile != null) {
         final livePhotoTitle = p.setExtension(originalFileName, p.extension(livePhotoFile.path));
 
+        final onProgress = callbacks.onProgress;
         final livePhotoResult = await _uploadRepository.uploadFile(
           file: livePhotoFile,
           originalFileName: livePhotoTitle,
-          headers: headers,
           fields: fields,
-          httpClient: httpClient,
           cancelToken: cancelToken,
-          onProgress: (bytes, totalBytes) =>
-              callbacks.onProgress?.call(asset.localId!, livePhotoTitle, bytes, totalBytes),
+          onProgress: onProgress != null
+              ? (bytes, totalBytes) => onProgress(asset.localId!, livePhotoTitle, bytes, totalBytes)
+              : null,
           logContext: 'livePhotoVideo[${asset.localId}]',
         );
 
@@ -395,15 +374,15 @@ class ForegroundUploadService {
         ]);
       }
 
+      final onProgress = callbacks.onProgress;
       final result = await _uploadRepository.uploadFile(
         file: file,
         originalFileName: originalFileName,
-        headers: headers,
         fields: fields,
-        httpClient: httpClient,
         cancelToken: cancelToken,
-        onProgress: (bytes, totalBytes) =>
-            callbacks.onProgress?.call(asset.localId!, originalFileName, bytes, totalBytes),
+        onProgress: onProgress != null
+            ? (bytes, totalBytes) => onProgress(asset.localId!, originalFileName, bytes, totalBytes)
+            : null,
         logContext: 'asset[${asset.localId}]',
       );
 
@@ -442,8 +421,7 @@ class ForegroundUploadService {
   Future<UploadResult> _uploadSingleFile(
     File file, {
     required String deviceAssetId,
-    required Client httpClient,
-    required CancellationToken cancelToken,
+    required Completer<void>? cancelToken,
     void Function(int bytes, int totalBytes)? onProgress,
   }) async {
     try {
@@ -452,12 +430,9 @@ class ForegroundUploadService {
       final fileModifiedAt = stats.modified;
       final filename = p.basename(file.path);
 
-      final headers = ApiService.getRequestHeaders();
-      final deviceId = Store.get(StoreKey.deviceId);
-
       final fields = {
         'deviceAssetId': deviceAssetId,
-        'deviceId': deviceId,
+        'deviceId': Store.get(StoreKey.deviceId),
         'fileCreatedAt': fileCreatedAt.toUtc().toIso8601String(),
         'fileModifiedAt': fileModifiedAt.toUtc().toIso8601String(),
         'isFavorite': 'false',
@@ -467,11 +442,9 @@ class ForegroundUploadService {
       return await _uploadRepository.uploadFile(
         file: file,
         originalFileName: filename,
-        headers: headers,
         fields: fields,
-        httpClient: httpClient,
         cancelToken: cancelToken,
-        onProgress: onProgress ?? (_, __) {},
+        onProgress: onProgress,
         logContext: 'shareIntent[$deviceAssetId]',
       );
     } catch (e) {

mobile/lib/utils/http_ssl_cert_override.dart

@@ -1,61 +0,0 @@
-import 'dart:io';
-
-import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:logging/logging.dart';
-
-class HttpSSLCertOverride extends HttpOverrides {
-  static final Logger _log = Logger("HttpSSLCertOverride");
-  final bool _allowSelfSignedSSLCert;
-  final String? _serverHost;
-  final SSLClientCertStoreVal? _clientCert;
-  late final SecurityContext? _ctxWithCert;
-
-  HttpSSLCertOverride(this._allowSelfSignedSSLCert, this._serverHost, this._clientCert) {
-    if (_clientCert != null) {
-      _ctxWithCert = SecurityContext(withTrustedRoots: true);
-      if (_ctxWithCert != null) {
-        setClientCert(_ctxWithCert, _clientCert);
-      } else {
-        _log.severe("Failed to create security context with client cert!");
-      }
-    } else {
-      _ctxWithCert = null;
-    }
-  }
-
-  static bool setClientCert(SecurityContext ctx, SSLClientCertStoreVal cert) {
-    try {
-      _log.info("Setting client certificate");
-      ctx.usePrivateKeyBytes(cert.data, password: cert.password);
-      ctx.useCertificateChainBytes(cert.data, password: cert.password);
-    } catch (e) {
-      _log.severe("Failed to set SSL client cert: $e");
-      return false;
-    }
-    return true;
-  }
-
-  @override
-  HttpClient createHttpClient(SecurityContext? context) {
-    if (context != null) {
-      if (_clientCert != null) {
-        setClientCert(context, _clientCert);
-      }
-    } else {
-      context = _ctxWithCert;
-    }
-
-    return super.createHttpClient(context)
-      ..badCertificateCallback = (X509Certificate cert, String host, int port) {
-        if (_allowSelfSignedSSLCert) {
-          // Conduct server host checks if user is logged in to avoid making
-          // insecure SSL connections to services that are not the immich server.
-          if (_serverHost == null || _serverHost.contains(host)) {
-            return true;
-          }
-        }
-        _log.severe("Invalid SSL certificate for $host:$port");
-        return false;
-      };
-  }
-}

mobile/lib/utils/http_ssl_options.dart

@@ -1,27 +0,0 @@
-import 'dart:io';
-
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/utils/http_ssl_cert_override.dart';
-
-class HttpSSLOptions {
-  static void apply() {
-    AppSettingsEnum setting = AppSettingsEnum.allowSelfSignedSSLCert;
-    bool allowSelfSignedSSLCert = Store.get(setting.storeKey as StoreKey<bool>, setting.defaultValue);
-    return _apply(allowSelfSignedSSLCert);
-  }
-
-  static void applyFromSettings(bool newValue) => _apply(newValue);
-
-  static void _apply(bool allowSelfSignedSSLCert) {
-    String? serverHost;
-    if (allowSelfSignedSSLCert && Store.tryGet(StoreKey.currentUser) != null) {
-      serverHost = Uri.parse(Store.tryGet(StoreKey.serverEndpoint) ?? "").host;
-    }
-
-    SSLClientCertStoreVal? clientCert = SSLClientCertStoreVal.load();
-
-    HttpOverrides.global = HttpSSLCertOverride(allowSelfSignedSSLCert, serverHost, clientCert);
-  }
-}

mobile/lib/utils/isolate.dart

@@ -10,7 +10,6 @@ import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
-import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/wm_executor.dart';
 import 'package:logging/logging.dart';
 import 'package:worker_manager/worker_manager.dart';
@@ -54,7 +53,6 @@ Cancelable<T?> runInIsolateGentle<T>({
         Logger log = Logger("IsolateLogger");
 
         try {
-          HttpSSLOptions.apply();
           result = await computation(ref);
         } on CanceledError {
           log.warning("Computation cancelled ${debugLabel == null ? '' : ' for $debugLabel'}");

mobile/lib/widgets/settings/advanced_settings.dart

@@ -10,12 +10,10 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
-import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/widgets/settings/beta_timeline_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/custom_proxy_headers_settings/custom_proxy_headers_settings.dart';
 import 'package:immich_mobile/widgets/settings/local_storage_settings.dart';
@@ -31,15 +29,12 @@ class AdvancedSettings extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    bool isLoggedIn = ref.read(currentUserProvider) != null;
-
     final advancedTroubleshooting = useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
     final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
     final isManageMediaSupported = useState(false);
     final manageMediaAndroidPermission = useState(false);
     final levelId = useAppSettingsState(AppSettingsEnum.logLevel);
     final preferRemote = useAppSettingsState(AppSettingsEnum.preferRemoteImage);
-    final allowSelfSignedSSLCert = useAppSettingsState(AppSettingsEnum.allowSelfSignedSSLCert);
     final useAlternatePMFilter = useAppSettingsState(AppSettingsEnum.photoManagerCustomFilter);
     final readonlyModeEnabled = useAppSettingsState(AppSettingsEnum.readonlyModeEnabled);
 
@@ -120,15 +115,8 @@ class AdvancedSettings extends HookConsumerWidget {
         subtitle: "advanced_settings_prefer_remote_subtitle".tr(),
       ),
       if (!Store.isBetaTimelineEnabled) const LocalStorageSettings(),
-      SettingsSwitchListTile(
-        enabled: !isLoggedIn,
-        valueNotifier: allowSelfSignedSSLCert,
-        title: "advanced_settings_self_signed_ssl_title".tr(),
-        subtitle: "advanced_settings_self_signed_ssl_subtitle".tr(),
-        onChanged: HttpSSLOptions.applyFromSettings,
-      ),
       const CustomProxyHeaderSettings(),
-      SslClientCertSettings(isLoggedIn: ref.read(currentUserProvider) != null),
+      const SslClientCertSettings(),
       if (!Store.isBetaTimelineEnabled)
         SettingsSwitchListTile(
           valueNotifier: useAlternatePMFilter,

mobile/lib/widgets/settings/ssl_client_cert_settings.dart

@@ -1,18 +1,16 @@
+import 'dart:async';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/platform/network_api.g.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:logging/logging.dart';
 
 class SslClientCertSettings extends StatefulWidget {
-  const SslClientCertSettings({super.key, required this.isLoggedIn});
-
-  final bool isLoggedIn;
+  const SslClientCertSettings({super.key});
 
   @override
   State<StatefulWidget> createState() => _SslClientCertSettingsState();
@@ -21,9 +19,24 @@ class SslClientCertSettings extends StatefulWidget {
 class _SslClientCertSettingsState extends State<SslClientCertSettings> {
   final _log = Logger("SslClientCertSettings");
 
-  bool isCertExist;
+  bool isCertExist = false;
 
-  _SslClientCertSettingsState() : isCertExist = SSLClientCertStoreVal.load() != null;
+  @override
+  void initState() {
+    super.initState();
+    unawaited(_checkCertificate());
+  }
+
+  Future<void> _checkCertificate() async {
+    try {
+      final exists = await networkApi.hasCertificate();
+      if (mounted && exists != isCertExist) {
+        setState(() => isCertExist = exists);
+      }
+    } catch (e) {
+      _log.warning("Failed to check certificate existence", e);
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -45,11 +58,8 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              ElevatedButton(onPressed: widget.isLoggedIn ? null : importCert, child: Text("client_cert_import".tr())),
-              ElevatedButton(
-                onPressed: widget.isLoggedIn || !isCertExist ? null : removeCert,
-                child: Text("remove".tr()),
-              ),
+              ElevatedButton(onPressed: importCert, child: Text("client_cert_import".tr())),
+              ElevatedButton(onPressed: !isCertExist ? null : removeCert, child: Text("remove".tr())),
             ],
           ),
         ],
@@ -74,9 +84,7 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
         cancel: "cancel".tr(),
         confirm: "confirm".tr(),
       );
-      final cert = await networkApi.selectCertificate(styling);
-      await SSLClientCertStoreVal(cert.data, cert.password).save();
-      HttpSSLOptions.apply();
+      await networkApi.selectCertificate(styling);
       setState(() => isCertExist = true);
       showMessage("client_cert_import_success_msg".tr());
     } catch (e) {
@@ -91,8 +99,6 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
   Future<void> removeCert() async {
     try {
       await networkApi.removeCertificate();
-      await SSLClientCertStoreVal.delete();
-      HttpSSLOptions.apply();
       setState(() => isCertExist = false);
       showMessage("client_cert_remove_msg".tr());
     } catch (e) {