Brendan Chen
31830cb141
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.
111 lines
4.4 KiB
Swift
111 lines
4.4 KiB
Swift
//
|
|
// LimitEnforcement.swift
|
|
// OpenAppLock
|
|
//
|
|
|
|
import Foundation
|
|
|
|
/// Shared reactions to Screen Time events for limit rules, driven by the
|
|
/// snapshot store and usage ledger. The DeviceActivity monitor and shield
|
|
/// extensions call these; keeping the logic here makes it unit-testable from
|
|
/// the app target.
|
|
struct LimitEnforcement {
|
|
let snapshots: RuleSnapshotStore
|
|
let ledger: UsageLedger
|
|
let shields: ShieldApplying
|
|
/// Granted-open session bookkeeping shared with the foreground enforcer.
|
|
var sessions = OpenSessionStore()
|
|
|
|
/// Midnight (or monitoring start): fresh budgets. Open-limit rules are
|
|
/// proactively shielded on enabled days so the shield can count opens;
|
|
/// time-limit rules start the day unshielded.
|
|
func handleDayStart(ruleID: UUID, now: Date = .now, calendar: Calendar = .current) {
|
|
guard let snapshot = snapshots.snapshot(for: ruleID), snapshot.isEnabled,
|
|
!snapshot.isPaused(at: now)
|
|
else { return }
|
|
let usage = ledger.usage(for: ruleID, onDayContaining: now, calendar: calendar)
|
|
switch snapshot.kind {
|
|
case .schedule:
|
|
break
|
|
case .openLimit:
|
|
if snapshot.isScheduledToday(at: now, calendar: calendar) {
|
|
shield(snapshot)
|
|
} else {
|
|
shields.clearShield(ruleID: ruleID)
|
|
}
|
|
case .timeLimit:
|
|
if snapshot.limitReached(given: usage),
|
|
snapshot.isScheduledToday(at: now, calendar: calendar) {
|
|
shield(snapshot)
|
|
} else {
|
|
shields.clearShield(ruleID: ruleID)
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A cumulative usage checkpoint fired for a time-limit rule.
|
|
func handleUsageMinutes(
|
|
_ minutes: Int, ruleID: UUID, now: Date = .now, calendar: Calendar = .current
|
|
) {
|
|
ledger.recordMinutesUsed(minutes, for: ruleID, onDayContaining: now, calendar: calendar)
|
|
guard let snapshot = snapshots.snapshot(for: ruleID), snapshot.isEnabled,
|
|
snapshot.kind == .timeLimit,
|
|
!snapshot.isPaused(at: now),
|
|
snapshot.isScheduledToday(at: now, calendar: calendar)
|
|
else { return }
|
|
let usage = ledger.usage(for: ruleID, onDayContaining: now, calendar: calendar)
|
|
if snapshot.limitReached(given: usage) {
|
|
shield(snapshot)
|
|
}
|
|
}
|
|
|
|
/// The wall-clock session granted by an "Open" press ended; the shield
|
|
/// returns so the next open costs another press.
|
|
func handleOpenSessionEnded(
|
|
ruleID: UUID, now: Date = .now, calendar: Calendar = .current
|
|
) {
|
|
sessions.endSession(for: ruleID)
|
|
guard let snapshot = snapshots.snapshot(for: ruleID), snapshot.isEnabled,
|
|
snapshot.kind == .openLimit,
|
|
!snapshot.isPaused(at: now),
|
|
snapshot.isScheduledToday(at: now, calendar: calendar)
|
|
else { return }
|
|
shield(snapshot)
|
|
}
|
|
|
|
/// "Open" pressed on the shield. Spends one open and lifts the rule's
|
|
/// shield when the budget allows; returns whether a session was granted.
|
|
@discardableResult
|
|
func handleOpenRequest(
|
|
ruleID: UUID, now: Date = .now, calendar: Calendar = .current
|
|
) -> Bool {
|
|
guard let snapshot = snapshots.snapshot(for: ruleID), snapshot.isEnabled,
|
|
snapshot.kind == .openLimit,
|
|
!snapshot.isPaused(at: now)
|
|
else { return false }
|
|
let usage = ledger.usage(for: ruleID, onDayContaining: now, calendar: calendar)
|
|
guard !snapshot.limitReached(given: usage) else { return false }
|
|
ledger.recordOpen(for: ruleID, onDayContaining: now, calendar: calendar)
|
|
shields.clearShield(ruleID: ruleID)
|
|
// Mark the session so neither enforcement path re-shields the app until
|
|
// it ends (+1 minute matches the one-shot activity's padding).
|
|
if let expiry = calendar.date(
|
|
byAdding: .minute, value: MonitoringPlan.openSessionMinutes + 1, to: now)
|
|
{
|
|
sessions.startSession(for: ruleID, until: expiry)
|
|
}
|
|
return true
|
|
}
|
|
|
|
private func shield(_ snapshot: RuleSnapshot) {
|
|
shields.applyShield(
|
|
ruleID: snapshot.id,
|
|
selectionData: snapshot.selectionData,
|
|
// Limit rules are always Block and never engage the adult-content
|
|
// filter — those are Schedule-only options.
|
|
mode: .block,
|
|
blockAdultContent: false
|
|
)
|
|
}
|
|
}
|