PR: addressing comments

immich-app · Jul 16, 2023 · 6e22da3 · 6e22da3
1 parent f7a194a
commit 6e22da3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/mobile/lib/modules/login/providers/authentication.provider.dart b/mobile/lib/modules/login/providers/authentication.provider.dart
@@ -148,15 +148,11 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
     User? user;
 
     bool retResult = false;
+    User? offlineUser = Store.tryGet(StoreKey.currentUser);
 
-    if (offlineLogin) {
-      User? offlineUser = Store.tryGet(StoreKey.currentUser);
-
-      if (offlineUser != null) {
-        user = offlineUser;
-        retResult = false;
-      }
-
+    if (offlineLogin && offlineUser != null) {
+      user = offlineUser;
+      retResult = false;
     } else {
       UserResponseDto? userResponseDto;
       try {

diff --git a/mobile/lib/shared/services/api.service.dart b/mobile/lib/shared/services/api.service.dart
@@ -64,7 +64,9 @@ class ApiService {
   Future<String> _resolveEndpoint(String serverUrl) async {
     final url = sanitizeUrl(serverUrl);
 
-    await _isEndpointAvailable(serverUrl);
+    if (!await _isEndpointAvailable(serverUrl)) {
+      throw ApiException(503, "Server is not reachable");
+    }
 
     // Check for /.well-known/immich
     final wellKnownEndpoint = await _getWellKnownEndpoint(url);
@@ -74,7 +76,7 @@ class ApiService {
     return url;
   }
 
-  Future<void> _isEndpointAvailable(String serverUrl) async {
+  Future<bool> _isEndpointAvailable(String serverUrl) async {
     final Client client = Client();
 
     if (!serverUrl.endsWith('/api')) {
@@ -89,12 +91,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 {

diff --git a/mobile/lib/shared/views/splash_screen.dart b/mobile/lib/shared/views/splash_screen.dart
@@ -8,6 +8,8 @@ import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.pr
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
+import 'package:logging/logging.dart';
+import 'package:openapi/api.dart';
 
 class SplashScreenPage extends HookConsumerWidget {
   const SplashScreenPage({Key? key}) : super(key: key);
@@ -17,6 +19,7 @@ class SplashScreenPage extends HookConsumerWidget {
     final apiService = ref.watch(apiServiceProvider);
     final serverUrl = Store.tryGet(StoreKey.serverUrl);
     final accessToken = Store.tryGet(StoreKey.accessToken);
+    final _log = Logger("SplashScreenPage");
 
     void performLoggingIn() async {
       bool isSuccess = false;
@@ -25,9 +28,16 @@ class SplashScreenPage extends HookConsumerWidget {
         try {
           // Resolve API server endpoint from user provided serverUrl
           await apiService.resolveAndSetEndpoint(serverUrl);
-        } catch (e) {
+        } on ApiException catch (e) {
           // okay, try to continue anyway if offline
-          deviceIsOffline = true;
+          if (e.code == 503) {
+            deviceIsOffline = true;
+            _log.fine("Device seems to be offline upon launch");
+          } else {
+            _log.severe(e);
+          }
+        } catch (e) {
+          _log.severe(e);
         }
 
         isSuccess =