fix(android): inline VpnTileService IO/Main dispatcher switch and guard on isActive - #16
Merged
Merged
Conversation
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.
Plan 009 — Fix VpnTileService IO/Main dispatcher bug + null guard
Replaces the nested
launch(Dispatchers.Main)inside the IO coroutine with a singletileScope.launchusingwithContext(Dispatchers.IO)for the Room read, plus anisActiveguard after the DB read returns.What changed
VpnTileService.kt: RewroteconnectFromTileIfReady— the nestedlaunch(Dispatchers.Main)is gone; the outer launch runs on the scope's default Main dispatcher, with an explicitwithContext(Dispatchers.IO)hop for the database call and anisActivecheck before callingVpnManager.connectoropenApp.VpnTileService.kt: ExtractedTileActionenum andtileActionForSelectedProfile()as a testable pure function.VpnTileServiceConnectLogicTest.kt: New unit test — 2 cases pinning both branches of the decision logic.Why
The original structure had two issues:
launch(Dispatchers.Main)could complete afteronDestroycancelled the parent scope (cancel is non-preemptive for non-suspending calls likeVpnManager.connect).Verification
launch(Dispatchers.Main)remaining in VpnTileService.ktwithContext(Dispatchers.IO)+isActiveguard presentcompileDebugKotlin,testDebugUnitTest,assembleDebugon pushScope
Only
VpnTileService.ktand the new test file are modified. No changes to manifest,VpnManager.kt, orupdateTile().