Skip to content

android: drop health warnings when backend reports none #902

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

Open
thekonz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

android: drop health warnings when backend reports none #902

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion android/src/main/java/com/tailscale/ipn/ui/notifier/HealthNotifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ class HealthNotifier(
}
.collect { health ->
TSLog.d(TAG, "Health updated: ${health?.Warnings?.keys?.sorted()}")
health?.Warnings?.values?.filterNotNull()?.toTypedArray()?.let(::notifyHealthUpdated)
// A healthy backend sends Warnings = null; treat it as empty so that
// previously shown warnings are dropped.
notifyHealthUpdated(
health?.Warnings?.values?.filterNotNull()?.toTypedArray() ?: emptyArray()
)
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions android/src/test/kotlin/com/tailscale/ipn/ui/notifier/HealthNotifierTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,24 @@ class HealthNotifierTest {
assertTrue(notifier.currentWarnings.value.isEmpty())
}

/**
* The backend reports a fully healthy state as Warnings = null (a nil Go map), not as an empty
* map. The warning must still be dropped.
*/
@Test
fun warningClearsWhenBackendSendsNullWarnings() = runTest {
val (healthFlow, _, notifier) = createRunningNotifier()

healthFlow.value = healthState(derpWarning())
settle()
assertEquals(1, notifier.currentWarnings.value.size)

healthFlow.value = Health.State(Warnings = null)
settle()
assertTrue(notifier.currentWarnings.value.isEmpty())
assertNull(notifier.currentIcon.value)
}

@Test
fun warningsDroppedWhenStateLeavesRunning() = runTest {
val (healthFlow, ipnFlow, notifier) = createRunningNotifier()
Expand Down