Fix duplicate iOS sleep-stage queries - #21
Merged
Merged
Conversation
…leepData Sleep types are now always routed through getSleepData/_dataSleepQuery on iOS, so the SLEEP_* filter branches in getData() were unreachable and duplicated the category-value mapping already encoded in _requestedIosSleepType. Removed to avoid the two copies drifting. getSleepData() was writing the literal string "unknown" when a sample had no HKDevice, which defeats health_data_point.dart's null-coalescing fallback to Health().deviceId (that fallback only triggers when the key is absent/null). Now omits source_device_id entirely when there's no device, matching the pattern used elsewhere in this file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Why
On iOS, SLEEP_DEEP and SLEEP_ASLEEP_DEEP both filter the same HealthKit category value, as do SLEEP_REM and SLEEP_ASLEEP_REM. SLEEP_ASLEEP also overlaps SLEEP_ASLEEP_CORE for Core records. Asking for the full iOS sleep set therefore returned the same native samples under multiple Dart types.
In a diagnostic export containing 951 sleep rows, all 80 Deep records, all 110 REM records, and 243 Core records were duplicated. There were only 518 unique time intervals, all from the same Apple Watch source.
The Apple-specific aliases also retained raw category values 3, 4, and 5 while declaring MINUTE as their unit. This change converts them from timestamps just like the generic sleep types.
Compatibility
Verification
The package-wide analyzer still reports its existing example-app info-level lint backlog; no new diagnostic points to the changed files.