PR: Added connectivity check workaround

mobile/lib/main.dart

@@ -33,6 +33,7 @@ import 'package:immich_mobile/shared/providers/db.provider.dart';
 import 'package:immich_mobile/shared/providers/release_info.provider.dart';
 import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 import 'package:immich_mobile/shared/providers/websocket.provider.dart';
+import 'package:immich_mobile/shared/services/connectivity.service.dart';
 import 'package:immich_mobile/shared/services/immich_logger.service.dart';
 import 'package:immich_mobile/shared/views/immich_loading_overlay.dart';
 import 'package:immich_mobile/shared/views/version_announcement_overlay.dart';
@@ -49,6 +50,7 @@ void main() async {
   final db = await loadDb();
   await initApp();
   await migrateDatabaseIfNeeded(db);
+  ConnectivityService().init();
   runApp(getMainWidget(db));
 }
 

mobile/lib/modules/backup/views/backup_controller_page.dart

@@ -21,6 +21,7 @@ import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
 import 'package:immich_mobile/shared/providers/websocket.provider.dart';
 import 'package:immich_mobile/modules/backup/ui/backup_info_card.dart';
+import 'package:immich_mobile/shared/services/connectivity.service.dart';
 import 'package:immich_mobile/shared/ui/confirm_dialog.dart';
 import 'package:immich_mobile/shared/ui/immich_toast.dart';
 import 'package:permission_handler/permission_handler.dart';
@@ -103,7 +104,7 @@ class BackupControllerPage extends HookConsumerWidget {
           );
           return;
         }
-        final connection = await Connectivity().checkConnectivity();
+        final connection = ConnectivityService().result;
         if (connection != ConnectivityResult.wifi) {
           ImmichToast.show(
             context: context,

mobile/lib/shared/services/api.service.dart

@@ -2,8 +2,10 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/shared/models/store.dart';
+import 'package:immich_mobile/shared/services/connectivity.service.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:openapi/api.dart';
 import 'package:http/http.dart';
@@ -64,7 +66,9 @@ class ApiService {
   Future<String> _resolveEndpoint(String serverUrl) async {
     final url = sanitizeUrl(serverUrl);
 
-    await _isEndpointAvailable(serverUrl);
+    if (!await _isEndpointAvailable(serverUrl)) {
+      throw Exception("Server is not reachable");
+    }
 
     // Check for /.well-known/immich
     final wellKnownEndpoint = await _getWellKnownEndpoint(url);
@@ -74,7 +78,12 @@ class ApiService {
     return url;
   }
 
-  Future<void> _isEndpointAvailable(String serverUrl) async {
+  Future<bool> _isEndpointAvailable(String serverUrl) async {
+    final connectivityResult = ConnectivityService().result;
+    if (connectivityResult == ConnectivityResult.none) {
+      return false;
+    }
+
     final Client client = Client();
 
     if (!serverUrl.endsWith('/api')) {
@@ -89,12 +98,12 @@ class ApiService {
             Uri.parse(serverUrl),
           )
           .timeout(const Duration(seconds: 5));
-      return;
     } on TimeoutException catch (_) {
-      rethrow;
+      return false;
     } on SocketException catch (_) {
-      rethrow;
+      return false;
     }
+    return true;
   }
 
   Future<String> _getWellKnownEndpoint(String baseUrl) async {

mobile/lib/shared/services/connectivity.service.dart

@@ -0,0 +1,27 @@
+import 'dart:async';
+
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:logging/logging.dart';
+
+class ConnectivityService {
+  factory ConnectivityService() {
+    return _instance;
+  }
+
+  final _log = Logger("ConnectivityService");
+
+  ConnectivityService._internal();
+  static final ConnectivityService _instance = ConnectivityService._internal();
+  late StreamSubscription<dynamic> subscription;
+  ConnectivityResult result = ConnectivityResult.none;
+
+  void init() {
+    // Get new connectivity status when it changes
+    subscription = Connectivity()
+        .onConnectivityChanged
+        .listen((ConnectivityResult result) {
+      _log.fine("Connectivity changed to $result");
+      this.result = result;
+    });
+  }
+}