From bbbea9fe1ca36f87affc1a472a96b203cf946a9b Mon Sep 17 00:00:00 2001 From: ykisana Date: Tue, 17 Nov 2026 00:41:47 -0600 Subject: [PATCH] refactor: remove TimedUnblockService.cancelMain Home's Block All Now goes through BlockActions.blockAll since #115, so cancelMain has no callers left. Its test goes with it; Block All Now's behavior is still covered by BlockActionsTests.blockAllEndsTimedUnblocks and BlockingScenarioTests.blockAllNowEndsTheTimedUnblockAndBlocksEverything. --- Normal/Services/TimedUnblockService.swift | 17 ---------------- .../Services/TimedUnblockServiceTests.swift | 20 ------------------- 2 files changed, 37 deletions(-) diff --git a/Normal/Services/TimedUnblockService.swift b/Normal/Services/TimedUnblockService.swift index 35a3f4b..bd647de 100644 --- a/Normal/Services/TimedUnblockService.swift +++ b/Normal/Services/TimedUnblockService.swift @@ -116,23 +116,6 @@ final class TimedUnblockService { return timing } - func cancelMain( - selection: FamilyActivitySelection, - customDomains: [String] = [], - screenTimeService: any ScreenTimeProviding, - blockAllPreventsAppDelete: Bool = false - ) { - cancelMonitoring(activityName: SharedConstants.mainTimedUnblockActivityName) - cancelAllGroupUnblocks() - forget(id: Self.mainID) - syncHeartbeat() - screenTimeService.blockAll( - selection: selection, - customDomains: customDomains, - blockAllPreventsAppDelete: blockAllPreventsAppDelete - ) - } - func cancelGroup(groupId: UUID) { cancelMonitoring(activityName: SharedConstants.groupTimedUnblockActivityName(for: groupId)) forget(id: groupId.uuidString) diff --git a/NormalTests/Services/TimedUnblockServiceTests.swift b/NormalTests/Services/TimedUnblockServiceTests.swift index 893c4b9..f5736a7 100644 --- a/NormalTests/Services/TimedUnblockServiceTests.swift +++ b/NormalTests/Services/TimedUnblockServiceTests.swift @@ -210,26 +210,6 @@ struct TimedUnblockServiceTests { #expect(service.activeUnblockStartDates().isEmpty, "Live Activity falls back to now") } - @Test func cancelMainAppliesShieldsAndForgets() throws { - let (service, _, store) = makeService() - let screenTime = FakeScreenTimeService() - - try service.startMain( - duration: .fifteenMinutes, - selection: FamilyActivitySelection(), - screenTimeService: screenTime - ) - service.cancelMain( - selection: FamilyActivitySelection(), - screenTimeService: screenTime, - blockAllPreventsAppDelete: false - ) - - #expect(screenTime.blockAllCalled) - #expect(store.timedUnblocks.isEmpty) - #expect(!service.isMainUnblockActive) - } - @Test func cancelGroupForgetsTheUnblock() throws { let (service, _, store) = makeService() let screenTime = FakeScreenTimeService()