Fix MTU conflict with mieru plugin #529
Merged
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.
This bug was reported in enfein/mieru#111.
As shown in app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt, NekoBox has two data stores:
Previously, MieruSettingsActivity.kt uses
var mtu by configurationStore.stringToInt(Key.MTU)
to store the mieru MTU configuration. This has two problems. First, a mieru setting will override the global MTU configuration used by the VpnService. Second, two mieru settings can override each other.To fix this, we introduce a new field
var serverMTU by profileCacheStore.stringToInt(Key.SERVER_MTU)
to store the mieru MTU configuration. We confirmed that the APK built from https://github.com/enfein/NekoBoxForAndroid/actions/runs/7550857326 resolved this bug.