Repository navigation
fix: show Home's block controls when only websites are selected - #110
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.
Problem
When only websites are selected (no apps), the Block All shortcut blocks them, but Normal itself offers no way to unblock:
The only ways out are the Unblock All shortcut, the Quick Unlock widget, or an emergency unblock.
The shortcut counts websites as something to block (
IntentContext.mainSelection), but Home only counts apps. UI tests didn't catch this because Home shows its controls wheneverUITestSupport.isActiveis set.Fix
SelectedApps.hasItemsToBlock(customDomainsEnabled:)holds the shortcut's rule, and both Home and the shortcut use it. Home's status and button views already count websites.UITestSupport.isActiveoverride. UI tests have seeded apps into the main selection since 0837fa5, so it only hid this case.-uiTestWebsitesOnlylaunch option: seedsexample.comwith no apps, and with-uiTestStartBlockedstarts with that site blocked.Websites-only users now also get Block All on Home, matching the shortcut. Groups and Schedules still require apps.
Tests
testBlockedWebsitesWithoutAppsCanBeUnblockedFromHome: starts with only websites blocked and unblocks them from Home with the key.