olemd/med-det-samme
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions

Test backup: run every configured mechanism, stop misreporting passphrase-only as unconfigured

Browse source 
The user's report: with only a backup passphrase set (no S3), 'Test
backup nå' errored 'ikke konfigurert' even though Google Auto Backup
works on the passphrase alone. New runConfiguredBackups() writes the
Google blob whenever a passphrase exists and uploads to S3 only when
those credentials are present, throwing only when NOTHING is set up.
The toast now names what actually ran ('Kryptert Google-kopi
oppdatert' and/or the bucket key). Two instrumented tests pin both
ends: passphrase-only succeeds, nothing-configured throws.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Ole-Morten Duesund 2026-06-11 21:20:16 +02:00
commit 8e8156488a
3 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/no/naiv/meddetsamme/backup/BackupManager.kt
View file

@ -104,6 +104,26 @@ class BackupManager(private val context: Context) {
return key to s3.get(key)
}
/** What a "test backup now" actually accomplished, for an honest message. */
data class BackupOutcome(val cloudBlobWritten: Boolean, val s3Key: String?)
/**
* Run every backup mechanism that's actually set up, and report which ran.
* The Google blob needs only a passphrase; S3 needs the full credentials.
* Throws only when NOTHING is configured — so a passphrase-only setup no
* longer reports the misleading "not configured" error.
*/
suspend fun runConfiguredBackups(): BackupOutcome {
val settings = SettingsStore(context)
val hasPassphrase = !settings.autoBackupPassphrase.isNullOrEmpty()
require(hasPassphrase || settings.isBackupConfigured) { "Ingen sikkerhetskopi er satt opp" }
// Google Auto Backup blob: written whenever a passphrase exists.
writeCloudBlob()
val s3Key = if (settings.isBackupConfigured) runAutoBackup() else null
return BackupOutcome(cloudBlobWritten = hasPassphrase, s3Key = s3Key)
}
/**
* Unattended backup → S3. Encrypts with the STORED passphrase if one is
* configured (protects against bucket compromise only — see SettingsStore),

11
app/src/main/java/no/naiv/meddetsamme/ui/BackupSettingsScreen.kt
View file

@ -191,8 +191,15 @@ fun BackupSettingsScreen(nav: Nav) {
onClick = {
scope.launch(Dispatchers.IO) {
try {
val key = BackupManager(context).runAutoBackup()
withContext(Dispatchers.Main) { toast("Lastet opp: $key") }
val r = BackupManager(context).runConfiguredBackups()
val msg = buildString {
if (r.cloudBlobWritten) append("Kryptert Google-kopi oppdatert")
if (r.s3Key != null) {
if (isNotEmpty()) append("\n")
append("Lastet opp til bøtta: ${r.s3Key}")
}
}
withContext(Dispatchers.Main) { toast(msg) }
} catch (e: Exception) {
withContext(Dispatchers.Main) { toast("Backup feilet: ${e.message}") }
}