Added per user last cloud backup time UI

Author: DP-Hridayan

app/src/main/java/in/hridayan/ashell/settings/presentation/page/backup/screens/BackupAndRestoreScreen.kt

@@ -51,6 +51,7 @@ import `in`.hridayan.ashell.core.presentation.components.shape.CardCornerShape.g
 import `in`.hridayan.ashell.core.utils.getFileNameFromUri
 import `in`.hridayan.ashell.core.utils.showToast
 import `in`.hridayan.ashell.settings.domain.model.BackupOption
+import `in`.hridayan.ashell.settings.domain.model.GoogleUserState
 import `in`.hridayan.ashell.settings.presentation.components.dialog.BackupDestinationDialog
 import `in`.hridayan.ashell.settings.presentation.components.dialog.CloudOperationDialog
 import `in`.hridayan.ashell.settings.presentation.components.dialog.ResetSettingsDialog
@@ -76,6 +77,7 @@ fun BackupAndRestoreScreen(
     val backupTime by backupAndRestoreViewModel.backupTime.collectAsState()
     val lastLocalBackupTime = LocalSettings.current.lastLocalBackupTime
     val lastCloudBackupTime = LocalSettings.current.lastCloudBackupTime
+    val isFetchingCloudBackupTime by backupAndRestoreViewModel.isFetchingCloudBackupTime.collectAsState()
 
     val googleUserState by backupAndRestoreViewModel.googleUserState.collectAsState()
     val isSigningIn by backupAndRestoreViewModel.isSigningIn.collectAsState()
@@ -250,7 +252,9 @@ fun BackupAndRestoreScreen(
                                             .fillMaxWidth()
                                             .padding(top = 20.dp),
                                         lastLocalBackupTime = lastLocalBackupTime,
-                                        lastCloudBackupTime = lastCloudBackupTime
+                                        lastCloudBackupTime = lastCloudBackupTime,
+                                        userState = googleUserState,
+                                        isFetching = isFetchingCloudBackupTime,
                                     )
                                 }
                             }
@@ -334,8 +338,31 @@ fun BackupAndRestoreScreen(
 private fun LastBackupTimeCard(
     modifier: Modifier = Modifier,
     lastLocalBackupTime: String,
-    lastCloudBackupTime: String
+    lastCloudBackupTime: String,
+    userState: GoogleUserState,
+    isFetching: Boolean
 ) {
+    val perUserLastCloudBackupTime = when {
+        !userState.isSignedIn -> stringResource(R.string.not_signed_in)
+
+        isFetching -> stringResource(R.string.fetching_backup_time)
+
+        lastCloudBackupTime.isNotEmpty() ->
+            lastCloudBackupTime.split(" ").let { parts ->
+                val date = parts.getOrNull(0).orEmpty()
+                val time = parts.getOrNull(1).orEmpty()
+                "$date | $time"
+            }
+        else -> stringResource(R.string.none)
+    }
+
+    val formattedLastLocalBackupTime =
+        lastLocalBackupTime.split(" ").let { parts ->
+            val date = parts.getOrNull(0).orEmpty()
+            val time = parts.getOrNull(1).orEmpty()
+            "$date | $time"
+        }
+
     Column(modifier = modifier) {
         RoundedCornerCard(
             modifier = Modifier.fillMaxWidth(),
@@ -354,15 +381,15 @@ private fun LastBackupTimeCard(
             roundedCornerShape = CardCornerShape.MIDDLE_CARD,
             icon = painterResource(R.drawable.ic_mobile),
             title = stringResource(R.string.device_backup_local),
-            timeDescription = lastLocalBackupTime
+            timeDescription = formattedLastLocalBackupTime
         )
 
         TimeCard(
             modifier = Modifier.fillMaxWidth(),
             roundedCornerShape = CardCornerShape.LAST_CARD,
             icon = painterResource(R.drawable.ic_cloud_done),
             title = stringResource(R.string.cloud_backup_google_drive),
-            timeDescription = lastCloudBackupTime
+            timeDescription = perUserLastCloudBackupTime
         )
     }
 }
@@ -374,16 +401,8 @@ private fun TimeCard(
     roundedCornerShape: RoundedCornerShape,
     icon: Painter,
     title: String,
-    timeDescription: String
+    timeDescription: String,
 ) {
-
-    val (date, time) = (timeDescription).split(" ").let {
-        Pair(
-            it.getOrNull(0) ?: "",
-            it.getOrNull(1) ?: ""
-        )
-    }
-
     RoundedCornerCard(
         modifier = modifier,
         roundedCornerShape = roundedCornerShape
@@ -412,7 +431,7 @@ private fun TimeCard(
                 )
 
                 Text(
-                    text = if (timeDescription.isEmpty()) stringResource(R.string.none) else "$date | $time",
+                    text = timeDescription,
                     style = MaterialTheme.typography.bodySmall,
                     modifier = Modifier.alpha(0.9f)
                 )

app/src/main/java/in/hridayan/ashell/settings/presentation/page/backup/viewmodel/BackupAndRestoreViewModel.kt

@@ -64,6 +64,9 @@ class BackupAndRestoreViewModel @Inject constructor(
     private val _cloudBackupTime = MutableStateFlow<String?>(null)
     val cloudBackupTime: StateFlow<String?> = _cloudBackupTime.asStateFlow()
 
+    private val _isFetchingCloudBackupTime = MutableStateFlow(false)
+    val isFetchingCloudBackupTime: StateFlow<Boolean> = _isFetchingCloudBackupTime.asStateFlow()
+
     private val _showCloudRestoreConfirm = MutableStateFlow(false)
     val showCloudRestoreConfirm: StateFlow<Boolean> = _showCloudRestoreConfirm.asStateFlow()
 
@@ -157,7 +160,12 @@ class BackupAndRestoreViewModel @Inject constructor(
 
                     // Immediately request Drive scope so consent appears right after sign-in
                     Log.d(TAG, "signInWithGoogle: pre-authorizing Drive scope...")
-                    googleDriveRepository.ensureAuthorized()
+                    val authorized = googleDriveRepository.ensureAuthorized()
+
+                    if (authorized) {
+                        // This is done to show correct last backup time per Google account
+                        syncCloudBackupTimeSilently()
+                    }
                 },
                 onFailure = { error ->
                     Log.e(TAG, "signInWithGoogle: failed — ${error.message}")
@@ -196,6 +204,7 @@ class BackupAndRestoreViewModel @Inject constructor(
 
             null -> {
                 Log.d(TAG, "onConsentGranted: no pending operation to retry")
+                syncCloudBackupTimeSilently()
             }
         }
     }
@@ -286,6 +295,46 @@ class BackupAndRestoreViewModel @Inject constructor(
         }
     }
 
+    private fun syncCloudBackupTimeSilently() {
+        viewModelScope.launch {
+            Log.d(TAG, "syncCloudBackupTimeSilently: starting...")
+
+            _isFetchingCloudBackupTime.value = true
+
+            val result = googleDriveRepository.downloadBackup()
+
+            if (result == null) {
+                if (googleDriveRepository.isConsentPending) {
+                    Log.d(TAG, "syncCloudBackupTimeSilently: consent required, skipping for now")
+                    _isFetchingCloudBackupTime.value = false
+                    return@launch
+                }
+
+                Log.d(TAG, "syncCloudBackupTimeSilently: no backup found")
+                settingsRepository.setString(SettingsKeys.LAST_CLOUD_BACKUP_TIME, "")
+                _isFetchingCloudBackupTime.value = false
+                return@launch
+            }
+
+            val (bytes, _) = result
+
+            val time = backupAndRestoreRepository.getBackupTimeFromBytes(bytes)
+
+            if (time != null) {
+                Log.d(TAG, "syncCloudBackupTimeSilently: extracted time=$time")
+
+                settingsRepository.setString(
+                    SettingsKeys.LAST_CLOUD_BACKUP_TIME,
+                    time
+                )
+            } else {
+                Log.e(TAG, "syncCloudBackupTimeSilently: failed to extract time")
+            }
+
+            _isFetchingCloudBackupTime.value = false
+        }
+    }
+
     /** Step 2: User confirmed — apply the downloaded restore */
     fun confirmCloudRestore() {
         viewModelScope.launch {

app/src/main/res/values/strings.xml

@@ -303,6 +303,8 @@
     <string name="no_search_results_found">No search results found</string>
     <string name="no_wifi_connection">No WiFi connection</string>
     <string name="none">None</string>
+    <string name ="not_signed_in">Not signed in</string>
+    <string name="fetching_backup_time">Fetching backup time …</string>
     <string name="nothing_to_clear">Nothing to clear</string>
     <string name="nothing_to_search">Nothing to search</string>
     <string name="notification_access_not_granted">To complete the pairing process you will need to interact with a notification from aShell You. Please allow notification access to aShell You.</string>