chore: sync fork with upstream nfcim/flutter_nfc_kit develop (3.6.2)#2
Open
dobby-coder[bot] wants to merge 7 commits into
Open
chore: sync fork with upstream nfcim/flutter_nfc_kit develop (3.6.2)#2dobby-coder[bot] wants to merge 7 commits into
dobby-coder[bot] wants to merge 7 commits into
Conversation
Add optional flags to reader mode
Add option to specify `EXTRA_READER_PRESENCE_CHECK_DELAY` on Android
run `dart format`
Feature: add androidReaderModeFlags option to pollTag
Author
|
Self-review fix: updated the PR body to replace Per the No code changes — the diff is unchanged (a clean fast-forward of |
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
Rebase this fork onto
nfcim/flutter_nfc_kit:develop(3.6.2). The fork's only diverging commit (the merge of #1 — Android poll fix) is already in upstream as nfcim/flutter_nfc_kit#228, so there is no fork-specific work left to preserve.This PR was generated as part of the encryption4all/dobby#105 audit findings (L1 — fork 7 commits behind, missing 3.6.2).
What this brings in
b860c91androidReaderModeFlags(feat)88a5725android-poll-fixalready in this fork as PR #10e679b90163bfd2c930fb9a4038d531ec8egit diff origin/develop..upstream/develop --stat:Consumer impact
privacybydesign/irmamobile(yivi_app, yivi_core, yivi_fdroid) andprivacybydesign/vcmrtdpin via git URL to this fork's default branch, so they will pick up 3.6.2 after this merges.Suggested merge style
Use "Create a merge commit" (default). The fork's existing merge commit
6af23fewill remain in history, harmless. Optionally, after merging, force-updatedevelopto matchnfcim:developdirectly to drop the now-redundant6af23fe.Out of scope (tracked upstream)
The other audit findings (M1 WebUSB magic comparison; L2 APDU log level; L3 release-mode type guards; L5 workflow
permissions:hardening) are upstream code, and fixing them in this fork would re-introduce divergence. They belong onnfcim/flutter_nfc_kit; the bot lacks write access to file them there.Test plan
test.yml,example-app.yml)Part of encryption4all/dobby#105 (L1, L4 partial — tracker stays open for M1/L2/L3/L5 upstream).
🤖 Filed by Dobby on behalf of the encryption4all audit routine.