feat: send diagnostic reports to support

androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidFileSyncScheduler.kt

@@ -30,17 +30,20 @@ internal class AndroidFileSyncSessionSchedulingGuard {
     fun <Session> restorePersistedSession(
         load: () -> Session?,
         accountIdOf: (Session) -> String,
+        publishAccount: (Session?, String?) -> Unit = { _, _ -> },
     ): Session? = synchronized(monitor) {
         val restored = load()
         if (restored == null) {
             if (accountId != null) generation += 1
             accountId = null
+            publishAccount(null, null)
         } else {
             val restoredAccountId = accountIdOf(restored)
             if (accountId != null && accountId != restoredAccountId) {
                 generation += 1
             }
             accountId = restoredAccountId
+            publishAccount(restored, restoredAccountId)
         }
         restored
     }
@@ -49,6 +52,7 @@ internal class AndroidFileSyncSessionSchedulingGuard {
         replacementAccountId: String,
         persist: () -> Unit,
         cancelAll: () -> Unit,
+        publishAccount: (String) -> Unit = {},
     ) {
         synchronized(monitor) {
             val accountChanged = accountId != replacementAccountId
@@ -57,6 +61,7 @@ internal class AndroidFileSyncSessionSchedulingGuard {
             try {
                 persist()
                 accountId = replacementAccountId
+                publishAccount(replacementAccountId)
             } finally {
                 if (accountChanged) cancelAll()
             }
@@ -66,12 +71,14 @@ internal class AndroidFileSyncSessionSchedulingGuard {
     fun clearSession(
         persist: () -> Unit,
         cancelAll: () -> Unit,
+        clearPublishedAccount: () -> Unit = {},
     ) {
         synchronized(monitor) {
             generation += 1
             accountId = null
             try {
                 persist()
+                clearPublishedAccount()
             } finally {
                 cancelAll()
             }

androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidNextcloudServices.kt

@@ -107,6 +107,7 @@ import dev.obiente.nextcloudnative.app.SupportDiagnosticEventDraft
 import dev.obiente.nextcloudnative.app.SupportDiagnosticFieldDraft
 import dev.obiente.nextcloudnative.app.SupportDiagnosticSeverity
 import dev.obiente.nextcloudnative.app.SupportDiagnosticValuePrivacy
+import dev.obiente.nextcloudnative.app.SupportDiagnosticsDeletionResult
 import dev.obiente.nextcloudnative.app.SupportDiagnosticsExportResult
 import dev.obiente.nextcloudnative.app.SupportDiagnosticsSummary
 import dev.obiente.nextcloudnative.app.JvmNetworkRequestAttempt
@@ -416,6 +417,11 @@ internal class AndroidNextcloudServices(
         activity = activity,
         diagnostics = supportDiagnostics,
     )
+    private val supportIntake = AndroidSupportIntakeCoordinator.get(
+        context = appContext,
+        diagnostics = supportDiagnostics,
+        client = httpClient,
+    )
 
     init {
         supportDiagnostics.registerPrivateValue(System.getProperty("user.home"))
@@ -615,14 +621,33 @@ internal class AndroidNextcloudServices(
         reproductionSteps: String,
     ): SupportDiagnosticsExportResult = supportBundleExporter.export(
         reproductionSteps = reproductionSteps,
-        featureState = listOf(
+        featureState = supportDiagnosticFeatureState(),
+    )
+
+    override fun supportDiagnosticsSubmissionStates() = supportIntake.states()
+
+    override suspend fun submitSupportDiagnostics(reproductionSteps: String) = supportIntake.submit(
+        reproductionSteps = reproductionSteps,
+        channel = appUpdateSupport().channel.name.lowercase(),
+        featureState = supportDiagnosticFeatureState(),
+    )
+
+    override suspend fun retrySupportDiagnosticsSubmission() = supportIntake.retry()
+
+    override suspend fun cancelSupportDiagnosticsSubmission(): Boolean = supportIntake.cancel()
+
+    override suspend fun deleteSubmittedSupportDiagnosticsReport(
+        deletionUrl: String,
+    ): SupportDiagnosticsDeletionResult = supportIntake.deleteCompletedReport(deletionUrl)
+
+    private fun supportDiagnosticFeatureState(): List<SupportDiagnosticFieldDraft> =
+        listOf(
             SupportDiagnosticFieldDraft("distribution", appUpdateSupport().channel.name.lowercase()),
             SupportDiagnosticFieldDraft("direct_updates", appUpdateSupport().canCheckDirectUpdates.toString()),
             SupportDiagnosticFieldDraft("virtual_files_supported", supportsVirtualFileStorage.toString()),
             SupportDiagnosticFieldDraft("bidirectional_sync", supportsBidirectionalFileSync.toString()),
             SupportDiagnosticFieldDraft("network_metered", isAndroidActiveNetworkMetered(appContext).toString()),
-        ),
-    )
+        )
 
     override suspend fun clearSupportDiagnostics(): Boolean = supportDiagnostics.clear()
 
@@ -724,10 +749,12 @@ internal class AndroidNextcloudServices(
                 }.getOrNull()
             },
             accountIdOf = NextcloudDocumentIds::accountKey,
-        )?.also { session ->
-            registerSessionPrivateValues(session)
-            supportDiagnostics.setActiveAccountIdentity(NextcloudDocumentIds.accountKey(session))
-        }
+            publishAccount = { session, accountIdentity ->
+                session?.let(::registerSessionPrivateValues)
+                supportDiagnostics.setActiveAccountIdentity(accountIdentity)
+                supportIntake.setActiveAccountIdentity(accountIdentity)
+            },
+        )
     }
 
     override suspend fun saveSession(session: NextcloudSession) {
@@ -762,11 +789,14 @@ internal class AndroidNextcloudServices(
                     .apply()
             },
             cancelAll = scheduler::cancelAll,
+            publishAccount = { accountIdentity ->
+                supportDiagnostics.setActiveAccountIdentity(accountIdentity)
+                supportIntake.setActiveAccountIdentity(accountIdentity)
+            },
         )
         if (previousAccountId != null && previousAccountId != replacementAccountId) {
             nativeMediaPreviewCache.clearAccount(previousAccountId)
         }
-        supportDiagnostics.setActiveAccountIdentity(NextcloudDocumentIds.accountKey(session))
         notifyDocumentsRootsChanged()
     }
 
@@ -803,10 +833,13 @@ internal class AndroidNextcloudServices(
                         .apply()
                 },
                 cancelAll = scheduler::cancelAll,
+                clearPublishedAccount = {
+                    supportDiagnostics.setActiveAccountIdentity(null)
+                    supportIntake.setActiveAccountIdentity(null)
+                },
             )
             accountId?.let(nativeMediaPreviewCache::clearAccount)
             notifyDocumentsRootsChanged()
-            supportDiagnostics.setActiveAccountIdentity(null)
         } catch (failure: Throwable) {
             recordSupportDiagnostic(
                 SupportDiagnosticEventDraft(

androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidSupportDiagnostics.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.content.FileProvider
 import dev.obiente.nextcloudnative.app.AsyncJvmSupportDiagnostics
+import dev.obiente.nextcloudnative.app.JvmSupportIntake
 import dev.obiente.nextcloudnative.app.SupportDiagnosticComponent
 import dev.obiente.nextcloudnative.app.SupportDiagnosticEventDraft
 import dev.obiente.nextcloudnative.app.SupportDiagnosticFieldDraft
@@ -18,6 +19,7 @@ import java.util.UUID
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
 import kotlin.system.exitProcess
 
 private val UNCAUGHT_DIAGNOSTIC_HANDLER_INSTALLED = AtomicBoolean(false)
@@ -62,18 +64,48 @@ internal object AndroidSupportDiagnostics {
         val appContext = context.applicationContext ?: context
         instance ?: AsyncJvmSupportDiagnostics(
             root = File(appContext.filesDir, "support-diagnostics"),
-            environment = SupportDiagnosticsEnvironment(
-                appVersion = BuildConfig.VERSION_NAME,
-                packageVersion = BuildConfig.VERSION_CODE.toString(),
-                platform = "Android",
-                operatingSystemVersion = android.os.Build.VERSION.RELEASE.orEmpty(),
-                architecture = android.os.Build.SUPPORTED_ABIS.firstOrNull().orEmpty(),
-            ),
+            environment = androidSupportDiagnosticsEnvironment(),
             workerName = "nextcloud-support-diagnostics",
         ).also { instance = it }
     }
 }
 
+/**
+ * Owns the one durable support-submission state machine for this Android process.
+ *
+ * Activities, workers, and providers each create their own service facade, but they all operate on
+ * the same no-backup directory. Sharing the coordinator prevents a replacement facade from
+ * restoring or mutating that directory while an earlier facade is still packaging or uploading.
+ */
+internal object AndroidSupportIntakeCoordinator {
+    @Volatile
+    private var instance: JvmSupportIntake? = null
+
+    fun get(
+        context: Context,
+        diagnostics: AsyncJvmSupportDiagnostics,
+        client: OkHttpClient,
+    ): JvmSupportIntake = instance ?: synchronized(this) {
+        val appContext = context.applicationContext ?: context
+        instance ?: JvmSupportIntake(
+            diagnostics = diagnostics,
+            temporaryRoot = File(appContext.noBackupFilesDir, "support-submissions"),
+            environment = androidSupportDiagnosticsEnvironment(),
+            client = client.newBuilder().retryOnConnectionFailure(false).build(),
+            supportMutationsAllowed = appContext.cloudMutationGate(),
+        ).also { instance = it }
+    }
+}
+
+internal fun androidSupportDiagnosticsEnvironment(): SupportDiagnosticsEnvironment =
+    SupportDiagnosticsEnvironment(
+        appVersion = BuildConfig.VERSION_NAME,
+        packageVersion = BuildConfig.VERSION_CODE.toString(),
+        platform = "Android",
+        operatingSystemVersion = android.os.Build.VERSION.RELEASE.orEmpty(),
+        architecture = android.os.Build.SUPPORTED_ABIS.firstOrNull().orEmpty(),
+    )
+
 internal class AndroidSupportBundleExporter(
     private val context: Context,
     private val activity: Activity?,

androidApp/src/test/kotlin/dev/obiente/nextcloudnative/AndroidFileSyncEngineInvariantTest.kt

@@ -387,6 +387,7 @@ class AndroidFileSyncEngineInvariantTest {
                     events += "restore-old-authority"
                     "account-old"
                 },
+                publishAccount = { _, accountId -> events += "publish-${accountId ?: "none"}" },
             )
         }
         loadThread.start()
@@ -396,6 +397,7 @@ class AndroidFileSyncEngineInvariantTest {
             guard.clearSession(
                 persist = { events += "clear-session" },
                 cancelAll = { events += "cancel-all" },
+                clearPublishedAccount = { events += "publish-none" },
             )
         }
         clearThread.start()
@@ -410,7 +412,9 @@ class AndroidFileSyncEngineInvariantTest {
             listOf(
                 "read-old-session",
                 "restore-old-authority",
+                "publish-account-old",
                 "clear-session",
+                "publish-none",
                 "cancel-all",
             ),
             events,
@@ -437,6 +441,7 @@ class AndroidFileSyncEngineInvariantTest {
                     events += "restore-old-authority"
                     "account-old"
                 },
+                publishAccount = { _, accountId -> events += "publish-$accountId" },
             )
         }
         loadThread.start()
@@ -447,6 +452,7 @@ class AndroidFileSyncEngineInvariantTest {
                 replacementAccountId = "account-new",
                 persist = { events += "save-new-session" },
                 cancelAll = { events += "cancel-old-work" },
+                publishAccount = { accountId -> events += "publish-$accountId" },
             )
         }
         replacementThread.start()
@@ -461,7 +467,9 @@ class AndroidFileSyncEngineInvariantTest {
             listOf(
                 "read-old-session",
                 "restore-old-authority",
+                "publish-account-old",
                 "save-new-session",
+                "publish-account-new",
                 "cancel-old-work",
             ),
             events,

changes/unreleased/351-direct-support-intake.md

@@ -0,0 +1,7 @@
+category: feature
+issue: 351
+pull: none
+platforms: android, desktop
+user-facing: yes
+
+Send a reviewed, privacy-filtered diagnostic report directly to Obiente Support while retaining the option to save a local copy.

ui/build.gradle.kts

@@ -227,6 +227,10 @@ kotlin {
             implementation("net.java.dev.jna:jna:5.19.1")
             implementation("net.java.dev.jna:jna-platform:5.19.1")
         }
+        val desktopTest by getting
+        desktopTest.dependencies {
+            implementation("com.squareup.okhttp3:mockwebserver3:5.3.0")
+        }
     }
 }