Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Normal/App/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct ContentView: View {
.environment(\.navigationCoordinator, navigationCoordinator)
.widgetActionResponder(coordinator: navigationCoordinator, selectedTab: $selectedTab)
.liveActivitySync()
.sheet(isPresented: $navigationCoordinator.isSettingsPresented) {
.sheet(isPresented: $navigationCoordinator.isSettingsPresented, onDismiss: navigationCoordinator.settingsDidDismiss) {
SettingsView(initialTab: navigationCoordinator.settingsInitialTab)
}
.onChange(of: onboardingService.requiredTab) { _, newTab in
Expand Down
4 changes: 4 additions & 0 deletions Normal/Modifiers/ProtectedActionModifier.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ struct ProtectedActionModifier: ViewModifier {
@Binding var action: (@MainActor () -> Void)?
var allowBypass: Bool
var defaultKeyType: KeyType?
var requestedKeyType: KeyType?
var keyGroupID: UUID?
var requestID: UUID?

Expand All @@ -14,6 +15,7 @@ struct ProtectedActionModifier: ViewModifier {
action: $action,
allowBypass: allowBypass,
defaultKeyType: defaultKeyType,
requestedKeyType: requestedKeyType,
keyGroupID: keyGroupID,
requestID: requestID
)
Expand All @@ -25,13 +27,15 @@ extension View {
_ action: Binding<(@MainActor () -> Void)?>,
allowBypass: Bool = false,
defaultKeyType: KeyType? = nil,
requestedKeyType: KeyType? = nil,
keyGroupID: UUID? = nil,
requestID: UUID? = nil
) -> some View {
modifier(ProtectedActionModifier(
action: action,
allowBypass: allowBypass,
defaultKeyType: defaultKeyType,
requestedKeyType: requestedKeyType,
keyGroupID: keyGroupID,
requestID: requestID
))
Expand Down
50 changes: 31 additions & 19 deletions Normal/Modifiers/WidgetActionResponder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ private struct WidgetActionResponder: ViewModifier {
@Query private var allSettings: [Settings]
@Query(sort: [SortDescriptor(\AppGroup.sortIndex)]) private var groups: [AppGroup]
@Query private var keys: [Key]
@Query private var selectedApps: [SelectedApps]

let coordinator: NavigationCoordinator
@Binding var selectedTab: AppTab

@State private var authAction: (@MainActor () -> Void)?
@State private var active: ActiveRequest?
@State private var heldRequest: GroupActionRequest?
@State private var heldRequest: ActionRequest?
@State private var durationTarget: UnblockTarget?

private struct ActiveRequest {
let token: UUID
let group: AppGroup
let target: UnblockTarget
let keyType: KeyType?
let allowBypass: Bool
}
Expand All @@ -33,15 +34,15 @@ private struct WidgetActionResponder: ViewModifier {
.protectedAction(
$authAction,
allowBypass: active?.allowBypass ?? false,
defaultKeyType: active?.keyType,
keyGroupID: active?.group.id,
requestedKeyType: active?.keyType,
keyGroupID: active?.target.groupID,
requestID: active?.token
)
.sheet(item: $durationTarget, onDismiss: replayHeldRequest) { target in
UnblockDurationSheet(target: target)
}
.onOpenURL { coordinator.handle(url: $0) }
.onChange(of: coordinator.pendingGroupAction) { _, request in resolve(request) }
.onChange(of: coordinator.pendingAction) { _, request in resolve(request) }
.onChange(of: groups) { _, _ in syncGroups() }
.onChange(of: keys) { _, _ in syncWidget() }
.onChange(of: screenTimeService.lastUpdate) { _, _ in syncWidget() }
Expand All @@ -63,24 +64,23 @@ private struct WidgetActionResponder: ViewModifier {
NormalShortcuts.updateAppShortcutParameters()
}

private func resolve(_ request: GroupActionRequest?) {
private func resolve(_ request: ActionRequest?) {
guard let request else { return }
coordinator.clearPendingGroupAction()
coordinator.clearPendingAction()
guard durationTarget == nil else {
heldRequest = request
return
}
guard allSettings.first?.hasCompletedOnboarding == true,
let group = groups.first(where: { $0.id == request.groupID })
else { return }
selectedTab = .groups
guard allSettings.first?.hasCompletedOnboarding == true else { return }

switch request.action {
case let .unlock(duration, keyType):
active = ActiveRequest(token: request.token, group: group, keyType: keyType, allowBypass: false)
authAction = { unlock(group, duration: duration) }
case .block:
active = ActiveRequest(token: request.token, group: group, keyType: nil, allowBypass: true)
case let .unblock(unblock):
guard let target = target(for: unblock.groupID) else { return }
present(ActiveRequest(token: request.token, target: target, keyType: unblock.keyType, allowBypass: false))
authAction = { unlock(target, duration: unblock.duration) }
case let .blockGroup(groupID):
guard let group = groups.first(where: { $0.id == groupID }) else { return }
present(ActiveRequest(token: request.token, target: .group(group), keyType: nil, allowBypass: true))
authAction = { block(group) }
}
}
Expand All @@ -91,13 +91,25 @@ private struct WidgetActionResponder: ViewModifier {
resolve(held)
}

private func unlock(_ group: AppGroup, duration request: UnlockDurationRequest) {
private func target(for groupID: UUID?) -> UnblockTarget? {
if let groupID {
return groups.first { $0.id == groupID }.map(UnblockTarget.group)
}
return selectedApps.first.map(UnblockTarget.all)
}

private func present(_ request: ActiveRequest) {
selectedTab = request.target.groupID == nil ? .home : .groups
active = request
}

private func unlock(_ target: UnblockTarget, duration request: UnlockDurationRequest) {
guard let settings = allSettings.first, let duration = settings.duration(for: request) else {
durationTarget = .group(group)
durationTarget = target
return
}
try? timedUnblockService.start(
.group(group),
target,
duration: duration,
settings: settings,
screenTimeService: screenTimeService
Expand Down
4 changes: 3 additions & 1 deletion Normal/Services/Keys/KeyCheckFlow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ final class KeyCheckFlow {
let availableKeyTypes: [KeyType]
let allowBypass: Bool
let defaultKeyType: KeyType?
var requestedKeyType: KeyType?
}

enum Stage: Equatable {
Expand Down Expand Up @@ -64,7 +65,8 @@ final class KeyCheckFlow {
switch KeySelectLogic.decide(
availableKeyTypes: request.availableKeyTypes,
allowBypass: request.allowBypass,
defaultKeyType: request.defaultKeyType
defaultKeyType: request.defaultKeyType,
requestedKeyType: request.requestedKeyType
) {
case .showNoKeysAlert:
stage = .noKeys
Expand Down
7 changes: 6 additions & 1 deletion Normal/Services/Keys/KeySelectLogic.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ enum KeySelectLogic {
static func decide(
availableKeyTypes: [KeyType],
allowBypass: Bool,
defaultKeyType: KeyType?
defaultKeyType: KeyType?,
requestedKeyType: KeyType? = nil
) -> KeySelectAction {
guard !availableKeyTypes.isEmpty else {
return .showNoKeysAlert
Expand All @@ -20,6 +21,10 @@ enum KeySelectLogic {
return .showSheet
}

if let requestedKeyType, availableKeyTypes.contains(requestedKeyType) {
return .autoSelect(requestedKeyType)
}

if let keyType = defaultKeyType, availableKeyTypes.contains(keyType), keyType.autoSelectable {
return .autoSelect(keyType)
}
Expand Down
46 changes: 29 additions & 17 deletions Normal/Services/NavigationCoordinator.swift
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import SwiftUI

enum GroupAction: Equatable {
case unlock(duration: UnlockDurationRequest, keyType: KeyType?)
case block
enum PendingAction: Equatable {
case unblock(UnblockRequest)
case blockGroup(UUID)
}

struct GroupActionRequest: Equatable {
struct ActionRequest: Equatable {
let token: UUID
let groupID: UUID
let action: GroupAction
let action: PendingAction
}

@MainActor
Expand All @@ -17,7 +16,8 @@ final class NavigationCoordinator {
var isSettingsPresented = false
private(set) var settingsInitialTab: SettingsTab = .general

var pendingGroupAction: GroupActionRequest?
private(set) var pendingAction: ActionRequest?
private var actionAfterSettings: ActionRequest?

func presentSettings(tab: SettingsTab = .general) {
settingsInitialTab = tab
Expand All @@ -28,16 +28,18 @@ final class NavigationCoordinator {
isSettingsPresented = false
}

func requestGroupUnlock(groupID: UUID, duration: UnlockDurationRequest, keyType: KeyType?) {
pendingGroupAction = GroupActionRequest(
token: UUID(),
groupID: groupID,
action: .unlock(duration: duration, keyType: keyType)
)
func settingsDidDismiss() {
guard let actionAfterSettings else { return }
self.actionAfterSettings = nil
pendingAction = actionAfterSettings
}

func requestUnblock(_ request: UnblockRequest) {
post(.unblock(request))
}

func requestGroupBlock(groupID: UUID) {
pendingGroupAction = GroupActionRequest(token: UUID(), groupID: groupID, action: .block)
post(.blockGroup(groupID))
}

func handle(url: URL) {
Expand All @@ -57,16 +59,26 @@ final class NavigationCoordinator {
)
let keyType = items.first { $0.name == WidgetDeepLink.keyQueryItem }?.value
.flatMap { KeyType(rawValue: $0) }
requestGroupUnlock(groupID: groupID, duration: duration, keyType: keyType)
requestUnblock(UnblockRequest(groupID: groupID, duration: duration, keyType: keyType))
case WidgetDeepLink.blockHost:
requestGroupBlock(groupID: groupID)
default:
return
}
}

func clearPendingGroupAction() {
pendingGroupAction = nil
func clearPendingAction() {
pendingAction = nil
}

private func post(_ action: PendingAction) {
let request = ActionRequest(token: UUID(), action: action)
if isSettingsPresented {
actionAfterSettings = request
isSettingsPresented = false
} else {
pendingAction = request
}
}
}

Expand Down
7 changes: 7 additions & 0 deletions Normal/Services/UnblockRequest.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Foundation

nonisolated struct UnblockRequest: Equatable, Sendable {
let groupID: UUID?
let duration: UnlockDurationRequest
let keyType: KeyType?
}
7 changes: 7 additions & 0 deletions Normal/Services/UnblockTarget.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ enum UnblockTarget: Identifiable {
}
}

var groupID: UUID? {
if case let .group(group) = self {
return group.id
}
return nil
}

var selection: FamilyActivitySelection {
switch self {
case let .all(mainSelection): mainSelection.selection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ struct KeySelectModifier: ViewModifier {
@Binding var action: (@MainActor () -> Void)?
var allowBypass: Bool
var defaultKeyType: KeyType?
var requestedKeyType: KeyType?
var keyGroupID: UUID?
var requestID: UUID?

Expand Down Expand Up @@ -138,7 +139,8 @@ struct KeySelectModifier: ViewModifier {
keys: scopedKeys,
availableKeyTypes: KeyType.selectable(registered: scopedKeys.map(\.type)),
allowBypass: allowBypass,
defaultKeyType: defaultKeyType
defaultKeyType: defaultKeyType,
requestedKeyType: requestedKeyType
),
action: action
)
Expand All @@ -150,13 +152,15 @@ extension View {
action: Binding<(@MainActor () -> Void)?>,
allowBypass: Bool = false,
defaultKeyType: KeyType? = nil,
requestedKeyType: KeyType? = nil,
keyGroupID: UUID? = nil,
requestID: UUID? = nil
) -> some View {
modifier(KeySelectModifier(
action: action,
allowBypass: allowBypass,
defaultKeyType: defaultKeyType,
requestedKeyType: requestedKeyType,
keyGroupID: keyGroupID,
requestID: requestID
))
Expand Down
8 changes: 8 additions & 0 deletions NormalTests/Services/KeyCheckFlowTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ struct KeyCheckFlowTests {
#expect(qr.scanCount == 1)
}

@Test func requestedQRKeyGoesStraightToTheScanner() {
var request = qrAndNFC
request.requestedKeyType = .qr
start(request)
#expect(flow.stage == .scanningQR)
#expect(flow.sheetScreen == .qrScanner)
}

@Test func repeatedChoiceIsIgnored() async {
start(qrAndNFC)
flow.choose(.qr)
Expand Down
40 changes: 40 additions & 0 deletions NormalTests/Services/KeySelectLogicTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,44 @@ struct KeySelectLogicTests {
let result = KeySelectLogic.decide(availableKeyTypes: [.qr], allowBypass: false, defaultKeyType: .nfc)
#expect(result == .showSheet)
}

@Test func requestedQRAutoSelects() {
let result = KeySelectLogic.decide(
availableKeyTypes: [.nfc, .qr],
allowBypass: false,
defaultKeyType: nil,
requestedKeyType: .qr
)
#expect(result == .autoSelect(.qr))
}

@Test func requestedKeyBeatsDefault() {
let result = KeySelectLogic.decide(
availableKeyTypes: [.nfc, .qr],
allowBypass: false,
defaultKeyType: .nfc,
requestedKeyType: .qr
)
#expect(result == .autoSelect(.qr))
}

@Test func requestedKeyWithBypassShowsSheet() {
let result = KeySelectLogic.decide(
availableKeyTypes: [.qr],
allowBypass: true,
defaultKeyType: nil,
requestedKeyType: .qr
)
#expect(result == .showSheet)
}

@Test func unavailableRequestedKeyFallsBackToDefault() {
let result = KeySelectLogic.decide(
availableKeyTypes: [.nfc, .qr],
allowBypass: false,
defaultKeyType: .nfc,
requestedKeyType: .location
)
#expect(result == .autoSelect(.nfc))
}
}
Loading
Loading