Feat: Added a speed test progress bar and completion node count functionality; optimized menu order.

Author: dsfkjlweuyr

app/src/main/java/io/nekohasekai/sagernet/bg/proto/SpeedTestRunner.kt

@@ -33,6 +33,11 @@ data class SpeedTestSnapshot(
     val done: Boolean = false,
 )
 
+internal fun completedSpeedTestCount(index: Int, total: Int, done: Boolean): Int {
+    if (total <= 0) return 0
+    return (index + if (done) 1 else 0).coerceIn(0, total)
+}
+
 interface SpeedTestNodeSession : AutoCloseable {
     suspend fun run(onSample: (SpeedTestSnapshot) -> Unit): SpeedTestSnapshot
     fun cancel()

app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt

@@ -57,6 +57,7 @@ import io.nekohasekai.sagernet.bg.proto.AndroidSpeedTestSession
 import io.nekohasekai.sagernet.bg.proto.SpeedTestQueueRunner
 import io.nekohasekai.sagernet.bg.proto.SpeedTestSnapshot
 import io.nekohasekai.sagernet.bg.proto.UrlTest
+import io.nekohasekai.sagernet.bg.proto.completedSpeedTestCount
 import io.nekohasekai.sagernet.database.DataStore
 import io.nekohasekai.sagernet.database.GroupManager
 import io.nekohasekai.sagernet.database.ProfileManager
@@ -863,6 +864,10 @@ class ConfigurationFragment @JvmOverloads constructor(
         if (DataStore.runningTest) return else DataStore.runningTest = true
         val group = DataStore.currentGroup()
         val binding = LayoutProgressListBinding.inflate(layoutInflater)
+        binding.progressCircular.isGone = true
+        binding.progressLinear.isVisible = true
+        binding.progressLinear.max = 1
+        binding.progressLinear.setProgressCompat(0, false)
         val builder = MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.speed_test_group)
             .setView(binding.root)
@@ -909,14 +914,17 @@ class ConfigurationFragment @JvmOverloads constructor(
             try {
                 val profiles = SagerDatabase.proxyDao.getByGroup(group.id)
                 if (profiles.isEmpty()) {
-                    runOnMainDispatcher {
-                        binding.nowTesting.text = getString(R.string.speed_test_finished_summary, 0, 0, 0)
-                        binding.progress.text = "0 / 0"
-                        binding.progressCircular.isGone = true
+                    onMainDispatcher {
+                        dialog.dismiss()
                     }
                     return@runOnDefaultDispatcher
                 }
-                val results = runner.run(profiles) { index, total, sample ->
+                onMainDispatcher {
+                    binding.progressLinear.max = profiles.size
+                    binding.progressLinear.setProgressCompat(0, false)
+                    binding.progress.text = "0 / ${profiles.size}"
+                }
+                runner.run(profiles) { index, total, sample ->
                     val outcome = SpeedTestOutcome.completedOrNull(
                         mode = sample.mode,
                         stage = sample.stage,
@@ -943,34 +951,20 @@ class ConfigurationFragment @JvmOverloads constructor(
                         val detail = formatSpeedTestSnapshot(sample)
                         speedTestNotification?.updateNotification(index + 1, total, false, detail)
                         if (!speedTestHidden && isAdded) {
+                            val completed = completedSpeedTestCount(index, total, sample.done)
                             binding.nowTesting.text = detail
-                            binding.progress.text = "${index + 1} / $total"
+                            binding.progress.text = "$completed / $total"
+                            binding.progressLinear.setProgressCompat(completed, true)
                         }
                     }
                 }
-                runOnMainDispatcher {
-                    if (!isAdded) return@runOnMainDispatcher
-                    val failed = results.count { it.error.isNotBlank() }
-                    val cancelled = results.count { it.cancelled }
-                    binding.nowTesting.text = buildString {
-                        append(
-                            getString(
-                                R.string.speed_test_finished_summary,
-                                results.size,
-                                failed,
-                                cancelled,
-                            )
-                        )
-                        results.forEach { append("\n\n").append(formatSpeedTestSnapshot(it)) }
-                    }
-                    binding.progress.text = "${results.size} / ${profiles.size}"
-                    binding.progressCircular.isGone = true
+                onMainDispatcher {
+                    dialog.dismiss()
                 }
             } catch (_: CancellationException) {
                 runOnMainDispatcher {
                     if (!speedTestHidden && isAdded) {
                         binding.nowTesting.text = getString(R.string.speed_test_stage_cancelled)
-                        binding.progressCircular.isGone = true
                     }
                 }
             } finally {

app/src/main/res/layout/layout_progress_list.xml

@@ -13,6 +13,14 @@
         android:indeterminate="true"
         app:indicatorColor="?colorPrimary" />
 
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/progress_linear"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="false"
+        android:visibility="gone"
+        app:indicatorColor="?colorPrimary" />
+
     <TextView
         android:id="@+id/now_testing"
         android:layout_width="match_parent"
@@ -25,4 +33,4 @@
         android:layout_height="wrap_content"
         android:textAlignment="center" />
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/menu/add_profile_menu.xml

@@ -104,12 +104,12 @@
             <item
                 android:id="@+id/action_remove_duplicate"
                 android:title="@string/remove_duplicate" />
-            <item
-                android:id="@+id/action_connection_tcp_ping"
-                android:title="@string/speed_test_group" />
             <item
                 android:id="@+id/action_connection_url_test"
                 android:title="@string/connection_test_url_test" />
+            <item
+                android:id="@+id/action_connection_tcp_ping"
+                android:title="@string/speed_test_group" />
             <item
                 android:id="@+id/action_connection_test_clear_results"
                 android:title="@string/connection_test_clear_results" />

app/src/test/java/io/nekohasekai/sagernet/SpeedTestAndroidContractTest.kt

@@ -46,6 +46,11 @@ class SpeedTestAndroidContractTest {
         assertTrue(speedTest.contains("ConnectionTestNotification("))
         assertTrue(speedTest.contains("SpeedTestOutcome.completedOrNull("))
         assertTrue(speedTest.contains("updateSpeedTestResult("))
+        assertTrue(speedTest.contains("completedSpeedTestCount(index, total, sample.done)"))
+        assertTrue(speedTest.contains("binding.progressLinear.setProgressCompat(completed, true)"))
+        assertTrue(speedTest.contains("dialog.dismiss()"))
+        assertFalse(speedTest.contains("speed_test_finished_summary"))
+        assertFalse(speedTest.contains("results.forEach"))
         listOf(
             "sample.downloadBitsPerSecond",
             "sample.uploadBitsPerSecond",
@@ -93,9 +98,16 @@ class SpeedTestAndroidContractTest {
     @Test
     fun menuIsRewiredWithDataUsageConfirmation() {
         val menu = source("main/res/menu/add_profile_menu.xml")
+        val layout = source("main/res/layout/layout_progress_list.xml")
         val strings = source("main/res/values/strings.xml")
+        val urlTestPosition = menu.indexOf("android:id=\"@+id/action_connection_url_test\"")
+        val speedTestPosition = menu.indexOf("android:id=\"@+id/action_connection_tcp_ping\"")
         assertTrue(menu.contains("android:id=\"@+id/action_connection_tcp_ping\""))
         assertTrue(menu.contains("android:title=\"@string/speed_test_group\""))
+        assertTrue(urlTestPosition >= 0)
+        assertTrue(speedTestPosition > urlTestPosition)
+        assertTrue(layout.contains("android:id=\"@+id/progress_linear\""))
+        assertTrue(layout.contains("android:visibility=\"gone\""))
         assertTrue(strings.contains("name=\"speed_test_confirm_message\""))
     }
 

app/src/test/java/io/nekohasekai/sagernet/bg/proto/SpeedTestQueueRunnerTest.kt

@@ -8,6 +8,16 @@ import org.junit.Test
 
 class SpeedTestQueueRunnerTest {
 
+    @Test
+    fun completedCountAdvancesOnlyWhenCurrentNodeFinishes() {
+        assertEquals(0, completedSpeedTestCount(index = 0, total = 3, done = false))
+        assertEquals(1, completedSpeedTestCount(index = 0, total = 3, done = true))
+        assertEquals(1, completedSpeedTestCount(index = 1, total = 3, done = false))
+        assertEquals(2, completedSpeedTestCount(index = 1, total = 3, done = true))
+        assertEquals(3, completedSpeedTestCount(index = 2, total = 3, done = true))
+        assertEquals(0, completedSpeedTestCount(index = 0, total = 0, done = true))
+    }
+
     @Test
     fun nodesRunSeriallyAndFailureDoesNotStopQueue() = runBlocking {
         val profiles = listOf(1L, 2L, 3L)

openspec/changes/align-connection-and-speed-tests/tasks.md

@@ -20,7 +20,7 @@
 - [x] 3.2 实现“速度测试本组”进度 UI/通知，明确当前节点与下载/上传阶段，展示实时吞吐、服务器/延迟、失败和取消；使用独立于 `ProxyEntity.ping/status` 的 profile 关联持久化字段或实体保存成功结果，并在节点卡片右下角现有测速信息区域以主题灰色辅助文字按模式展示最终上下行吞吐。结果在关闭临时 UI、列表重绑/刷新及重新进入页面后仍保留，直到清除测试结果或下一次成功测速原子覆盖；失败/取消不得写入伪造成功值。
 - [x] 3.3 将原 TCPing 菜单位置重新接线到速度测试组入口，并增加耗流量提示或明确确认流程；保留 URL 测试互斥状态，防止两类批量测试同时运行。
 - [x] 3.4 增加 Android 单元/组件测试，验证节点串行顺序、四种模式参数、采样到 UI 映射、单节点失败后队列策略、取消、Fragment 销毁和通知最小化恢复；覆盖专用速度结果的持久化读写、按模式格式化、节点卡片右下角主题灰色绑定、列表重绑/重新进入恢复、下一次成功结果覆盖、清除测试结果，以及失败/取消不写入成功吞吐值。
-- [ ] 3.5 精简组测速 UI 并修正菜单顺序：测速弹窗仅展示当前正在测速的节点及其实时阶段/吞吐，不在弹窗内累积已完成节点详情，队列完成后不再显示结果汇总弹窗；增加按“已完成节点数/总节点数”更新的组队列进度条，最终结果继续仅在各节点卡片现有测速信息区域逐条展示。将“速度测试本组”固定排列在“URL 测试本组”下方。补充 Android 单元/组件测试，覆盖菜单顺序、进度条更新、弹窗切换节点时替换而非追加内容、完成后无汇总弹窗，以及节点卡片结果持久显示不受影响。
+- [x] 3.5 精简组测速 UI 并修正菜单顺序：测速弹窗仅展示当前正在测速的节点及其实时阶段/吞吐，不在弹窗内累积已完成节点详情，队列完成后不再显示结果汇总弹窗；增加按“已完成节点数/总节点数”更新的组队列进度条，最终结果继续仅在各节点卡片现有测速信息区域逐条展示。将“速度测试本组”固定排列在“URL 测试本组”下方。补充 Android 单元/组件测试，覆盖菜单顺序、进度条更新、弹窗切换节点时替换而非追加内容、完成后无汇总弹窗，以及节点卡片结果持久显示不受影响。
 - [ ] 3.6 提交本批次并运行 GitHub Actions Android unit/lint/build 与 libcore 集成 job；预期所有模式参数、生命周期、持久化、节点卡片结果、精简测速弹窗、队列进度条和菜单顺序测试通过。随后在至少两个节点的真机组中执行下载+上传、仅上传和简单下载，确认流量经过各节点、节点间不并发、弹窗只显示当前节点、进度条持续更新、完成后无汇总弹窗且取消及时；确认“速度测试本组”位于“URL 测试本组”下方，每个成功结果以灰色辅助文字保留在对应节点卡片右下角，关闭对话框、刷新列表和重新进入页面后仍在，下一次测速可覆盖且“清除测试结果”会移除；回传 run 链接、提交 SHA、录屏/截图、测试服务器日志或节点出口 IP/流量证据和失败日志。
 
 ## 4. 移除旧 TCP/ICMP Ping 专属代码