Release Android 1.5.1

iampedii · iampedii · commit eee75ad90d4b · 2026-05-19T18:40:16.000+10:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 
 val whiteDnsVersionCode = providers.gradleProperty("WHITE_DNS_VERSION_CODE")
     .map { it.toInt() }
-    .orElse(11)
+    .orElse(12)
 val whiteDnsVersionName = providers.gradleProperty("WHITE_DNS_VERSION_NAME")
-    .orElse("1.5.0")
+    .orElse("1.5.1")
 
 android {
     namespace = "shop.whitedns.client"
diff --git a/app/src/main/java/shop/whitedns/client/model/WhiteDnsAutoTune.kt b/app/src/main/java/shop/whitedns/client/model/WhiteDnsAutoTune.kt
@@ -24,105 +24,147 @@ enum class WhiteDnsAutoTunePresetStability {
 object WhiteDnsAutoTunePresets {
     val all: List<WhiteDnsAutoTunePreset> = listOf(
         WhiteDnsAutoTunePreset(
-            id = "auto-1",
-            label = "WhiteDNS Config 1",
-            minUploadMtu = "100",
-            maxUploadMtu = "1000",
-            minDownloadMtu = "200",
-            maxDownloadMtu = "4000",
-            resolverTimeoutSeconds = "0.5",
+            id = "iran-average",
+            label = "Iran Default",
+            minUploadMtu = "40",
+            maxUploadMtu = "140",
+            minDownloadMtu = "300",
+            maxDownloadMtu = "3000",
+            resolverTimeoutSeconds = "2.5",
             dnsResponseFragmentStoreCapacity = "256",
-            uploadDuplication = "15",
-            downloadDuplication = "30",
+            uploadDuplication = "3",
+            downloadDuplication = "7",
             uploadCompression = 2,
-            downloadCompression = 3,
-            stability = WhiteDnsAutoTunePresetStability.Aggressive,
+            downloadCompression = 2,
         ),
         WhiteDnsAutoTunePreset(
-            id = "auto-2",
-            label = "WhiteDNS Config 2",
-            minUploadMtu = "100",
-            maxUploadMtu = "500",
-            minDownloadMtu = "100",
-            maxDownloadMtu = "1325",
-            resolverTimeoutSeconds = "0.5",
-            dnsResponseFragmentStoreCapacity = "250",
-            uploadDuplication = "5",
-            downloadDuplication = "15",
+            id = "iran-low-mtu-scan",
+            label = "Iran Low MTU Scan",
+            minUploadMtu = "20",
+            maxUploadMtu = "120",
+            minDownloadMtu = "160",
+            maxDownloadMtu = "768",
+            resolverTimeoutSeconds = "2.5",
+            dnsResponseFragmentStoreCapacity = "256",
+            uploadDuplication = "3",
+            downloadDuplication = "7",
             uploadCompression = 2,
             downloadCompression = 2,
         ),
         WhiteDnsAutoTunePreset(
-            id = "auto-3",
-            label = "WhiteDNS Config 3",
-            minUploadMtu = "50",
-            maxUploadMtu = "1500",
-            minDownloadMtu = "50",
-            maxDownloadMtu = "500",
-            resolverTimeoutSeconds = "0.2",
-            dnsResponseFragmentStoreCapacity = "200",
-            uploadDuplication = "1",
-            downloadDuplication = "1",
-            uploadCompression = 0,
-            downloadCompression = 0,
-            stability = WhiteDnsAutoTunePresetStability.Aggressive,
-        ),
-        WhiteDnsAutoTunePreset(
-            id = "auto-4",
-            label = "WhiteDNS Config 4",
+            id = "iran-fast-low-mtu",
+            label = "Iran Fast Low MTU",
             minUploadMtu = "20",
             maxUploadMtu = "325",
             minDownloadMtu = "100",
             maxDownloadMtu = "1270",
-            resolverTimeoutSeconds = "0.5",
+            resolverTimeoutSeconds = "2.5",
             dnsResponseFragmentStoreCapacity = "100",
-            uploadDuplication = "1",
-            downloadDuplication = "5",
+            uploadDuplication = "5",
+            downloadDuplication = "10",
             uploadCompression = 2,
             downloadCompression = 2,
         ),
         WhiteDnsAutoTunePreset(
-            id = "auto-5",
-            label = "WhiteDNS Config 5",
-            minUploadMtu = "50",
-            maxUploadMtu = "500",
-            minDownloadMtu = "100",
-            maxDownloadMtu = "9000",
-            resolverTimeoutSeconds = "0.3",
+            id = "iran-compact-fixed",
+            label = "Iran Compact Fixed",
+            minUploadMtu = "62",
+            maxUploadMtu = "62",
+            minDownloadMtu = "414",
+            maxDownloadMtu = "414",
+            resolverTimeoutSeconds = "2.5",
+            dnsResponseFragmentStoreCapacity = "384",
+            uploadDuplication = "6",
+            downloadDuplication = "8",
+            uploadCompression = 2,
+            downloadCompression = 2,
+        ),
+        WhiteDnsAutoTunePreset(
+            id = "iran-fixed-64-balanced",
+            label = "Iran Fixed 64 Balanced",
+            minUploadMtu = "64",
+            maxUploadMtu = "64",
+            minDownloadMtu = "756",
+            maxDownloadMtu = "756",
+            resolverTimeoutSeconds = "2.5",
             dnsResponseFragmentStoreCapacity = "256",
-            uploadDuplication = "1",
-            downloadDuplication = "1",
-            uploadCompression = 0,
-            downloadCompression = 0,
-            stability = WhiteDnsAutoTunePresetStability.Aggressive,
+            uploadDuplication = "8",
+            downloadDuplication = "8",
+            uploadCompression = 2,
+            downloadCompression = 2,
         ),
         WhiteDnsAutoTunePreset(
-            id = "auto-6",
-            label = "WhiteDNS Config 6",
-            minUploadMtu = "40",
-            maxUploadMtu = "200",
-            minDownloadMtu = "100",
-            maxDownloadMtu = "1500",
-            resolverTimeoutSeconds = "0.5",
+            id = "iran-mid-reliable",
+            label = "Iran Mid Reliable",
+            minUploadMtu = "120",
+            maxUploadMtu = "160",
+            minDownloadMtu = "652",
+            maxDownloadMtu = "1110",
+            resolverTimeoutSeconds = "2.5",
             dnsResponseFragmentStoreCapacity = "256",
             uploadDuplication = "5",
-            downloadDuplication = "5",
+            downloadDuplication = "11",
             uploadCompression = 2,
             downloadCompression = 2,
         ),
         WhiteDnsAutoTunePreset(
-            id = "auto-7",
-            label = "WhiteDNS Config 7",
+            id = "iran-download-heavy",
+            label = "Iran Download Heavy",
+            minUploadMtu = "104",
+            maxUploadMtu = "139",
+            minDownloadMtu = "394",
+            maxDownloadMtu = "1000",
+            resolverTimeoutSeconds = "2.5",
+            dnsResponseFragmentStoreCapacity = "256",
+            uploadDuplication = "8",
+            downloadDuplication = "30",
+            uploadCompression = 2,
+            downloadCompression = 2,
+        ),
+        WhiteDnsAutoTunePreset(
+            id = "iran-fixed-64-aggressive",
+            label = "Iran Fixed 64 Wide",
             minUploadMtu = "64",
             maxUploadMtu = "64",
             minDownloadMtu = "756",
-            maxDownloadMtu = "756",
-            resolverTimeoutSeconds = "0.7",
+            maxDownloadMtu = "1317",
+            resolverTimeoutSeconds = "2.5",
+            dnsResponseFragmentStoreCapacity = "230",
+            uploadDuplication = "14",
+            downloadDuplication = "30",
+            uploadCompression = 2,
+            downloadCompression = 2,
+            stability = WhiteDnsAutoTunePresetStability.Aggressive,
+        ),
+        WhiteDnsAutoTunePreset(
+            id = "iran-large-download-aggressive",
+            label = "Iran No Compression Max",
+            minUploadMtu = "100",
+            maxUploadMtu = "600",
+            minDownloadMtu = "800",
+            maxDownloadMtu = "6500",
+            resolverTimeoutSeconds = "2.5",
+            dnsResponseFragmentStoreCapacity = "640",
+            uploadDuplication = "23",
+            downloadDuplication = "30",
+            uploadCompression = 0,
+            downloadCompression = 0,
+            stability = WhiteDnsAutoTunePresetStability.Aggressive,
+        ),
+        WhiteDnsAutoTunePreset(
+            id = "iran-wide-range-aggressive",
+            label = "Iran Wide Range Max",
+            minUploadMtu = "100",
+            maxUploadMtu = "1000",
+            minDownloadMtu = "200",
+            maxDownloadMtu = "2667",
+            resolverTimeoutSeconds = "2.5",
             dnsResponseFragmentStoreCapacity = "256",
             uploadDuplication = "15",
             downloadDuplication = "30",
             uploadCompression = 2,
             downloadCompression = 2,
+            stability = WhiteDnsAutoTunePresetStability.Aggressive,
         ),
     )
 }
diff --git a/app/src/main/java/shop/whitedns/client/model/WhiteDnsModels.kt b/app/src/main/java/shop/whitedns/client/model/WhiteDnsModels.kt
@@ -258,10 +258,10 @@ data class WhiteDnsSettings(
     val maxUploadMtu: String = "140",
     val maxDownloadMtu: String = "3000",
     val mtuTestRetriesResolvers: String = "3",
-    val mtuTestTimeoutResolvers: String = "2.0",
+    val mtuTestTimeoutResolvers: String = "2.5",
     val mtuTestParallelismResolvers: String = "100",
     val mtuTestRetriesLogs: String = "5",
-    val mtuTestTimeoutLogs: String = "2.0",
+    val mtuTestTimeoutLogs: String = "2.5",
     val mtuTestParallelismLogs: String = "32",
     val rxTxWorkers: String = "4",
     val tunnelProcessWorkers: String = "4",
@@ -1620,10 +1620,10 @@ fun WhiteDnsSettings.resolve(): ResolvedWhiteDnsSettings {
         maxUploadMtu = resolvedMaxUploadMtu,
         maxDownloadMtu = resolvedMaxDownloadMtu,
         mtuTestRetriesResolvers = boundedInt(mtuTestRetriesResolvers, defaultValue = 3, minValue = 1, maxValue = 100),
-        mtuTestTimeoutResolvers = positiveDouble(mtuTestTimeoutResolvers, defaultValue = 2.0),
+        mtuTestTimeoutResolvers = positiveDouble(mtuTestTimeoutResolvers, defaultValue = 2.5),
         mtuTestParallelismResolvers = boundedInt(mtuTestParallelismResolvers, defaultValue = 100, minValue = 1, maxValue = 1024),
         mtuTestRetriesLogs = boundedInt(mtuTestRetriesLogs, defaultValue = 5, minValue = 1, maxValue = 100),
-        mtuTestTimeoutLogs = positiveDouble(mtuTestTimeoutLogs, defaultValue = 2.0),
+        mtuTestTimeoutLogs = positiveDouble(mtuTestTimeoutLogs, defaultValue = 2.5),
         mtuTestParallelismLogs = boundedInt(mtuTestParallelismLogs, defaultValue = 32, minValue = 1, maxValue = 1024),
         rxTxWorkers = resolvedRxTxWorkers,
         tunnelProcessWorkers = resolvedTunnelProcessWorkers,
diff --git a/app/src/main/java/shop/whitedns/client/ui/WhiteDnsScreen.kt b/app/src/main/java/shop/whitedns/client/ui/WhiteDnsScreen.kt
@@ -306,8 +306,9 @@ private enum class WhiteDnsTab(
 
 private const val ScanWorkerMin = 1
 private const val ScanWorkerMax = 32
-private const val MtuParallelismMin = 1
-private const val MtuParallelismMax = 1024
+private const val MtuParallelismMin = 50
+private const val MtuParallelismMax = 1000
+private const val MtuParallelismStep = 50
 private const val MtuParallelismDefault = 100
 
 private enum class CompactActionTone {
@@ -1154,7 +1155,7 @@ private fun ParallelTestSelectionPanel(
                 )
                 ParallelTestConfigRow(
                     label = WhiteDnsL10n.whiteDnsConfigsLabel,
-                    detail = "+${stableWhiteDnsConfigIds.size}",
+                    detail = WhiteDnsL10n.whiteDnsConfigsDescription,
                     checked = allStableWhiteDnsSelected,
                     enabled = controlsEnabled && canAddStableWhiteDnsConfigs,
                     onToggle = {
@@ -1171,7 +1172,7 @@ private fun ParallelTestSelectionPanel(
                 )
                 ParallelTestConfigRow(
                     label = WhiteDnsL10n.whiteDnsAggressiveConfigsLabel,
-                    detail = "+${aggressiveWhiteDnsConfigIds.size}",
+                    detail = WhiteDnsL10n.whiteDnsAggressiveConfigsDescription,
                     checked = allAggressiveWhiteDnsSelected,
                     enabled = controlsEnabled && canAddAggressiveWhiteDnsConfigs,
                     onToggle = {
@@ -1275,11 +1276,12 @@ private fun ParallelTestConfigRow(
             )
             Text(
                 text = detail,
-                maxLines = 1,
+                maxLines = 2,
                 overflow = TextOverflow.Ellipsis,
                 style = MaterialTheme.typography.bodySmall.copy(
                     fontSize = 10.sp,
                     color = WhiteDnsPalette.Muted.copy(alpha = contentAlpha),
+                    lineHeight = 14.sp,
                 ),
             )
         }
@@ -2069,7 +2071,7 @@ private fun MtuParallelismSlider(
     onParallelismChange: (Int) -> Unit,
 ) {
     val context = LocalContext.current
-    var sliderValue by remember(parallelism) { mutableStateOf(parallelism.toFloat()) }
+    var sliderValue by remember(parallelism) { mutableStateOf(parallelism.toMtuParallelismSliderValue().toFloat()) }
     val displayedParallelism = sliderValue.toMtuParallelismSliderValue()
     Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
         Row(
@@ -2088,9 +2090,9 @@ private fun MtuParallelismSlider(
             )
         }
         Slider(
-            value = sliderValue.coerceIn(MtuParallelismMin.toFloat(), MtuParallelismMax.toFloat()),
+            value = sliderValue,
             onValueChange = { value ->
-                sliderValue = value.coerceIn(MtuParallelismMin.toFloat(), MtuParallelismMax.toFloat())
+                sliderValue = value.toMtuParallelismSliderValue().toFloat()
             },
             onValueChangeFinished = {
                 val committedParallelism = sliderValue.toMtuParallelismSliderValue()
@@ -2100,7 +2102,7 @@ private fun MtuParallelismSlider(
             },
             enabled = enabled,
             valueRange = MtuParallelismMin.toFloat()..MtuParallelismMax.toFloat(),
-            steps = 0,
+            steps = ((MtuParallelismMax - MtuParallelismMin) / MtuParallelismStep) - 1,
             modifier = Modifier.semantics {
                 contentDescription = context.getString(R.string.cd_mtu_parallelism_slider, displayedParallelism)
             },
@@ -2125,11 +2127,16 @@ private fun MtuParallelismSlider(
 }
 
 private fun String.toMtuParallelismSliderValue(): Int {
-    return toIntOrNull()?.coerceIn(MtuParallelismMin, MtuParallelismMax) ?: MtuParallelismDefault
+    return toIntOrNull()?.toMtuParallelismSliderValue() ?: MtuParallelismDefault
 }
 
 private fun Float.toMtuParallelismSliderValue(): Int {
-    return roundToInt().coerceIn(MtuParallelismMin, MtuParallelismMax)
+    return roundToInt().toMtuParallelismSliderValue()
+}
+
+private fun Int.toMtuParallelismSliderValue(): Int {
+    val rounded = (this.toFloat() / MtuParallelismStep).roundToInt() * MtuParallelismStep
+    return rounded.coerceIn(MtuParallelismMin, MtuParallelismMax)
 }
 
 @Composable
diff --git a/app/src/main/java/shop/whitedns/client/ui/WhiteDnsStrings.kt b/app/src/main/java/shop/whitedns/client/ui/WhiteDnsStrings.kt
@@ -495,7 +495,9 @@ interface WhiteDnsStrings {
     val noResolversPlaceholder: String
     val whiteDnsResolversLabel: String
     val whiteDnsConfigsLabel: String
+    val whiteDnsConfigsDescription: String
     val whiteDnsAggressiveConfigsLabel: String
+    val whiteDnsAggressiveConfigsDescription: String
     val whiteDnsLogsLabel: String
     val whiteDnsDiagnosticsLabel: String
     val parallelTestCollapseDescription: String
@@ -1166,7 +1168,9 @@ object EnglishStrings : WhiteDnsStrings {
     override val noResolversPlaceholder = "No resolvers"
     override val whiteDnsResolversLabel = "WhiteDNS resolvers"
     override val whiteDnsConfigsLabel = "WhiteDNS configs"
-    override val whiteDnsAggressiveConfigsLabel = "Aggressive configs"
+    override val whiteDnsConfigsDescription = "Conservative: lower data usage, recommended for most users"
+    override val whiteDnsAggressiveConfigsLabel = "High usage configs"
+    override val whiteDnsAggressiveConfigsDescription = "High usage: use when internet usage is not a concern"
     override val whiteDnsLogsLabel = "WhiteDNS logs"
     override val whiteDnsDiagnosticsLabel = "WhiteDNS diagnostics"
     override val parallelTestCollapseDescription = "Collapse Parallel Test configs"
@@ -1824,7 +1828,9 @@ object PersianStrings : WhiteDnsStrings {
     override val noResolversPlaceholder = "بدون ریزالور"
     override val whiteDnsResolversLabel = "ریزالورهای WhiteDNS"
     override val whiteDnsConfigsLabel = "تنظیمات WhiteDNS"
-    override val whiteDnsAggressiveConfigsLabel = "تنظیمات پرریسک"
+    override val whiteDnsConfigsDescription = "محافظه‌کارانه: مصرف اینترنت کمتر، مناسب بیشتر کاربران"
+    override val whiteDnsAggressiveConfigsLabel = "تنظیمات پرمصرف"
+    override val whiteDnsAggressiveConfigsDescription = "پرمصرف: وقتی مصرف اینترنت برایتان مهم نیست استفاده کنید"
     override val whiteDnsLogsLabel = "لاگ‌های WhiteDNS"
     override val whiteDnsDiagnosticsLabel = "تشخیص WhiteDNS"
     override val parallelTestCollapseDescription = "بستن تنظیمات تست موازی"
diff --git a/app/src/main/java/shop/whitedns/client/ui/WhiteDnsTheme.kt b/app/src/main/java/shop/whitedns/client/ui/WhiteDnsTheme.kt
@@ -627,7 +627,9 @@ object WhiteDnsL10n {
     val noResolversPlaceholder: String @Composable get() = LocalWhiteDnsStrings.current.noResolversPlaceholder
     val whiteDnsResolversLabel: String @Composable get() = LocalWhiteDnsStrings.current.whiteDnsResolversLabel
     val whiteDnsConfigsLabel: String @Composable get() = LocalWhiteDnsStrings.current.whiteDnsConfigsLabel
+    val whiteDnsConfigsDescription: String @Composable get() = LocalWhiteDnsStrings.current.whiteDnsConfigsDescription
     val whiteDnsAggressiveConfigsLabel: String @Composable get() = LocalWhiteDnsStrings.current.whiteDnsAggressiveConfigsLabel
+    val whiteDnsAggressiveConfigsDescription: String @Composable get() = LocalWhiteDnsStrings.current.whiteDnsAggressiveConfigsDescription
     val whiteDnsLogsLabel: String @Composable get() = LocalWhiteDnsStrings.current.whiteDnsLogsLabel
     val whiteDnsDiagnosticsLabel: String @Composable get() = LocalWhiteDnsStrings.current.whiteDnsDiagnosticsLabel
     val parallelTestCollapseDescription: String @Composable get() = LocalWhiteDnsStrings.current.parallelTestCollapseDescription
diff --git a/app/src/main/java/shop/whitedns/client/ui/WhiteDnsViewModel.kt b/app/src/main/java/shop/whitedns/client/ui/WhiteDnsViewModel.kt
diff --git a/app/src/test/java/shop/whitedns/client/model/WhiteDnsModelsTest.kt b/app/src/test/java/shop/whitedns/client/model/WhiteDnsModelsTest.kt
