brendan/OpenAppLock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: enforce open-limit rules proactively in the foreground

Browse Source 
RuleEnforcer.refresh only shielded a limit rule once its budget was
spent, so it tore down the background's proactive open-limit "turnstile"
shield (the shield is how opens are counted) whenever the app was
foregrounded, and a freshly created open-limit rule did nothing until
the next midnight reset.

refresh now applies the same proactive gate as
LimitEnforcement.handleDayStart: an enabled, scheduled-today, un-paused
open-limit rule is shielded even before its budget is spent, so it takes
effect immediately. A new app-group OpenSessionStore records a granted
"Open" session's expiry so neither enforcement path re-shields (and cuts
short) a sanctioned ~15-minute session.

Overlapping rules already enforce strictly: each rule shields its own
ManagedSettingsStore and Screen Time unions them, so an app is blocked
if any covering rule blocks it. Document that model in the spec (§4.8)
and lock it in with tests, including a time limit blocking during an
open-limit's granted session and a daily opens reset.

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Brendan Chen
2026-06-13 13:52:54 -04:00
parent 783a8571a7
commit f82bb88b1b
8 changed files with 356 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenAppLockTests/SchedulingTests.swift
View File

@@ -373,7 +373,12 @@ struct LimitEnforcementTests {
let shields = MockShieldController()
let ledger = UsageLedger(defaults: freshDefaults())
let store = RuleSnapshotStore(defaults: freshDefaults())
return (LimitEnforcement(snapshots: store, ledger: ledger, shields: shields), shields, ledger, store)
// Isolated session store so granted-open writes don't touch the app group.
return (
LimitEnforcement(
snapshots: store, ledger: ledger, shields: shields,
sessions: OpenSessionStore(defaults: freshDefaults())),
shields, ledger, store)
}
private func snapshot(
@@ -450,6 +455,28 @@ struct LimitEnforcementTests {
#expect(shields.shieldedRuleIDs == [snap.id])
}
@Test("Granting an open records a session marker; ending it clears it")
func openSessionMarkerLifecycle() {
let shields = MockShieldController()
let ledger = UsageLedger(defaults: freshDefaults())
let store = RuleSnapshotStore(defaults: freshDefaults())
let sessions = OpenSessionStore(defaults: freshDefaults())
let enforcement = LimitEnforcement(
snapshots: store, ledger: ledger, shields: shields, sessions: sessions)
let snap = snapshot(kind: .openLimit, maxOpens: 3)
store.save([snap])
#expect(!sessions.hasActiveSession(for: snap.id, at: monday))
#expect(enforcement.handleOpenRequest(ruleID: snap.id, now: monday, calendar: utc))
// The granted ~15-minute session is now recorded and live...
#expect(sessions.hasActiveSession(for: snap.id, at: monday))
// ...but expires after the session length.
#expect(!sessions.hasActiveSession(for: snap.id, at: date(2025, 1, 6, 10, 17)))
enforcement.handleOpenSessionEnded(ruleID: snap.id, now: monday, calendar: utc)
#expect(!sessions.hasActiveSession(for: snap.id, at: monday))
}
@Test("Session end re-shields the rule for the next open")
func sessionEndReshields() {
let (enforcement, shields, _, store) = makeEnforcement()