Skip to content

fix(android): guard network callback cleanup for API 21 #372

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
papi-ux merged 1 commit into from
Oct 20, 2026
Merged

fix(android): guard network callback cleanup for API 21 #372

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
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ jobs:
".github/workflows/build.yml",
"CHANGELOG.md",
"README.md",
"app/src/main/java/com/papi/nova/ui/NovaGameDetailActivity.kt",
"docs/screenshots/beta2/nova-control-detail-aurora.webp",
"docs/screenshots/beta2/nova-control-detail-director.webp",
"docs/screenshots/beta2/nova-play-setup-aurora.webp",
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/papi/nova/ui/NovaGameDetailActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,8 @@ class NovaGameDetailActivity : NovaActivity() {
private fun unregisterNetworkChangeCallback() {
val callback = networkChangeCallback ?: return
networkChangeCallback = null
// Only the Android 7.0 path above registers a callback; the same check here states that for lint.
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N) return
runCatching { getSystemService(android.net.ConnectivityManager::class.java)?.unregisterNetworkCallback(callback) }
}

Expand Down
16 changes: 15 additions & 1 deletion app/src/test/java/com/papi/nova/NovaReleaseMetadataTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,17 @@ class ReleaseReadback(unittest.TestCase):
(root / path).write_bytes(b"documentation media fixture\n")
git("add", path); git("commit", "-qm", "documentation image successor")
release = git("rev-parse", "HEAD"); git("tag", "-f", tag)
android_cases = {
"android-activity": "app/src/main/java/com/papi/nova/ui/NovaGameDetailActivity.kt",
"android-activity-near-name": "app/src/main/java/com/papi/nova/ui/NovaGameDetailActivity.kt.orig",
"android-other-source": "app/src/main/java/com/papi/nova/ui/NovaLibraryActivity.kt",
}
if case in android_cases:
path = android_cases[case]
(root / path).parent.mkdir(parents=True, exist_ok=True)
(root / path).write_text("Android-only source fixture\n")
git("add", path); git("commit", "-qm", "Android-only successor")
release = git("rev-parse", "HEAD"); git("tag", "-f", tag)
if case == "tag": git("tag", "-f", tag, source)
if case == "notes": (root / "body").write_text("different notes\n")
if case == "notes-source": (root / "runner/nova-release-notes.md").write_text("stale notes\n")
Expand All @@ -673,7 +684,8 @@ class ReleaseReadback(unittest.TestCase):
self.assertEqual(before, {p.name:p.read_bytes() for p in (root / "remote").iterdir()})
calls = [json.loads(line) for line in (root / "calls").read_text().splitlines()] if (root / "calls").exists() else []
self.assertTrue(all(a[:2] in (["release", "view"], ["release", "download"]) for a in calls))
if case in ("held", "tree", "runtime-qml", "readme-near-name", "readme-image-near-name", "readme-other-image"): self.assertEqual([], calls)
if case in ("held", "tree", "runtime-qml", "readme-near-name", "readme-image-near-name", "readme-other-image",
"android-activity-near-name", "android-other-source"): self.assertEqual([], calls)
print(case + ": expected " + ("PASS" if succeeds else "REFUSE"), flush=True)

def test_changed_release_boundaries(self):
Expand All @@ -689,6 +701,8 @@ class ReleaseReadback(unittest.TestCase):
("readme-image", "preflight", True), ("readme-director", "preflight", True),
("readme-play-setup", "preflight", True), ("readme-provenance", "preflight", True),
("readme-image-near-name", "preflight", False), ("readme-other-image", "preflight", False),
("android-activity", "preflight", True), ("android-activity-near-name", "preflight", False),
("android-other-source", "preflight", False),
("tree", "preflight", False),
("tag", "final", False), ("notes", "final", False), ("notes-source", "final", False),
("held", "preflight", False), ("managed-hash", "final", False)):
Expand Down
Loading