Fix local and google drive backup/restore logging

Author: agil3st

lib/core/services/google/google_auth_service.dart

@@ -177,6 +177,9 @@ final googleAuthProvider =
 /// `GoogleAuthService` class. This delegates to the GoogleSignIn SDK
 /// directly and provides the same async helpers as the notifier.
 class GoogleAuthService {
+  GoogleSignInAccount? user;
+  GoogleSignInClientAuthorization? auth;
+
   // Drive scope kept in sync with the notifier above
   static const List<String> _driveScopes = [drive.DriveApi.driveScope];
 
@@ -189,22 +192,21 @@ class GoogleAuthService {
 
   Future<bool> hasDriveAccess() async {
     await GoogleSignIn.instance.initialize();
-    final user = await GoogleSignIn.instance.attemptLightweightAuthentication();
+    user = await GoogleSignIn.instance.attemptLightweightAuthentication();
     if (user == null) return false;
-    final auth = await user.authorizationClient.authorizationForScopes(
+    auth = await user?.authorizationClient.authorizationForScopes(
       _driveScopes,
     );
     return auth != null;
   }
 
   Future<bool> requestDriveAccess() async {
-    final user = await GoogleSignIn.instance.attemptLightweightAuthentication();
     if (user == null) {
       Log.e('No user signed in to request scopes.', label: 'Auth');
       return false;
     }
     try {
-      await user.authorizationClient.authorizeScopes(_driveScopes);
+      await user?.authorizationClient.authorizeScopes(_driveScopes);
       Log.i('Drive scope request result: true', label: 'Auth');
       return true;
     } catch (e, st) {
@@ -218,13 +220,12 @@ class GoogleAuthService {
   }
 
   Future<Map<String, String>?> getAuthHeaders() async {
-    final user = await GoogleSignIn.instance.attemptLightweightAuthentication();
     if (user == null) {
       Log.e('No user to get auth headers.', label: 'Auth');
       return null;
     }
     try {
-      final headers = await user.authorizationClient.authorizationHeaders(
+      final headers = await user?.authorizationClient.authorizationHeaders(
         _driveScopes,
       );
       if (headers == null) {

lib/core/services/google/google_drive_service.dart

@@ -65,6 +65,15 @@ class GoogleDriveService {
     }
   }
 
+  /// Returns last backup zip file on Google Drive
+  Future<DriveFileSummary?> getLatestBackup() async {
+    final backups = await searchBackups();
+    if (backups.isNotEmpty) {
+      return backups.first;
+    }
+    return null;
+  }
+
   // Download a specific backup file
   Future<File?> downloadBackup(String fileId) async {
     final headers = await _headers();

lib/features/backup_and_restore/presentation/components/backup_info_cards.dart

@@ -11,20 +11,20 @@ final _lastActivityInfoProvider =
       final activities = await dao.getByUserId(uid);
 
       // backup-related actions (local and cloud)
-      final backupActions = [
-        UserActivityAction.backupCreated,
-        UserActivityAction.backupFailed,
-        UserActivityAction.cloudBackupCreated,
-        UserActivityAction.cloudBackupFailed,
-      ].map(userActivityActionToJson).toSet();
+      final backupActions = {
+        UserActivityAction.backupCreated.nameAsString,
+        UserActivityAction.backupFailed.nameAsString,
+        UserActivityAction.cloudBackupCreated.nameAsString,
+        UserActivityAction.cloudBackupFailed.nameAsString,
+      };
 
       // restore-related actions (local and cloud)
-      final restoreActions = [
-        UserActivityAction.backupRestored,
-        UserActivityAction.restoreFailed,
-        UserActivityAction.cloudBackupRestored,
-        UserActivityAction.cloudRestoreFailed,
-      ].map(userActivityActionToJson).toSet();
+      final restoreActions = {
+        UserActivityAction.backupRestored.nameAsString,
+        UserActivityAction.restoreFailed.nameAsString,
+        UserActivityAction.cloudBackupRestored.nameAsString,
+        UserActivityAction.cloudRestoreFailed.nameAsString,
+      };
 
       // helper to pick the latest activity from a set of action names
       Map<String, dynamic>? pickLatest(Set<String> actions) {
@@ -36,21 +36,21 @@ final _lastActivityInfoProvider =
         final latest = list.first;
 
         final createdBackupNames = {
-          userActivityActionToJson(UserActivityAction.backupCreated),
-          userActivityActionToJson(UserActivityAction.cloudBackupCreated),
+          UserActivityAction.backupCreated.nameAsString,
+          UserActivityAction.cloudBackupCreated.nameAsString,
         };
         final failedBackupNames = {
-          userActivityActionToJson(UserActivityAction.backupFailed),
-          userActivityActionToJson(UserActivityAction.cloudBackupFailed),
+          UserActivityAction.backupFailed.nameAsString,
+          UserActivityAction.cloudBackupFailed.nameAsString,
         };
 
         final restoredNames = {
-          userActivityActionToJson(UserActivityAction.backupRestored),
-          userActivityActionToJson(UserActivityAction.cloudBackupRestored),
+          UserActivityAction.backupRestored.nameAsString,
+          UserActivityAction.cloudBackupRestored.nameAsString,
         };
         final failedRestoreNames = {
-          userActivityActionToJson(UserActivityAction.restoreFailed),
-          userActivityActionToJson(UserActivityAction.cloudRestoreFailed),
+          UserActivityAction.restoreFailed.nameAsString,
+          UserActivityAction.cloudRestoreFailed.nameAsString,
         };
 
         bool? success;

lib/features/backup_and_restore/presentation/components/drive_backup_section.dart

@@ -114,33 +114,42 @@ class DriveBackupSection extends ConsumerWidget {
         ),
         Container(
           width: double.infinity,
-          padding: const EdgeInsets.symmetric(horizontal: 4.0),
+          padding: const EdgeInsets.all(AppSpacing.spacing16),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(AppRadius.radius12),
+            border: Border.all(color: context.breakLineColor),
+          ),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisAlignment: MainAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            spacing: AppSpacing.spacing4,
             children: [
-              Gap(AppSpacing.spacing2),
               Text(
-                state.status == BackupStatus.loading
-                    ? 'Backup in progress...'
-                    : 'Google Drive Backup Status',
+                'Google Drive Backup Info',
                 style: AppTextStyles.body3.bold,
               ),
-              state.status == BackupStatus.loading
-                  ? LinearProgressIndicator(
-                      value: state.status == BackupStatus.loading ? null : 0.0,
-                      color: AppColors.primary,
-                      borderRadius: BorderRadius.circular(AppRadius.radius12),
-                      minHeight: 6.0,
-                    )
-                  : Text(
-                      state.status == BackupStatus.error
-                          ? 'Error: ${state.message}'
-                          : 'Perform backup or restore to see status',
-                      style: AppTextStyles.body3,
-                    ),
+              const Gap(AppSpacing.spacing8),
+              Text(
+                'Backup File: ${state.driveDirectory ?? 'Not set'}',
+                style: AppTextStyles.body3,
+              ),
+              const Gap(AppSpacing.spacing4),
+              Text(
+                'Last Backup Time: ${state.lastDriveBackupTime != null ? state.lastDriveBackupTime!.toDayMonthYearTime12Hour() : 'No backups yet'}',
+                style: AppTextStyles.body3,
+              ),
+              // last restore time
+              const Gap(AppSpacing.spacing4),
+              Text(
+                'Last Restore Time: ${state.lastDriveRestoreTime != null ? state.lastDriveRestoreTime!.toDayMonthYearTime12Hour() : 'No restores yet'}',
+                style: AppTextStyles.body3,
+              ),
+
+              if (state.status == BackupStatus.loading)
+                LinearProgressIndicator(
+                  value: null,
+                  color: AppColors.primary,
+                  borderRadius: BorderRadius.circular(AppRadius.radius12),
+                  minHeight: 6.0,
+                ),
             ],
           ),
         ),