feat(wavelog): upload rides the LoTW flow — auto-sync + catch-up (option A)

Standalone Wavelog upload entries are gone: the batch is prepared alongside the LoTW preview (count shown in both preview dialogs), posted right after the LoTW confirm in the radar, settings-logbook and resubmit flows, and the backlog flushes when LoTW has nothing pending. Failures stay unmarked and retry on the next upload.

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/logbook/WavelogUploadMessages.kt

@@ -56,11 +56,35 @@ fun wavelogResultMessage(result: WavelogUploadOutcome): String = when (result) {
             append("All ${result.markIds.size} record(s) already in Wavelog")
         } else {
             append("Uploaded ${result.imported} QSO(s) to Wavelog")
+            if (result.duplicates > 0) append(" — ${result.duplicates} already there")
         }
-        if (result.duplicates > 0) append(" — ${result.duplicates} already there")
         if (result.skipped > 0) append(" — ${result.skipped} skipped by Wavelog")
     }
     is WavelogUploadOutcome.Rejected -> result.message
     is WavelogUploadOutcome.Failed -> result.message
     WavelogUploadOutcome.Expired -> "Preview expired — tap upload again"
 }
+
+/**
+ * Message for the piggybacked Wavelog side when nothing can be submitted —
+ * null when there is nothing to say (fully caught up, no held-back records).
+ */
+fun wavelogIdleSegment(preview: WavelogUploadPreview): String? = when {
+    preview.blockedBy != null -> "Wavelog: ${preview.blockedBy.label()}"
+    preview.skipped > 0 -> "Wavelog: ${wavelogSkipSummary(preview)}"
+    else -> null
+}
+
+/**
+ * Message for a finished piggybacked Wavelog upload: the server outcome plus
+ * the records held back before the POST (e.g. grids outside the station profile).
+ */
+fun wavelogConfirmedSegment(outcome: WavelogUploadOutcome, preview: WavelogUploadPreview): String {
+    val base = wavelogResultMessage(outcome)
+    val head = if (outcome is WavelogUploadOutcome.Imported) base else "Wavelog: $base"
+    val skip = wavelogSkipSummary(preview)
+    return if (skip.isNotBlank()) "$head\n$skip" else head
+}
+
+/** Message when the piggybacked upload threw outright — records stay unmarked for retry. */
+fun wavelogTransportFailureSegment(): String = "Wavelog: upload failed — it will retry with your next upload"

core/domain/src/test/java/com/rtbishop/look4sat/core/domain/logbook/WavelogUploadMessagesTest.kt

@@ -11,7 +11,10 @@
 package com.rtbishop.look4sat.core.domain.logbook
 
 import com.rtbishop.look4sat.core.domain.repository.WavelogProblem
+import com.rtbishop.look4sat.core.domain.repository.WavelogUploadOutcome
+import com.rtbishop.look4sat.core.domain.repository.WavelogUploadPreview
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
 
@@ -32,6 +35,23 @@ class WavelogUploadMessagesTest {
         wavelogUploaded = wavelogUploaded
     )
 
+    private fun preview(
+        count: Int = 0,
+        skipped: Int = 0,
+        reasons: Map<WavelogProblem, Int> = emptyMap(),
+        blockedBy: WavelogProblem? = null
+    ) = WavelogUploadPreview(
+        count = count,
+        skipped = skipped,
+        reasons = reasons,
+        stationLabel = "OL62TI · BA7OPF",
+        firstUtc = "",
+        lastUtc = "",
+        contacts = emptyList(),
+        submittedIds = List(count) { it.toLong() },
+        blockedBy = blockedBy
+    )
+
     @Test
     fun freshLocalRecordIsEligible() {
         assertTrue(wavelogUploadCandidates(listOf(record())).isNotEmpty())
@@ -62,4 +82,60 @@ class WavelogUploadMessagesTest {
         assertEquals("no station profile selected", WavelogProblem.NO_STATION.label())
         assertEquals("logged grid outside the Wavelog station grid", WavelogProblem.GRID_MISMATCH.label())
     }
+
+    // --- Piggyback segments (Wavelog rides the LoTW upload flow) ---
+
+    @Test
+    fun `idle segment stays silent when nothing was held back`() {
+        assertNull(wavelogIdleSegment(preview()))
+        assertNull(wavelogIdleSegment(preview(count = 0, skipped = 0)))
+    }
+
+    @Test
+    fun `idle segment explains a blocked profile`() {
+        assertEquals(
+            "Wavelog: no station profile selected",
+            wavelogIdleSegment(preview(blockedBy = WavelogProblem.NO_STATION))
+        )
+    }
+
+    @Test
+    fun `idle segment lists held-back records with reasons`() {
+        assertEquals(
+            "Wavelog: 3 QSO(s) skipped — 3× logged grid outside the Wavelog station grid",
+            wavelogIdleSegment(preview(skipped = 3, reasons = mapOf(WavelogProblem.GRID_MISMATCH to 3)))
+        )
+    }
+
+    @Test
+    fun `confirmed segment reports the outcome and pre-POST skips`() {
+        val outcome = WavelogUploadOutcome.Imported(imported = 2, duplicates = 0, skipped = 0, markIds = listOf(1, 2))
+        assertEquals("Uploaded 2 QSO(s) to Wavelog", wavelogConfirmedSegment(outcome, preview()))
+        assertEquals(
+            "Uploaded 2 QSO(s) to Wavelog\n1 QSO(s) skipped — 1× logged grid outside the Wavelog station grid",
+            wavelogConfirmedSegment(
+                outcome,
+                preview(skipped = 1, reasons = mapOf(WavelogProblem.GRID_MISMATCH to 1))
+            )
+        )
+    }
+
+    @Test
+    fun `confirmed segment keeps the all-duplicates wording unprefixed`() {
+        val outcome = WavelogUploadOutcome.Imported(imported = 0, duplicates = 2, skipped = 0, markIds = listOf(1, 2))
+        assertEquals("All 2 record(s) already in Wavelog", wavelogConfirmedSegment(outcome, preview()))
+    }
+
+    @Test
+    fun `confirmed segment prefixes failures with Wavelog`() {
+        assertEquals("Wavelog: boom", wavelogConfirmedSegment(WavelogUploadOutcome.Failed("boom"), preview()))
+    }
+
+    @Test
+    fun `transport failure segment asks for a retry on the next upload`() {
+        assertEquals(
+            "Wavelog: upload failed — it will retry with your next upload",
+            wavelogTransportFailureSegment()
+        )
+    }
 }

core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/WavelogUploadPreviewDialog.kt

@@ -1,69 +0,0 @@
-/*
- * Look4Sat-BA7OPF. Amateur radio satellite tracker and pass predictor.
- * Copyright (C) 2026 BA7OPF.
- * Based on Look4Sat by Arty Bishop and contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.rtbishop.look4sat.core.presentation
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.rtbishop.look4sat.core.domain.logbook.wavelogSkipSummary
-import com.rtbishop.look4sat.core.domain.repository.WavelogUploadPreview
-
-/**
- * Confirmation dialog shown before a Wavelog upload goes out: what will be submitted,
- * and which records were held back (e.g. grids the Wavelog station profile would skip).
- */
-@Composable
-fun WavelogUploadPreviewDialog(
-    preview: WavelogUploadPreview,
-    busy: Boolean,
-    onConfirm: () -> Unit,
-    onDismiss: () -> Unit
-) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        shape = sheetDialogShape(),
-        containerColor = sheetDialogContainerColor(),
-        title = { SheetDialogTitle("上传到 Wavelog") },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                if (preview.stationLabel.isNotBlank()) {
-                    Text(preview.stationLabel, fontSize = 13.sp)
-                }
-                Text("${preview.count} QSO(s) · ${preview.firstUtc} – ${preview.lastUtc}", fontSize = 13.sp)
-                val skipText = wavelogSkipSummary(preview)
-                if (skipText.isNotBlank()) {
-                    Text(skipText, fontSize = 12.sp, color = MaterialTheme.colorScheme.error)
-                }
-                Text(preview.contacts.joinToString("\n"), fontSize = 12.sp, maxLines = 8)
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = onConfirm, enabled = !busy) { Text("确认上传") }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) { Text("Cancel") }
-        }
-    )
-}

core/presentation/src/main/res/values-zh/strings.xml

@@ -211,8 +211,7 @@
     <string name="prefs_logbook_selected">已选 %1$d 条</string>
     <string name="prefs_logbook_select_hint">长按记录行可多选重传</string>
     <string name="prefs_logbook_resubmit_note">已上传记录将按当前台址就地更新；已被奖项使用的旧网格可能被拒绝。</string>
-    <string name="prefs_logbook_wavelog_upload">上传 Wavelog</string>
-    <string name="prefs_logbook_wavelog_upload_confirm">确认上传</string>
+    <string name="prefs_logbook_wavelog_sync">同时同步 Wavelog：%1$d 条</string>
     <string name="lotw_upload_grid_title">上传前核对</string>
     <string name="lotw_upload_grid_fix">修改台址</string>
     <string name="lotw_upload_grid_ignore">忽略</string>

core/presentation/src/main/res/values/strings.xml

@@ -240,8 +240,7 @@
     <string name="prefs_logbook_selected">%1$d selected</string>
     <string name="prefs_logbook_select_hint">Long-press a row to re-upload corrected records</string>
     <string name="prefs_logbook_resubmit_note">Existing contacts will be updated in place — a grid already used for an award may be rejected.</string>
-    <string name="prefs_logbook_wavelog_upload">Upload to Wavelog</string>
-    <string name="prefs_logbook_wavelog_upload_confirm">Upload</string>
+    <string name="prefs_logbook_wavelog_sync">Also syncs to Wavelog: %1$d QSO(s)</string>
     <string name="lotw_upload_grid_title">Upload check</string>
     <string name="lotw_upload_grid_fix">Fix station location</string>
     <string name="lotw_upload_grid_ignore">Ignore</string>