From bc10cd0d030e2609df5cb59272d02d7b4e05aae4 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 26 Jun 2025 14:26:18 -0300
Subject: [PATCH] Add check for <= 0  time duration for Never case.

---
 .../app/backups/BackupsSettingsFragment.kt       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
index 2adeb6a92a..f6601cd6f2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
@@ -446,14 +446,20 @@ private fun ActiveBackupsRow(
           }
         }
 
+        val lastBackupString = if (lastBackupAt.inWholeMilliseconds > 0) {
+          DateUtils.getDatelessRelativeTimeSpanFormattedDate(
+            LocalContext.current,
+            Locale.getDefault(),
+            lastBackupAt.inWholeMilliseconds
+          ).value
+        } else {
+          stringResource(R.string.RemoteBackupsSettingsFragment__never)
+        }
+
         Text(
           text = stringResource(
             R.string.BackupsSettingsFragment_last_backup_s,
-            DateUtils.getDatelessRelativeTimeSpanFormattedDate(
-              LocalContext.current,
-              Locale.getDefault(),
-              lastBackupAt.inWholeMilliseconds
-            ).value
+            lastBackupString
           ),
           color = MaterialTheme.colorScheme.onSurfaceVariant,
           style = MaterialTheme.typography.bodyMedium