Skip to content

URL-test: clear stale error on success; ignore cancelled-test failures #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hawkff merged 1 commit into from
Jun 20, 2026
Merged

URL-test: clear stale error on success; ignore cancelled-test failures #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,8 @@ class ConfigurationFragment @JvmOverloads constructor(
if (!isActive) break
profile.status = 1
profile.ping = (SystemClock.elapsedRealtime() - start).toInt()
// Clear any stale error from a previous failed test.
profile.error = null
test.update(profile)
} finally {
socket.closeQuietly()
Expand Down Expand Up @@ -962,14 +964,23 @@ class ConfigurationFragment @JvmOverloads constructor(
val result = urlTest.doTest(profile)
profile.status = 1
profile.ping = result
// Clear any stale error from a previous failed test so a now-passing
// profile doesn't keep showing an old failure message.
profile.error = null
} catch (e: PluginManager.PluginNotFoundException) {
if (!isActive) break
profile.status = 2
profile.error = e.readableMessage
} catch (e: Exception) {
// A cancelled test (dialog cancel / teardown) kills the sidecar
// mid-handshake and throws here. Don't record that as a profile
// failure — it isn't one. The pingTest path guards the same way.
if (!isActive) break
profile.status = 3
profile.error = e.readableMessage
}

if (!isActive) break
test.update(profile)
}
})
Expand Down
Loading