Merge pull request #661 from ooni/desktop-network-unknown

sdsantos · web-flow · commit 24977d2fac88 · 2025-04-07T15:22:43.000+01:00
Implement desktop network type as unknown
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -62,7 +62,7 @@ kotlin {
 
     jvm("desktop")
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(17))
         vendor.set(JvmVendorSpec.JETBRAINS)
     }
 
diff --git a/composeApp/src/androidMain/kotlin/org/ooni/engine/AndroidOonimkallBridge.kt b/composeApp/src/androidMain/kotlin/org/ooni/engine/AndroidOonimkallBridge.kt
@@ -85,7 +85,7 @@ class AndroidOonimkallBridge : OonimkallBridge {
     private fun OonimkallBridge.CheckInConfig.toMk() =
         CheckInConfig().also {
             it.charging = charging
-            it.onWiFi = onWiFi
+            if (onWiFi != null) it.onWiFi = onWiFi
             it.platform = platform
             it.runType = runType
             it.softwareName = softwareName
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/engine/Engine.kt b/composeApp/src/commonMain/kotlin/org/ooni/engine/Engine.kt
@@ -95,10 +95,15 @@ class Engine(
             val sessionConfig = buildSessionConfig(taskOrigin, preferences)
             val session = session(sessionConfig)
             try {
+                val networkType = networkTypeFinder()
                 session.checkIn(
                     OonimkallBridge.CheckInConfig(
                         charging = isBatteryCharging(),
-                        onWiFi = networkTypeFinder() == NetworkType.Wifi,
+                        onWiFi = if (networkType !is NetworkType.Unknown) {
+                            networkType == NetworkType.Wifi
+                        } else {
+                            null
+                        },
                         platform = platformInfo.platform.value,
                         runType = taskOrigin.runType,
                         softwareName = sessionConfig.softwareName,
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/engine/OonimkallBridge.kt b/composeApp/src/commonMain/kotlin/org/ooni/engine/OonimkallBridge.kt
@@ -58,7 +58,7 @@ interface OonimkallBridge {
 
     data class CheckInConfig(
         val charging: Boolean,
-        val onWiFi: Boolean,
+        val onWiFi: Boolean?,
         // "android" or "ios"
         val platform: String,
         // "timed"
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt
@@ -235,6 +235,7 @@ class Dependencies(
             getAutoRunSettings = getAutoRunSettings::invoke,
             getNetworkType = networkTypeFinder::invoke,
             getBatteryState = getBatteryState::invoke,
+            knownNetworkType = platformInfo.knownNetworkType,
             knownBatteryState = platformInfo.knownBatteryState,
             resultRepository::countMissingUpload,
         )
@@ -319,6 +320,7 @@ class Dependencies(
             observeStorageUsed = getStorageUsed::observe,
             clearStorage = clearStorage::invoke,
             supportsCrashReporting = flavorConfig.isCrashReportingEnabled,
+            knownNetworkType = platformInfo.knownNetworkType,
             knownBatteryState = platformInfo.knownBatteryState,
         )
     }
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/CheckAutoRunConstraints.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/CheckAutoRunConstraints.kt
@@ -11,6 +11,7 @@ class CheckAutoRunConstraints(
     private val getAutoRunSettings: suspend () -> Flow<AutoRunParameters>,
     private val getNetworkType: () -> NetworkType,
     private val getBatteryState: () -> BatteryState,
+    private val knownNetworkType: Boolean,
     private val knownBatteryState: Boolean,
     private val countResultsMissingUpload: () -> Flow<Long>,
 ) {
@@ -27,7 +28,10 @@ class CheckAutoRunConstraints(
             return false
         }
 
-        if (autoRunParameters.wifiOnly && getNetworkType() != NetworkType.Wifi) {
+        if (knownNetworkType &&
+            autoRunParameters.wifiOnly &&
+            getNetworkType() != NetworkType.Wifi
+        ) {
             Logger.i("Not starting auto-run because of Wi-Fi constraint")
             return false
         }
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/GetSettings.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/domain/GetSettings.kt
@@ -70,6 +70,7 @@ class GetSettings(
     private val clearStorage: suspend (Boolean) -> Unit,
     val observeStorageUsed: () -> Flow<Long>,
     private val supportsCrashReporting: Boolean,
+    private val knownNetworkType: Boolean,
     private val knownBatteryState: Boolean,
 ) {
     operator fun invoke(): Flow<List<SettingsCategoryItem>> {
@@ -114,7 +115,7 @@ class GetSettings(
                 icon = Res.drawable.ic_settings,
                 title = Res.string.Settings_TestOptions_Label,
                 route = PreferenceCategoryKey.TEST_OPTIONS,
-                settings = listOf(
+                settings = listOfNotNull(
                     SettingsItem(
                         title = Res.string.Settings_Sharing_UploadResults,
                         key = SettingsKey.UPLOAD_RESULTS,
@@ -138,32 +139,29 @@ class GetSettings(
                             )
                         },
                     ),
-                ) + if (autoRunEnabled) {
-                    listOf(
+                    if (autoRunEnabled && knownNetworkType) {
                         SettingsItem(
                             title = Res.string.Settings_AutomatedTesting_RunAutomatically_WiFiOnly,
                             key = SettingsKey.AUTOMATED_TESTING_WIFIONLY,
                             type = PreferenceItemType.SWITCH,
                             enabled = autoRunEnabled && uploadResultsEnabled,
                             indentation = 1,
-                        ),
-                    ) + if (knownBatteryState) {
-                        listOf(
-                            SettingsItem(
-                                title = Res.string.Settings_AutomatedTesting_RunAutomatically_ChargingOnly,
-                                key = SettingsKey.AUTOMATED_TESTING_CHARGING,
-                                type = PreferenceItemType.SWITCH,
-                                enabled = autoRunEnabled && uploadResultsEnabled,
-                                indentation = 1,
-                            ),
                         )
                     } else {
-                        emptyList()
-                    }
-                } else {
-                    emptyList()
-                } + if (hasWebsitesDescriptor) {
-                    listOfNotNull(
+                        null
+                    },
+                    if (autoRunEnabled && knownBatteryState) {
+                        SettingsItem(
+                            title = Res.string.Settings_AutomatedTesting_RunAutomatically_ChargingOnly,
+                            key = SettingsKey.AUTOMATED_TESTING_CHARGING,
+                            type = PreferenceItemType.SWITCH,
+                            enabled = autoRunEnabled && uploadResultsEnabled,
+                            indentation = 1,
+                        )
+                    } else {
+                        null
+                    },
+                    if (hasWebsitesDescriptor) {
                         SettingsItem(
                             title = Res.string.Settings_Websites_MaxRuntimeEnabled_New,
                             key = SettingsKey.MAX_RUNTIME_ENABLED,
@@ -175,27 +173,26 @@ class GetSettings(
                                 )
                             },
                             indentation = 0,
-                        ),
-                        if (maxRuntimeEnabled) {
-                            SettingsItem(
-                                title = Res.string.Settings_Websites_MaxRuntime_New,
-                                key = SettingsKey.MAX_RUNTIME,
-                                type = PreferenceItemType.INT,
-                                supportingContent = {
-                                    maxRuntime?.let {
-                                        Text(it.coerceAtLeast(0).seconds.shortFormat())
-                                    }
-                                },
-                                indentation = 1,
-                            )
-                        } else {
-                            null
-                        },
-                    )
-                } else {
-                    emptyList()
-                } + if (hasWebsitesDescriptor) {
-                    listOf(
+                        )
+                    } else {
+                        null
+                    },
+                    if (hasWebsitesDescriptor && maxRuntimeEnabled) {
+                        SettingsItem(
+                            title = Res.string.Settings_Websites_MaxRuntime_New,
+                            key = SettingsKey.MAX_RUNTIME,
+                            type = PreferenceItemType.INT,
+                            supportingContent = {
+                                maxRuntime?.let {
+                                    Text(it.coerceAtLeast(0).seconds.shortFormat())
+                                }
+                            },
+                            indentation = 1,
+                        )
+                    } else {
+                        null
+                    },
+                    if (hasWebsitesDescriptor) {
                         SettingsCategoryItem(
                             title = Res.string.Settings_Websites_Categories_Label,
                             route = PreferenceCategoryKey.WEBSITES_CATEGORIES,
@@ -207,11 +204,11 @@ class GetSettings(
                                     ),
                                 )
                             },
-                        ),
-                    )
-                } else {
-                    emptyList()
-                },
+                        )
+                    } else {
+                        null
+                    },
+                ),
                 footerContent = {
                     SettingsDescription(
                         Res.string.Settings_AutomatedTesting_RunAutomatically_Footer,
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/shared/PlatformInfo.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/shared/PlatformInfo.kt
@@ -8,6 +8,7 @@ data class PlatformInfo(
     val model: String,
     val requestNotificationsPermission: Boolean,
     val knownBatteryState: Boolean = true,
+    val knownNetworkType: Boolean = true,
     val sentryDsn: String,
 ) {
     val version get() = "$buildName ($buildNumber)"
diff --git a/composeApp/src/commonTest/kotlin/org/ooni/probe/domain/CheckAutoRunConstraintsTest.kt b/composeApp/src/commonTest/kotlin/org/ooni/probe/domain/CheckAutoRunConstraintsTest.kt
@@ -31,6 +31,7 @@ class CheckAutoRunConstraintsTest {
                         },
                         getNetworkType = { NetworkType.Wifi },
                         getBatteryState = { BatteryState.Charging },
+                        knownNetworkType = true,
                         knownBatteryState = true,
                         countResultsMissingUpload = { flowOf(count) },
                     )(),
@@ -55,6 +56,7 @@ class CheckAutoRunConstraintsTest {
                 },
                 getNetworkType = { NetworkType.VPN },
                 getBatteryState = { BatteryState.Charging },
+                knownNetworkType = true,
                 knownBatteryState = true,
                 countResultsMissingUpload = { flowOf(0) },
             )
@@ -80,6 +82,7 @@ class CheckAutoRunConstraintsTest {
                 },
                 getNetworkType = { NetworkType.Wifi },
                 getBatteryState = { batteryState },
+                knownNetworkType = true,
                 knownBatteryState = knownBatteryState,
                 countResultsMissingUpload = { flowOf(0) },
             )()
diff --git a/composeApp/src/desktopMain/kotlin/org/ooni/engine/DesktopOonimkallBridge.kt b/composeApp/src/desktopMain/kotlin/org/ooni/engine/DesktopOonimkallBridge.kt
@@ -85,7 +85,7 @@ class DesktopOonimkallBridge : OonimkallBridge {
     private fun OonimkallBridge.CheckInConfig.toMk() =
         CheckInConfig().also {
             it.charging = charging
-            it.onWiFi = onWiFi
+            if (onWiFi != null) it.onWiFi = onWiFi
             it.platform = platform
             it.runType = runType
             it.softwareName = softwareName
diff --git a/composeApp/src/desktopMain/kotlin/org/ooni/probe/BuildDependencies.kt b/composeApp/src/desktopMain/kotlin/org/ooni/probe/BuildDependencies.kt
@@ -61,6 +61,7 @@ private fun buildPlatformInfo() =
         model = "model",
         requestNotificationsPermission = false,
         knownBatteryState = false,
+        knownNetworkType = false,
         sentryDsn = "https://e33da707dc40ab9508198b62de9bc269@o155150.ingest.sentry.io/4509084408610816",
     )
 
@@ -69,8 +70,11 @@ private fun readAssetFile(path: String): String {
     throw NotImplementedError()
 }
 
-// TODO: Desktop - buildDatabaseDriver persist in storage instead of in memory
-private fun networkTypeFinder() = NetworkType.Wifi
+/*
+ * This is a dummy implementation for now.
+ * In the future we can write a proper implement using native APIs.
+ */
+private fun networkTypeFinder() = NetworkType.Unknown("unknown")
 
 // TODO: Desktop - Confirm appropriate path and configuration
 private fun buildDataStore() =
diff --git a/iosApp/iosApp/engine/IosOonimkallBridge.swift b/iosApp/iosApp/engine/IosOonimkallBridge.swift
@@ -166,7 +166,9 @@ extension OonimkallBridgeCheckInConfig {
     func toMk() -> OonimkallCheckInConfig {
         let config = OonimkallCheckInConfig()
         config.charging = charging
-        config.onWiFi = onWiFi
+        if onWiFi != nil {
+            config.onWiFi = onWiFi
+        }
         config.platform = platform
         config.runType = runType
         config.softwareName = softwareName

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ kotlin {`
`62`	`62`
`63`	`63`	`jvm("desktop")`
`64`	`64`	`jvmToolchain {`
`65`		`- languageVersion.set(JavaLanguageVersion.of(21))`
	`65`	`+ languageVersion.set(JavaLanguageVersion.of(17))`
`66`	`66`	`vendor.set(JvmVendorSpec.JETBRAINS)`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,7 @@ class Dependencies(`
`235`	`235`	`getAutoRunSettings = getAutoRunSettings::invoke,`
`236`	`236`	`getNetworkType = networkTypeFinder::invoke,`
`237`	`237`	`getBatteryState = getBatteryState::invoke,`
	`238`	`+ knownNetworkType = platformInfo.knownNetworkType,`
`238`	`239`	`knownBatteryState = platformInfo.knownBatteryState,`
`239`	`240`	`resultRepository::countMissingUpload,`
`240`	`241`	`)`
`@@ -319,6 +320,7 @@ class Dependencies(`
`319`	`320`	`observeStorageUsed = getStorageUsed::observe,`
`320`	`321`	`clearStorage = clearStorage::invoke,`
`321`	`322`	`supportsCrashReporting = flavorConfig.isCrashReportingEnabled,`
	`323`	`+ knownNetworkType = platformInfo.knownNetworkType,`
`322`	`324`	`knownBatteryState = platformInfo.knownBatteryState,`
`323`	`325`	`)`
`324`	`326`	`}`