Skip to content

fix/reorder-block-order #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ykisana merged 1 commit into from
Oct 15, 2026
Merged

fix/reorder-block-order #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Normal/Services/TimedUnblockService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,9 @@ final class TimedUnblockService {
) throws {
let activityName = SharedConstants.mainTimedUnblockActivityName
cancelMonitoring(activityName: activityName)
cancelAllGroupUnblocks()

let start = Date.now
let endDate = start.addingTimeInterval(duration.timeInterval)
screenTimeService.removeShieldOnAll(blockAllPreventsAppDelete: blockAllPreventsAppDelete)
sharedStore.setScheduleOverrideActive(false)
try scheduleActivity(name: activityName, start: start, endDate: endDate)

try persist(
Expand All @@ -77,6 +74,10 @@ final class TimedUnblockService {
isGroupUnblock: false,
blockAllPreventsAppDelete: blockAllPreventsAppDelete
)

cancelAllGroupUnblocks()
screenTimeService.removeShieldOnAll(blockAllPreventsAppDelete: blockAllPreventsAppDelete)
sharedStore.setScheduleOverrideActive(false)
}

func startGroup(
Expand All @@ -92,7 +93,6 @@ final class TimedUnblockService {

let start = Date.now
let endDate = start.addingTimeInterval(duration.timeInterval)
screenTimeService.removeFromShields(selection: selection, customDomains: customDomains)
try scheduleActivity(name: activityName, start: start, endDate: endDate)

try persist(
Expand All @@ -104,6 +104,8 @@ final class TimedUnblockService {
activityName: activityName,
isGroupUnblock: true
)

screenTimeService.removeFromShields(selection: selection, customDomains: customDomains)
}

func cancelMain(
Expand Down
48 changes: 48 additions & 0 deletions NormalTests/Services/TimedUnblockServiceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,54 @@ struct TimedUnblockServiceTests {
#expect(service.isGroupUnblockActive(groupId: groupId))
}

private struct RegistrationFailed: Error {}

@Test func startMainRegistrationFailureLeavesShieldsAndGroupUnblocks() throws {
let (service, activity, store) = makeService()
let screenTime = FakeScreenTimeService()
let groupId = UUID()
try service.startGroup(
duration: .fifteenMinutes,
groupId: groupId,
selection: FamilyActivitySelection(),
screenTimeService: screenTime
)
activity.startError = RegistrationFailed()

#expect(throws: RegistrationFailed.self) {
try service.startMain(
duration: .fifteenMinutes,
selection: FamilyActivitySelection(),
screenTimeService: screenTime
)
}

#expect(!screenTime.removeShieldOnAllCalled)
#expect(!service.isMainUnblockActive)
#expect(service.isGroupUnblockActive(groupId: groupId))
#expect(store.timedUnblocks.map(\.id) == [groupId.uuidString])
}

@Test func startGroupRegistrationFailureLeavesShields() {
let (service, activity, store) = makeService()
let screenTime = FakeScreenTimeService()
let groupId = UUID()
activity.startError = RegistrationFailed()

#expect(throws: RegistrationFailed.self) {
try service.startGroup(
duration: .fifteenMinutes,
groupId: groupId,
selection: FamilyActivitySelection(),
screenTimeService: screenTime
)
}

#expect(!screenTime.removeFromShieldsCalled)
#expect(!service.isGroupUnblockActive(groupId: groupId))
#expect(store.timedUnblocks.isEmpty)
}

@Test func customDurationSetsEndDateAndPersistsStartDate() throws {
let (service, _, store) = makeService()
let custom = try #require(TimedUnblockDuration(validating: 5700))
Expand Down
Loading