fix(mobile): user get logged out upon clicking on any thing after logging in (#1808)

* fix(mobile): user get logged out upon clicking on any thing after logging in * wip: fixing still * fix: the actual issue * Fix: avaialble album not updating UI
2025-10-29 17:40:28 +00:00 · 2023-02-20 21:43:39 -06:00
parent 03d484aba2
commit 98998cccbc
11 changed files with 137 additions and 117 deletions
--- a/mobile/lib/modules/backup/providers/backup.provider.dart
+++ b/mobile/lib/modules/backup/providers/backup.provider.dart
@@ -58,9 +58,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
              fileType: '...',
            ),
          ),
-        ) {
-    getBackupInfo();
-  }
+        );

  final log = Logger('BackupNotifier');
  final BackupService _backupService;
@@ -128,55 +126,55 @@ class BackupNotifier extends StateNotifier<BackUpState> {
          requireCharging != null ||
          triggerDelay != null,
    );
-      final bool wasEnabled = state.backgroundBackup;
-      final bool wasWifi = state.backupRequireWifi;
-      final bool wasCharging = state.backupRequireCharging;
-      final int oldTriggerDelay = state.backupTriggerDelay;
-      state = state.copyWith(
-        backgroundBackup: enabled,
-        backupRequireWifi: requireWifi,
-        backupRequireCharging: requireCharging,
-        backupTriggerDelay: triggerDelay,
-      );
+    final bool wasEnabled = state.backgroundBackup;
+    final bool wasWifi = state.backupRequireWifi;
+    final bool wasCharging = state.backupRequireCharging;
+    final int oldTriggerDelay = state.backupTriggerDelay;
+    state = state.copyWith(
+      backgroundBackup: enabled,
+      backupRequireWifi: requireWifi,
+      backupRequireCharging: requireCharging,
+      backupTriggerDelay: triggerDelay,
+    );

-      if (state.backgroundBackup) {
-        bool success = true;
-        if (!wasEnabled) {
-          if (!await _backgroundService.isIgnoringBatteryOptimizations()) {
-            onBatteryInfo();
-          }
-          success &= await _backgroundService.enableService(immediate: true);
-        }
-        success &= success &&
-            await _backgroundService.configureService(
-              requireUnmetered: state.backupRequireWifi,
-              requireCharging: state.backupRequireCharging,
-              triggerUpdateDelay: state.backupTriggerDelay,
-              triggerMaxDelay: state.backupTriggerDelay * 10,
-            );
-        if (success) {
-          final box = Hive.box(backgroundBackupInfoBox);
-          await Future.wait([
-            box.put(backupRequireWifi, state.backupRequireWifi),
-            box.put(backupRequireCharging, state.backupRequireCharging),
-            box.put(backupTriggerDelay, state.backupTriggerDelay),
-          ]);
-        } else {
-          state = state.copyWith(
-            backgroundBackup: wasEnabled,
-            backupRequireWifi: wasWifi,
-            backupRequireCharging: wasCharging,
-            backupTriggerDelay: oldTriggerDelay,
-          );
-          onError("backup_controller_page_background_configure_error");
-        }
-      } else {
-        final bool success = await _backgroundService.disableService();
-        if (!success) {
-          state = state.copyWith(backgroundBackup: wasEnabled);
-          onError("backup_controller_page_background_configure_error");
+    if (state.backgroundBackup) {
+      bool success = true;
+      if (!wasEnabled) {
+        if (!await _backgroundService.isIgnoringBatteryOptimizations()) {
+          onBatteryInfo();
        }
+        success &= await _backgroundService.enableService(immediate: true);
      }
+      success &= success &&
+          await _backgroundService.configureService(
+            requireUnmetered: state.backupRequireWifi,
+            requireCharging: state.backupRequireCharging,
+            triggerUpdateDelay: state.backupTriggerDelay,
+            triggerMaxDelay: state.backupTriggerDelay * 10,
+          );
+      if (success) {
+        final box = Hive.box(backgroundBackupInfoBox);
+        await Future.wait([
+          box.put(backupRequireWifi, state.backupRequireWifi),
+          box.put(backupRequireCharging, state.backupRequireCharging),
+          box.put(backupTriggerDelay, state.backupTriggerDelay),
+        ]);
+      } else {
+        state = state.copyWith(
+          backgroundBackup: wasEnabled,
+          backupRequireWifi: wasWifi,
+          backupRequireCharging: wasCharging,
+          backupTriggerDelay: oldTriggerDelay,
+        );
+        onError("backup_controller_page_background_configure_error");
+      }
+    } else {
+      final bool success = await _backgroundService.disableService();
+      if (!success) {
+        state = state.copyWith(backgroundBackup: wasEnabled);
+        onError("backup_controller_page_background_configure_error");
+      }
+    }
  }

  ///
@@ -460,6 +458,12 @@ class BackupNotifier extends StateNotifier<BackUpState> {
    }
  }

+  void setAvailableAlbums(availableAlbums) {
+    state = state.copyWith(
+      availableAlbums: availableAlbums,
+    );
+  }
+
  void _onBackupError(ErrorUploadAsset errorAssetInfo) {
    ref.watch(errorBackupListProvider.notifier).add(errorAssetInfo);
  }
@@ -573,7 +577,6 @@ class BackupNotifier extends StateNotifier<BackUpState> {
  }

  Future<void> resumeBackup() async {
-
    // assumes the background service is currently running
    // if true, waits until it has stopped to update the app state from HiveDB
    // before actually resuming backup by calling the internal `_resumeBackup`
@@ -677,7 +680,6 @@ class BackupNotifier extends StateNotifier<BackUpState> {
      _backgroundService.releaseLock();
    }
  }
-
 }

 final backupProvider =
--- a/mobile/lib/modules/backup/views/backup_album_selection_page.dart
+++ b/mobile/lib/modules/backup/views/backup_album_selection_page.dart
@@ -5,7 +5,6 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/immich_colors.dart';
-import 'package:immich_mobile/modules/backup/models/available_album.model.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/modules/backup/ui/album_info_card.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
@@ -19,20 +18,18 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
    final selectedBackupAlbums = ref.watch(backupProvider).selectedBackupAlbums;
    final excludedBackupAlbums = ref.watch(backupProvider).excludedBackupAlbums;
    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
-    final albums = useState<List<AvailableAlbum>>(
-      ref.watch(backupProvider).availableAlbums,
-    );
+    final albums = ref.watch(backupProvider).availableAlbums;

    useEffect(
      () {
-        ref.read(backupProvider.notifier).getBackupInfo();
+        ref.watch(backupProvider.notifier).getBackupInfo();
        return null;
      },
      [],
    );

    buildAlbumSelectionList() {
-      if (albums.value.isEmpty) {
+      if (albums.isEmpty) {
        return const Center(
          child: ImmichLoadingIndicator(),
        );
@@ -42,17 +39,17 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
        height: 265,
        child: ListView.builder(
          scrollDirection: Axis.horizontal,
-          itemCount: albums.value.length,
+          itemCount: albums.length,
          physics: const BouncingScrollPhysics(),
          itemBuilder: ((context, index) {
-            var thumbnailData = albums.value[index].thumbnailData;
+            var thumbnailData = albums[index].thumbnailData;
            return Padding(
              padding: index == 0
                  ? const EdgeInsets.only(left: 16.00)
                  : const EdgeInsets.all(0),
              child: AlbumInfoCard(
                imageData: thumbnailData,
-                albumInfo: albums.value[index],
+                albumInfo: albums[index],
              ),
            );
          }),
@@ -142,7 +139,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
        padding: const EdgeInsets.only(left: 16.0, right: 16, bottom: 8.0),
        child: TextFormField(
          onChanged: (searchValue) {
-            albums.value = ref
+            var avaialbleAlbums = ref
                .watch(backupProvider)
                .availableAlbums
                .where(
@@ -151,6 +148,10 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                      .contains(searchValue.toLowerCase()),
                )
                .toList();
+
+            ref
+                .read(backupProvider.notifier)
+                .setAvailableAlbums(avaialbleAlbums);
          },
          decoration: InputDecoration(
            contentPadding: const EdgeInsets.symmetric(
--- a/mobile/lib/modules/backup/views/backup_controller_page.dart
+++ b/mobile/lib/modules/backup/views/backup_controller_page.dart
@@ -592,18 +592,23 @@ class BackupControllerPage extends HookConsumerWidget {
            BackupInfoCard(
              title: "backup_controller_page_total".tr(),
              subtitle: "backup_controller_page_total_sub".tr(),
-              info: "${backupState.allUniqueAssets.length}",
+              info: ref.watch(backupProvider).availableAlbums.isEmpty
+                  ? "..."
+                  : "${backupState.allUniqueAssets.length}",
            ),
            BackupInfoCard(
              title: "backup_controller_page_backup".tr(),
              subtitle: "backup_controller_page_backup_sub".tr(),
-              info: "${backupState.selectedAlbumsBackupAssetsIds.length}",
+              info: ref.watch(backupProvider).availableAlbums.isEmpty
+                  ? "..."
+                  : "${backupState.selectedAlbumsBackupAssetsIds.length}",
            ),
            BackupInfoCard(
              title: "backup_controller_page_remainder".tr(),
              subtitle: "backup_controller_page_remainder_sub".tr(),
-              info:
-                  "${backupState.allUniqueAssets.length - backupState.selectedAlbumsBackupAssetsIds.length}",
+              info: ref.watch(backupProvider).availableAlbums.isEmpty
+                  ? "..."
+                  : "${backupState.allUniqueAssets.length - backupState.selectedAlbumsBackupAssetsIds.length}",
            ),
            const Divider(),
            buildAutoBackupController(),