feat: add IFW rule editor UI for per-component intent filtering by lihenggui · Pull Request #1498 · lihenggui/blocker

lihenggui · 2026-03-16T03:07:17Z

Summary

New feature:ifwrule module (api + impl) with per-component IFW rule editor screen
Scenario-driven UI with user-friendly language — no IFW/XML technical terms exposed to users
Supports all IFW filter types via intuitive condition cards: action, sender, sender-package, sender-permission, category, host, path, scheme, port, mime-type, data, component pattern
Bidirectional mapper (IfwRuleUiMapper) converts between UI state and IfwRules domain model
Progressive disclosure: simple "block all" toggle for basic use, expandable conditions for advanced users
Dedicated IfwRule per component for independent block/log settings
Entry point: component long-press context menu → "自定义拦截规则" (hidden for Provider type)
Advanced options: log toggle, monitor-only mode (block=false)
Handles unrecognizable legacy rules gracefully with read-only banner

Depends on #1497 (IFW full parameter support)

Test plan

Unit tests for IfwRuleUiMapper (15 tests covering all mapping directions, edge cases, merge strategy)
Unit tests for IfwRuleEditorViewModel (5 tests covering load/save/state transitions)
Manual test: long press component → "自定义拦截规则" opens editor
Manual test: save "block all" → verify component-filter written to IFW file
Manual test: save conditional rule → verify and/or/not structure in IFW file
Manual test: edit existing rule → verify round-trip preservation
Manual test: Provider components should not show the menu item

…e picker

…rule flow Adds a new top-level navigation tab for viewing and managing all IFW rules on the device. Includes rule list grouped by package, delete with confirmation, and an add-rule screen with condition editor.

… and edit rule flow

…ponent names, add transition animation, translate Block to 阻止

Change-Id: I95b5c309cb4a2adf48cc047962e738619fb7133e

Change-Id: I3f8fe5c2326d0bca14798fef751c8a5a4b23de03

Change-Id: I70740d09ae9fb52d8226e51fce9f637c112e78b3

...ifwrule/impl/src/main/kotlin/com/merxury/blocker/feature/globalifwrule/impl/AddRuleScreen.kt

...e/impl/src/main/kotlin/com/merxury/blocker/feature/globalifwrule/impl/GlobalIfwRuleScreen.kt

feature/globalifwrule/impl/src/main/res/values/strings.xml

core/ui/src/main/res/values/strings.xml

app-compose/src/main/res/values/strings.xml

Change-Id: I871aa52fddb35740dfae2fe0e4fda6ab54a072f3

Change-Id: Icb245523621a5384e71bdd33ad6095c74b18ed46

Change-Id: I7e5d46a4473784ad5c9d8555307c7d787b167f25

github-advanced-security

Android Lint found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

- Fix toTopLevelFilters() to always wrap root group as single filter, preventing ALL-mode conditions from being incorrectly OR'd by IFW - Simplify per-component toIfwFilter() to use toIfwFilterOrNull() directly - Replace FQN references in AddRuleScreen SwitchRow with proper imports - Update test expectation for nested And structure

… toolbar - Split IfwRuleTreeEditor.kt (732 lines) into 5 focused files in ifwruleeditor sub-package - Fix critical IFW semantic bug: top-level filters in a rule are OR'd (not AND'd). toEditorRootGroup() now defaults to ANY mode, matching IFW behavior. Per-component editor correctly uses ALL for filters extracted from And wrappers - Move save button from bottom to toolbar (check icon) in both IfwRuleEditorScreen and AddRuleScreen - Add unsaved changes confirmation dialog on back navigation - Add app icon to Firewall page package headers - Fix FQN reference in IfwRuleEditorScreen

Change-Id: I9cae42be44b33d9d7ad3785a86b380d76af89d89

Change-Id: I741ce05436b36e6cfeef925f0c6c894e3f3cf083

core/ui/src/main/kotlin/com/merxury/blocker/core/ui/ifwruleeditor/ConditionEditorCard.kt

core/ui/src/main/kotlin/com/merxury/blocker/core/ui/ifwruleeditor/GroupEditorCard.kt

...ifwrule/impl/src/main/kotlin/com/merxury/blocker/feature/globalifwrule/impl/AddRuleScreen.kt

...e/impl/src/main/kotlin/com/merxury/blocker/feature/globalifwrule/impl/GlobalIfwRuleScreen.kt

...mpl/src/main/kotlin/com/merxury/blocker/feature/globalifwrule/impl/GlobalIfwRuleViewModel.kt

...ule/impl/src/main/kotlin/com/merxury/blocker/feature/ifwrule/impl/model/RuleEditorUiState.kt

...ifwrule/impl/src/main/kotlin/com/merxury/blocker/feature/ifwrule/impl/IfwRuleEditorScreen.kt

...rule/impl/src/main/kotlin/com/merxury/blocker/feature/ifwrule/impl/IfwRuleEditorViewModel.kt

juliewww · 2026-03-18T07:23:29Z

Find an issue: Every time I open the Firewall screen, it will reload even though it's empty

Change-Id: I4d6d3f21f2ea9d7dcfcdc33453baad3f819e8109

Change-Id: Iabf8b1d96c223cd67fe5db5f1401d6ebaf5d24b5

Change-Id: I5fcd8482b820b48acab46ac35c72d8dfcf4281e8

Change-Id: I70360b3f28d4e287f98dc3f653a3cc2d5341ae30

...ifwrule/impl/src/main/kotlin/com/merxury/blocker/feature/ifwrule/impl/IfwRuleEditorScreen.kt

lihenggui and others added 18 commits March 15, 2026 19:32

feat(ifwrule): add feature:ifwrule:api module with navigation key

4a46cfc

feat(ifwrule): add feature:ifwrule:impl module skeleton with strings

8d817bc

feat(ifwrule): add UI state model for rule editor

a8550c0

feat(ifwrule): add bidirectional IfwRules <-> UI state mapper with tests

4588a18

feat(ifwrule): add IfwRuleEditorViewModel with load/save/update logic

c943816

feat(ifwrule): wire navigation from component menu to rule editor

4926987

feat(ifwrule): implement rule editor screen, condition cards, and typ…

6b4b54e

…e picker

fix(ifwrule): use correct resource prefix for lint compliance

495301e

feat(ifw): add getAllRules API and filter summary text helper

5ea74f5

feat(globalifwrule): add global IFW rules tab with rule list and add …

43bf2de

…rule flow Adds a new top-level navigation tab for viewing and managing all IFW rules on the device. Includes rule list grouped by package, delete with confirmation, and an add-rule screen with condition editor.

🤖 Updates graphs

077ba51

fix(globalifwrule): add lifecycle refresh, multi-line filter display,…

2348888

… and edit rule flow

fix(globalifwrule): click to edit, long-press to delete, simplify com…

527a746

…ponent names, add transition animation, translate Block to 阻止

Fix IFW rule editor regression and app nav tests

a05b668

Change-Id: I95b5c309cb4a2adf48cc047962e738619fb7133e

🤖 Updates screenshots

e26675e

Normalize gradlew.bat line endings

f77ab08

Change-Id: I3f8fe5c2326d0bca14798fef751c8a5a4b23de03

Fix feature coupling and hoist IFW editor state

c0d032a

Change-Id: I70740d09ae9fb52d8226e51fce9f637c112e78b3

🤖 Updates graphs

b099921

github-advanced-security bot found potential problems Mar 16, 2026

View reviewed changes

lihenggui and others added 4 commits March 16, 2026 13:48

Support modern IFW rule editors

646b3eb

Change-Id: I871aa52fddb35740dfae2fe0e4fda6ab54a072f3

Build user-friendly tree editor for IFW rules

dd2c3aa

Change-Id: Icb245523621a5384e71bdd33ad6095c74b18ed46

Fix IFW editor formatting issues

1cecb5e

Change-Id: I7e5d46a4473784ad5c9d8555307c7d787b167f25

🤖 Updates graphs

bca0411

github-advanced-security bot found potential problems Mar 16, 2026

View reviewed changes

lihenggui added 4 commits March 16, 2026 15:49

Fix IFW rule selector handling

2e57360

Change-Id: I9cae42be44b33d9d7ad3785a86b380d76af89d89

Align IFW parsing with AOSP intent filters

20c4573

Change-Id: I741ce05436b36e6cfeef925f0c6c894e3f3cf083