feat(phase-1/m2.2): desktop Import/Export — the phone bridge has a UI

Phase 1 M2 task 2 (tools/DESKTOP_PHASE_PLAN.md §4): :desktopApp can now
speak the phone's backup format through the extracted bridge.

- New BackupActions.kt: top-bar overflow menu (Import from file… /
  Export plain / Export encrypted). Import = AWT FileDialog ->
  BackupBridge.preview -> passphrase dialog on INCDBK1 (wrong passphrase
  stays open for retry) -> BackupPreview confirm dialog -> import.
  Export = save-picker -> exportPlain / passphrase + exportEncrypted.
  All heavy bridge calls run on Dispatchers.IO; results via Snackbar.
- Same package-level BackupBridge calls Android's BackupManager shim
  makes — format shared by construction, not reimplementation. Android's
  PassphraseDialog.kt deliberately NOT ported (M4 moves the real one to
  common code).
- :desktopApp gains implementation(:core:backup).
- Scripted headless path for CI: --backup-import/--backup-export drive
  the identical bridge calls without dialog clicking.

Verification passed: :desktopApp:run --args="--data-dir /tmp/...
--backup-import <real phone export> --backup-export /tmp/m2t4-exp.json
--exit-after 8" (preview 27 / imported 27 / exported 27, clean exit) +
:core:data-jvm:backupSmoke on the DESKTOP-written export (all PASS) +
python cross-check: notes (createdAt,updatedAt,content) and attachment
Base64 identical phone->desktop->phone + assembleDebug +
:core:data-jvm:smoke + :desktopApp:run --self-test — all green.
Output recorded in DESKTOP_FEASIBILITY.md (incl. one unreproduced
first-run exit hang to watch in M5).
This commit is contained in:
Incido Developer committed 2026-10-05 19:23:47 +13:00
1 parent 8facbe718b
commit cf0e74b68d
4 files changed
+385

No files matched your search

@@ -24,6 +24,8 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -42,8 +44,11 @@ import androidx.compose.ui.window.Window
import androidx.compose.ui.window.application
import androidx.compose.ui.window.rememberWindowState
import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.incido.compose.data.backup.BackupBridge
import org.incido.domain.model.Note
import org.incido.domain.repository.NoteRepository
@@ -72,6 +77,10 @@ fun main(args: Array<String>) {
// Headless end-to-end check: write a note from inside the composition and
// watch it come back through observeAll(). Used by the M1b smoke run.
val selfTest = "--self-test" in args
// M2 scripted backup round-trip: drive the same BackupBridge calls the
// Import/Export menu makes, without clicking through native dialogs.
val backupImport = args.argAfter("--backup-import")
val backupExport = args.argAfter("--backup-export")
println("=== Incido (desktop) — Phase 1 M1b ===")
println("JVM : ${System.getProperty("java.vendor")} ${System.getProperty("java.version")}")
@@ -89,6 +98,8 @@ fun main(args: Array<String>) {
repository = app.repository,
exitAfterSeconds = exitAfterSeconds,
selfTest = selfTest,
backupImport = backupImport,
backupExport = backupExport,
onExit = ::exitApplication,
)
}
@@ -103,22 +114,28 @@ private fun NotesWindow(
repository: NoteRepository,
exitAfterSeconds: Long?,
selfTest: Boolean,
backupImport: String?,
backupExport: String?,
onExit: () -> Unit,
) {
val notes by remember(repository) { repository.observeAll() }
.collectAsState(initial = emptyList())
var selectedId by remember { mutableStateOf<Long?>(null) }
val scope = rememberCoroutineScope()
val snackbar = remember { SnackbarHostState() }
// Keep a valid selection as the library changes.
val selected = notes.firstOrNull { it.id == selectedId } ?: notes.firstOrNull()
MaterialTheme {
Scaffold(
snackbarHost = { SnackbarHost(snackbar) },
topBar = {
CenterAlignedTopAppBar(
title = { Text("Incido") },
actions = {
// M2: the phone bridge lives here (Import…/Export).
BackupActions(repository = repository, snackbar = snackbar)
IconButton(
onClick = {
scope.launch {
@@ -202,6 +219,24 @@ private fun NotesWindow(
println("SELFTEST wrote note id=${saved.id}")
}
}
if (backupImport != null) {
LaunchedEffect(Unit) {
delay(800) // mirror the self-test pacing; wait past first frame
val file = File(backupImport)
val preview = BackupBridge.preview(FileInputStream(file))
println(
"BACKUP preview notes=${preview?.noteCount} " +
"attachments=${preview?.attachmentCount} app=${preview?.appVersion}",
)
val imported = BackupBridge.import(repository, FileInputStream(file))
println("BACKUP imported=$imported (same calls as the Import… menu)")
if (backupExport != null) {
val out = File(backupExport)
val exported = BackupBridge.exportPlain(repository, FileOutputStream(out), DESKTOP_APP_VERSION)
println("BACKUP exported=$exported notes to $out")
}
}
}
if (exitAfterSeconds != null) {
LaunchedEffect(Unit) {
delay(exitAfterSeconds * 1000)