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.

feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/LogPage.kt

@@ -68,7 +68,6 @@ import com.rtbishop.look4sat.core.presentation.sheetDialogContainerColor
 import com.rtbishop.look4sat.core.presentation.sheetDialogShape
 import com.rtbishop.look4sat.core.presentation.gridsLabel
 import com.rtbishop.look4sat.core.presentation.LoTWPositionWarningDialog
-import com.rtbishop.look4sat.core.presentation.WavelogUploadPreviewDialog
 
 @Composable
 fun LogPage(
@@ -215,14 +214,7 @@ fun LogPage(
                 modifier = Modifier.weight(1f)
             ) { Text("上传 LoTW", fontSize = 13.sp) }
         }
-        Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) {
-            OutlinedButton(
-                onClick = logViewModel::prepareWavelogUpload,
-                enabled = !logUiState.busy && !logUiState.wavelogBusy,
-                modifier = Modifier.weight(1f)
-            ) { Text("上传 Wavelog", fontSize = 13.sp) }
-        }
-        if (logUiState.busy || logUiState.wavelogBusy) {
+        if (logUiState.busy) {
             Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                 CircularProgressIndicator(modifier = Modifier.padding(4.dp), strokeWidth = 2.dp)
                 Text("Working…", fontSize = 13.sp)
@@ -268,21 +260,13 @@ fun LogPage(
             UploadPreviewDialog(
                 preview = preview,
                 busy = logUiState.busy,
+                wavelogCount = logUiState.wavelogPending?.count ?: 0,
                 onConfirm = logViewModel::confirmUpload,
                 onDismiss = logViewModel::dismissPreview
             )
         }
     }
 
-    logUiState.wavelogPreview?.let { preview ->
-        WavelogUploadPreviewDialog(
-            preview = preview,
-            busy = logUiState.wavelogBusy,
-            onConfirm = logViewModel::confirmWavelogUpload,
-            onDismiss = logViewModel::dismissWavelogPreview
-        )
-    }
-
     if (logUiState.message.isNotBlank()) {
         AlertDialog(
             onDismissRequest = logViewModel::clearMessage,
@@ -296,19 +280,6 @@ fun LogPage(
         )
     }
 
-    if (logUiState.wavelogMessage.isNotBlank()) {
-        AlertDialog(
-            onDismissRequest = logViewModel::clearWavelogMessage,
-            shape = sheetDialogShape(),
-            containerColor = sheetDialogContainerColor(),
-            title = { SheetDialogTitle("Wavelog Upload") },
-            text = { Text(logUiState.wavelogMessage) },
-            confirmButton = {
-                TextButton(onClick = logViewModel::clearWavelogMessage) { Text("OK") }
-            }
-        )
-    }
-
     // Out-of-window notice: the clock is outside the current pass [aos, los], so the record
     // would never show in the window-filtered list. Confirm first, then store it at the pass
     // midpoint (there is always an edit dialog afterwards for the exact time).
@@ -436,6 +407,7 @@ private fun PostDialog(
 private fun UploadPreviewDialog(
     preview: com.rtbishop.look4sat.core.domain.repository.LoTWUploadPreview,
     busy: Boolean,
+    wavelogCount: Int = 0,
     onConfirm: () -> Unit,
     onDismiss: () -> Unit
 ) {
@@ -484,6 +456,13 @@ private fun UploadPreviewDialog(
                     }
                     Text(parts.joinToString(" · "), fontSize = 12.sp, color = MaterialTheme.colorScheme.error)
                 }
+                if (wavelogCount > 0) {
+                    Text(
+                        "同时同步 Wavelog：$wavelogCount 条",
+                        fontSize = 12.sp,
+                        color = MaterialTheme.colorScheme.primary
+                    )
+                }
                 Text(preview.contacts.joinToString("\n") { it }, fontSize = 12.sp, maxLines = 8)
             }
         },

feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/LogViewModel.kt

@@ -18,13 +18,14 @@ import com.rtbishop.look4sat.core.domain.logbook.QsoRecord
 import com.rtbishop.look4sat.core.domain.logbook.QsoStatus
 import com.rtbishop.look4sat.core.domain.logbook.displayMode
 import com.rtbishop.look4sat.core.domain.logbook.frequencyBand
-import com.rtbishop.look4sat.core.domain.logbook.label
 import com.rtbishop.look4sat.core.domain.logbook.officialSatelliteName
 import com.rtbishop.look4sat.core.domain.logbook.satelliteIdentity
 import com.rtbishop.look4sat.core.domain.logbook.unavailableUploadSummary
-import com.rtbishop.look4sat.core.domain.logbook.wavelogResultMessage
-import com.rtbishop.look4sat.core.domain.logbook.wavelogSkipSummary
+import com.rtbishop.look4sat.core.domain.logbook.wavelogConfirmedSegment
+import com.rtbishop.look4sat.core.domain.logbook.wavelogIdleSegment
+import com.rtbishop.look4sat.core.domain.logbook.wavelogTransportFailureSegment
 import com.rtbishop.look4sat.core.domain.logbook.wavelogUploadCandidates
+import com.rtbishop.look4sat.core.domain.model.WavelogUploadSettings
 import com.rtbishop.look4sat.core.domain.repository.ILoTWUploadRepository
 import com.rtbishop.look4sat.core.domain.repository.IMainContainer
 import com.rtbishop.look4sat.core.domain.repository.ISettingsRepo
@@ -85,10 +86,9 @@ data class LogUiState(
     val message: String = "",
     val postText: String? = null,
     val busy: Boolean = false,
-    /** Wavelog upload: prepared preview awaiting confirmation / user-facing message / busy flag. */
-    val wavelogPreview: WavelogUploadPreview? = null,
-    val wavelogMessage: String = "",
-    val wavelogBusy: Boolean = false,
+    /** Wavelog piggyback: batch prepared alongside the LoTW preview (see prepareUpload);
+     *  uploaded right after a confirmed LoTW upload. Null when Wavelog is not ready. */
+    val wavelogPending: WavelogUploadPreview? = null,
     /** Out-of-window contact waiting for the operator's confirmation (null when closed). */
     val outOfWindowLog: OutOfWindowLog? = null
 )
@@ -272,6 +272,16 @@ class LogViewModel(
                 // LoTW-imported confirmations are the feedback side.
                 val pending = all.filter { !it.lotwConfirmed && !it.lotwUploaded && it.status == QsoStatus.COMPLETE }
                 val audit = lotwUploadRepository.audit(pending)
+                // Wavelog piggyback (option A): prepare its batch while we are here, so
+                // the LoTW preview can show the count and confirm can post it directly.
+                val wavelogSettings = settingsRepo.wavelogUploadSettings.value
+                val wavelogPreview = if (wavelogSettings.isReady) {
+                    runCatching {
+                        wavelogUploadRepository.prepare(wavelogUploadCandidates(all), wavelogSettings)
+                    }.getOrNull()
+                } else {
+                    null
+                }
                 if (audit.pending == 0) {
                     val msg = when {
                         audit.unavailable > 0 -> unavailableUploadSummary(
@@ -281,7 +291,14 @@ class LogViewModel(
                         audit.unknown > 0 -> "${audit.unknown} QSO(s) had an unknown upload result — not retried automatically"
                         else -> "No pending QSOs to upload"
                     }
-                    _uiState.update { it.copy(busy = false, message = msg) }
+                    // No LoTW work to do — still flush the Wavelog backlog (catch-up): a
+                    // freshly configured Wavelog syncs without waiting for new QSOs.
+                    val wavelogMsg = wavelogPreview?.let {
+                        if (it.count > 0) uploadWavelogNow(it, wavelogSettings) else wavelogIdleSegment(it)
+                    }
+                    _uiState.update {
+                        it.copy(busy = false, message = listOfNotNull(msg, wavelogMsg).joinToString("\n"))
+                    }
                     return@launch
                 }
                 val preview = lotwUploadRepository.prepare(pending, false)
@@ -292,6 +309,7 @@ class LogViewModel(
                     it.copy(
                         busy = false,
                         preview = preview,
+                        wavelogPending = wavelogPreview,
                         uploadPositionWarning = positionWarning(settingsRepo.getCurrentGrid(), preview.grids)
                     )
                 }
@@ -320,58 +338,41 @@ class LogViewModel(
                 LoTWUploadResult.Unknown -> "Unknown result — will not auto-retry"
                 LoTWUploadResult.ExpiredPreview -> "Preview expired — tap upload again"
             }
-            _uiState.update { it.copy(busy = false, preview = null, message = msg) }
-        }
-    }
-
-    fun dismissPreview() = _uiState.update { it.copy(preview = null) }
-
-    fun prepareWavelogUpload() {
-        if (_uiState.value.wavelogBusy) return
-        viewModelScope.launch {
-            _uiState.update { it.copy(wavelogBusy = true, wavelogMessage = "") }
-            try {
-                val pending = wavelogUploadCandidates(qsoRepository.records.first())
-                val preview = wavelogUploadRepository.prepare(pending, settingsRepo.wavelogUploadSettings.value)
-                if (preview.count == 0) {
-                    val blocked = preview.blockedBy
-                    val message = when {
-                        blocked != null -> blocked.label()
-                        preview.skipped > 0 -> wavelogSkipSummary(preview)
-                        else -> "No pending QSOs to upload"
-                    }
-                    _uiState.update { it.copy(wavelogBusy = false, wavelogMessage = message) }
-                    return@launch
-                }
-                _uiState.update { it.copy(wavelogBusy = false, wavelogPreview = preview) }
-            } catch (_: Exception) {
-                _uiState.update { it.copy(wavelogBusy = false, wavelogMessage = "Upload failed") }
+            // Wavelog piggyback: rides the same confirmation, independent of the LoTW
+            // outcome — a Wavelog failure leaves records unmarked for the next upload.
+            val wavelogPending = _uiState.value.wavelogPending
+            val wavelogMsg = wavelogPending?.let { wl ->
+                if (wl.count > 0) uploadWavelogNow(wl, settingsRepo.wavelogUploadSettings.value)
+                else wavelogIdleSegment(wl)
+            }
+            _uiState.update {
+                it.copy(
+                    busy = false, preview = null, wavelogPending = null,
+                    message = listOfNotNull(msg, wavelogMsg).joinToString("\n")
+                )
             }
         }
     }
 
-    fun confirmWavelogUpload() {
-        val preview = _uiState.value.wavelogPreview ?: return
-        viewModelScope.launch {
-            _uiState.update { it.copy(wavelogBusy = true) }
-            try {
-                val result = wavelogUploadRepository.upload(preview, settingsRepo.wavelogUploadSettings.value)
-                if (result is WavelogUploadOutcome.Imported && result.markIds.isNotEmpty()) {
-                    qsoRepository.markWavelogUploaded(result.markIds)
-                }
-                _uiState.update {
-                    it.copy(wavelogBusy = false, wavelogPreview = null, wavelogMessage = wavelogResultMessage(result))
-                }
-            } catch (_: Exception) {
-                _uiState.update { it.copy(wavelogBusy = false, wavelogPreview = null, wavelogMessage = "Upload failed") }
-            }
+    fun dismissPreview() = _uiState.update { it.copy(preview = null, wavelogPending = null) }
+
+    /**
+     * Uploads one prepared Wavelog batch (piggyback) and marks what the server
+     * accepted. Returns the operator-facing message segment for this upload.
+     */
+    private suspend fun uploadWavelogNow(
+        preview: WavelogUploadPreview,
+        settings: WavelogUploadSettings
+    ): String = try {
+        val outcome = wavelogUploadRepository.upload(preview, settings)
+        if (outcome is WavelogUploadOutcome.Imported && outcome.markIds.isNotEmpty()) {
+            qsoRepository.markWavelogUploaded(outcome.markIds)
         }
+        wavelogConfirmedSegment(outcome, preview)
+    } catch (_: Exception) {
+        wavelogTransportFailureSegment()
     }
 
-    fun dismissWavelogPreview() = _uiState.update { it.copy(wavelogPreview = null) }
-
-    fun clearWavelogMessage() = _uiState.update { it.copy(wavelogMessage = "") }
-
     /** Operator chose "ignore" on the position check: keep the prepared preview. */
     fun ignorePositionWarning() = _uiState.update { it.copy(uploadPositionWarning = null) }
 
@@ -379,7 +380,7 @@ class LogViewModel(
     fun abandonForGridFix() {
         lotwUploadRepository.discardPreview()
         lastUploadedIds = emptyList()
-        _uiState.update { it.copy(uploadPositionWarning = null, preview = null) }
+        _uiState.update { it.copy(uploadPositionWarning = null, preview = null, wavelogPending = null) }
     }
 
     /** Recompute the log-page roaming hint from the freshest station/position data. */