[mem-5514-tahara]

Summary

Split out from #139 per review feedback, with _cancelGeneration renamed to _subscriptionVersion.

If a listener cancels its subscription while a connectivity check is still running, that check's result belongs to the old subscription. Without a guard:

• it could still get emitted to a brand-new subscriber that started its own fresh check moments later, or
• it could restart the polling timer even though nobody is listening anymore.

This adds a _subscriptionVersion counter, bumped only when a listener cancels. _maybeEmitStatusUpdate snapshots it before the check starts and skips both the emit and the next timer reschedule if it changed while the check was in-flight.

Test plan

• dart analyze — no issues
• dart format --set-exit-if-changed — clean
• dart test — all tests pass, including two new regression tests:
  • cancelled in-flight check does not emit stale result to new subscriber
  • does not restart the timer if cancelled while a check is in-flight

[OutdatedGuy]

Few changes

[Copilot]

Pull request overview

Adds subscription-version tracking to discard connectivity results from cancelled subscriptions.

Changes:

• Guards status emissions against stale in-flight checks.
• Adds cancellation and resubscription regression tests.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
lib/src/internet_connection.dart	Adds stale-result detection during polling.
test/internet_connection_test.dart	Tests cancellation during in-flight checks.

Suppressed comments (1)

lib/src/internet_connection.dart:304

• The version is advanced only after awaiting trigger-stream cleanup. If that subscription has asynchronous cancellation, a replacement listener can attach and the old connectivity check can finish while the version is still unchanged, allowing the stale result to be emitted to the replacement subscriber. Invalidate the generation synchronously before the first await.

  Future<void> _handleStatusChangeCancel() async {
    await _triggerSubscription?.cancel();
    _triggerSubscription = null;
    _subscriptionVersion++;

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[mem-5514-tahara]

Hi @OutdatedGuy, just a gentle follow-up on this PR as well!

The Copilot review feedback regarding early return on stale checks has been applied, and all tests/checks are green.

Whenever you have time to take a look at both #148 and #139, please let me know. Thanks!

[Copilot]

🟢 Approval recommended

The reviewed changes are focused, tested, and have no unresolved issues.

Review details

• Files reviewed: 2/2 changed files
• Comments generated: 0 new
• Review effort level: Balanced

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[OutdatedGuy]

LGTM!

[Copilot]

🔵 Needs a closer look

The cancellation test passes even with the pre-fix implementation because it checks connectivity calls rather than timer creation, leaving the unintended polling-timer restart undetected.

No open issues 🎉

1 previously missed issue

In code that hasn't changed since last review

Test does not detect polling timer restart after cancellation

test/​internet_connection_test.dart:357

This assertion also passes with the pre-fix implementation: the cancelled check schedules a timer, but its callback returns at if (!_statusController.hasListener) return; before invoking another connectivity check, so checkCount remains 1. The test therefore does not detect the timer restart it is intended to prevent. Track timer creation (for example, with ZoneSpecification.createTimer) and assert that completing the cancelled check schedules no polling timer.

_{Review effort: Balanced}