fix: gate ios push enrollment on notification consent · openclaw/openclaw@8efed50

Recent Commits to openclaw:main

joshavant · 2026-06-23 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ extension SettingsProTab {`
`152`	`152`	`}`
`153`	`153`	`let notificationSettings = await UNUserNotificationCenter.current().notificationSettings()`
`154`	`154`	`self.applyNotificationStatus(notificationSettings.authorizationStatus)`
	`155`	`+self.registerForRemoteNotificationsIfEnrollmentReady()`
`155`	`156`
`156`	`157`	`let issueCount = SettingsDiagnostics.issueCount(`
`157`	`158`	`gatewayConnected: self.gatewayDiagnosticConnected,`
`@@ -417,6 +418,7 @@ extension SettingsProTab {`
`417`	`418`	`let status = settings.authorizationStatus`
`418`	`419`	`Task { @MainActor in`
`419`	`420`	`self.applyNotificationStatus(status)`
	`421`	`+self.registerForRemoteNotificationsIfEnrollmentReady()`
`420`	`422`	`}`
`421`	`423`	`}`
`422`	`424`	`}`
`@@ -437,6 +439,7 @@ extension SettingsProTab {`
`437`	`439`
`438`	`440`	`func requestNotificationAuthorizationFromSettings() {`
`439`	`441`	`guard !self.isRequestingNotificationAuthorization else { return }`
	`442`	`+PushEnrollmentConsent.markDisclosureAccepted()`
`440`	`443`	`self.isRequestingNotificationAuthorization = true`
`441`	`444`	`Task {`
`442`	`445`	`let granted = await (try? UNUserNotificationCenter.current().requestAuthorization(options: [`
`@@ -448,12 +451,19 @@ extension SettingsProTab {`
`448`	`451`	`await MainActor.run {`
`449`	`452`	`self.isRequestingNotificationAuthorization = false`
`450`	`453`	`self.notificationStatus = SettingsNotificationStatus(settings.authorizationStatus)`
`451`		`-guard granted, self.notificationStatus.allowsNotifications else { return }`
`452`		`-UIApplication.shared.registerForRemoteNotifications()`
	`454`	`+guard granted else { return }`
	`455`	`+self.registerForRemoteNotificationsIfEnrollmentReady()`
`453`	`456`	`}`
`454`	`457`	`}`
`455`	`458`	`}`
`456`	`459`
	`460`	`+@MainActor`
	`461`	`+func registerForRemoteNotificationsIfEnrollmentReady() {`
	`462`	`+guard PushEnrollmentConsent.disclosureAccepted else { return }`
	`463`	`+guard self.notificationStatus.allowsNotifications else { return }`
	`464`	`+UIApplication.shared.registerForRemoteNotifications()`
	`465`	`+}`
	`466`	`+`
`457`	`467`	`@MainActor`
`458`	`468`	`func applyNotificationStatus(_ status: UNAuthorizationStatus) {`
`459`	`469`	`self.notificationStatus = SettingsNotificationStatus(status)`

Original file line number	Diff line number	Diff line change
`@@ -4103,6 +4103,9 @@ extension NodeAppModel {`
`4103`	`4103`
`4104`	`4104`	`private func registerAPNsTokenIfNeeded() async {`
`4105`	`4105`	`let usesRelayTransport = await self.pushRegistrationManager.usesRelayTransport`
	`4106`	`+guard await self.canPublishAPNsRegistration(usesRelayTransport: usesRelayTransport) else {`
	`4107`	`+return`
	`4108`	`+}`
`4106`	`4109`	`guard self.gatewayConnected else {`
`4107`	`4110`	`if usesRelayTransport {`
`4108`	`4111`	`GatewayDiagnostics.pushRelay.skipped("gateway_offline")`
`@@ -4163,6 +4166,23 @@ extension NodeAppModel {`
`4163`	`4166`	`}`
`4164`	`4167`	`}`
`4165`	`4168`
	`4169`	`+private func canPublishAPNsRegistration(usesRelayTransport: Bool) async -> Bool {`
	`4170`	`+guard PushEnrollmentConsent.disclosureAccepted else {`
	`4171`	`+if usesRelayTransport {`
	`4172`	`+GatewayDiagnostics.pushRelay.skipped("enrollment_disclosure_not_accepted")`
	`4173`	`+}`
	`4174`	`+return false`
	`4175`	`+}`
	`4176`	`+let status = await self.notificationAuthorizationStatus()`
	`4177`	`+guard Self.isNotificationAuthorizationAllowed(status) else {`
	`4178`	`+if usesRelayTransport {`
	`4179`	`+GatewayDiagnostics.pushRelay.skipped("notifications_not_authorized")`
	`4180`	`+}`
	`4181`	`+return false`
	`4182`	`+}`
	`4183`	`+return true`
	`4184`	`+}`
	`4185`	`+`
`4166`	`4186`	`private func fetchPushRelayGatewayIdentity() async throws -> PushRelayGatewayIdentity {`
`4167`	`4187`	`let response = try await self.operatorGateway.request(`
`4168`	`4188`	`method: "gateway.identity.get",`
`@@ -5126,6 +5146,10 @@ extension NodeAppModel {`
`5126`	`5146`	`self.setOperatorConnected(connected)`
`5127`	`5147`	`}`
`5128`	`5148`
	`5149`	`+func _test_canPublishAPNsRegistration(usesRelayTransport: Bool = true) async -> Bool {`
	`5150`	`+await self.canPublishAPNsRegistration(usesRelayTransport: usesRelayTransport)`
	`5151`	`+}`
	`5152`	`+`
`5129`	`5153`	`nonisolated static func _test_makeWatchChatItems(from raw: [OpenClawKit.AnyCodable]) -> [OpenClawWatchChatItem] {`
`5130`	`5154`	`self.makeWatchChatItems(from: raw)`
`5131`	`5155`	`}`

Original file line number	Diff line number	Diff line change
`@@ -123,10 +123,30 @@ final class OpenClawAppDelegate: NSObject, UIApplicationDelegate, @preconcurrenc`
`123`	`123`	`let notificationCenter = UNUserNotificationCenter.current()`
`124`	`124`	`notificationCenter.delegate = self`
`125`	`125`	`ExecApprovalNotificationBridge.registerCategory(center: notificationCenter)`
`126`		`- application.registerForRemoteNotifications()`
	`126`	`+Task { @MainActor in`
	`127`	`+await self.registerForRemoteNotificationsIfEnrollmentReady(application)`
	`128`	`+}`
`127`	`129`	`return true`
`128`	`130`	`}`
`129`	`131`
	`132`	`+private func registerForRemoteNotificationsIfEnrollmentReady(_ application: UIApplication) async {`
	`133`	`+guard PushEnrollmentConsent.disclosureAccepted else { return }`
	`134`	`+guard await Self.isNotificationAuthorizationAllowed() else { return }`
	`135`	`+ application.registerForRemoteNotifications()`
	`136`	`+}`
	`137`	`+`
	`138`	`+private static func isNotificationAuthorizationAllowed() async -> Bool {`
	`139`	`+let settings = await UNUserNotificationCenter.current().notificationSettings()`
	`140`	`+switch settings.authorizationStatus {`
	`141`	`+case .authorized, .provisional, .ephemeral:`
	`142`	`+return true`
	`143`	`+case .denied, .notDetermined:`
	`144`	`+return false`
	`145`	`+@unknown default:`
	`146`	`+return false`
	`147`	`+}`
	`148`	`+}`
	`149`	`+`
`130`	`150`	`func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {`
`131`	`151`	`if let appModel = self.resolvedAppModel() {`
`132`	`152`	`Task { @MainActor in`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,19 @@`
	`1`	`+import Foundation`
	`2`	`+`
	`3`	`+enum PushEnrollmentConsent {`
	`4`	`+static let disclosureAcceptedKey = "push.enrollment.disclosureAccepted"`
	`5`	`+`
	`6`	`+static var disclosureAccepted: Bool {`
	`7`	`+UserDefaults.standard.bool(forKey: disclosureAcceptedKey)`
	`8`	`+}`
	`9`	`+`
	`10`	`+static func markDisclosureAccepted() {`
	`11`	`+UserDefaults.standard.set(true, forKey: self.disclosureAcceptedKey)`
	`12`	`+}`
	`13`	`+`
	`14`	`+#if DEBUG`
	`15`	`+static func reset() {`
	`16`	`+UserDefaults.standard.removeObject(forKey: self.disclosureAcceptedKey)`
	`17`	`+}`
	`18`	`+#endif`
	`19`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ Sources/Permissions/PermissionRequestBridge.swift`
`76`	`76`	`Sources/Push/ExecApprovalNotificationBridge.swift`
`77`	`77`	`Sources/Push/BackgroundAliveBeacon.swift`
`78`	`78`	`Sources/Push/PushBuildConfig.swift`
	`79`	`+Sources/Push/PushEnrollmentConsent.swift`
`79`	`80`	`Sources/Push/PushRegistrationManager.swift`
`80`	`81`	`Sources/Push/PushRelayClient.swift`
`81`	`82`	`Sources/Push/PushRelayKeychainStore.swift`

Original file line number	Diff line number	Diff line change
`@@ -1377,6 +1377,24 @@ private final class MockBootstrapNotificationCenter: NotificationCentering, @unc`
`1377`	`1377`	`#expect(center.addCalls == 1)`
`1378`	`1378`	`}`
`1379`	`1379`
	`1380`	`+@Test @MainActor func apnsRegistrationRequiresDisclosureAndNotificationAuthorization() async {`
	`1381`	`+let center = MockBootstrapNotificationCenter()`
	`1382`	`+ center.status = .authorized`
	`1383`	`+let appModel = NodeAppModel(notificationCenter: center)`
	`1384`	`+PushEnrollmentConsent.reset()`
	`1385`	`+defer { PushEnrollmentConsent.reset() }`
	`1386`	`+`
	`1387`	`+ #expect(await appModel._test_canPublishAPNsRegistration() == false)`
	`1388`	`+ #expect(await appModel._test_canPublishAPNsRegistration(usesRelayTransport: false) == false)`
	`1389`	`+`
	`1390`	`+PushEnrollmentConsent.markDisclosureAccepted()`
	`1391`	`+ center.status = .notDetermined`
	`1392`	`+ #expect(await appModel._test_canPublishAPNsRegistration() == false)`
	`1393`	`+`
	`1394`	`+ center.status = .authorized`
	`1395`	`+ #expect(await appModel._test_canPublishAPNsRegistration())`
	`1396`	`+}`
	`1397`	`+`
`1380`	`1398`	`@Test @MainActor func chatPushWithoutSpeechReturnsUnavailableWhenNotificationsOff() async throws {`
`1381`	`1399`	`let center = MockBootstrapNotificationCenter()`
`1382`	`1400`	`center.status = .notDetermined`

Original file line number	Diff line number	Diff line change
`@@ -550,6 +550,20 @@ struct RootTabsSourceGuardTests {`
`550`	`550`	`#expect(docsSource.contains(".accessibilityHint(\"Opens Settings / Gateway\")"))`
`551`	`551`	`}`
`552`	`552`
	`553`	+@Test func `push enrollment stays behind notification disclosure flow`() throws {
	`554`	`+let appSource = try String(contentsOf: Self.openClawAppSourceURL(), encoding: .utf8)`
	`555`	`+let actionsSource = try String(contentsOf: Self.settingsProTabActionsSourceURL(), encoding: .utf8)`
	`556`	`+let modelSource = try String(contentsOf: Self.nodeAppModelSourceURL(), encoding: .utf8)`
	`557`	`+`
	`558`	`+ #expect(appSource.contains("PushEnrollmentConsent.disclosureAccepted"))`
	`559`	`+ #expect(appSource.contains("await Self.isNotificationAuthorizationAllowed()"))`
	`560`	`+ #expect(actionsSource.contains("PushEnrollmentConsent.markDisclosureAccepted()"))`
	`561`	`+ #expect(actionsSource.contains("self.registerForRemoteNotificationsIfEnrollmentReady()"))`
	`562`	`+ #expect(modelSource.contains("PushEnrollmentConsent.disclosureAccepted"))`
	`563`	`+ #expect(modelSource.contains("notifications_not_authorized"))`
	`564`	`+ #expect(modelSource.contains("enrollment_disclosure_not_accepted"))`
	`565`	`+}`
	`566`	`+`
`553`	`567`	@Test func `gateway settings keeps pairing trust diagnostics and tailscale actions`() throws {
`554`	`568`	`let settingsSource = try String(contentsOf: Self.settingsProTabSourceURL(), encoding: .utf8)`
`555`	`569`	`let sectionsSource = try String(contentsOf: Self.settingsProTabSectionsSourceURL(), encoding: .utf8)`
`@@ -786,6 +800,13 @@ struct RootTabsSourceGuardTests {`
`786`	`800`	`.appendingPathComponent("Sources/Design/SettingsProTab.swift")`
`787`	`801`	`}`
`788`	`802`
	`803`	`+private static func openClawAppSourceURL() -> URL {`
	`804`	`+URL(fileURLWithPath: #filePath)`
	`805`	`+.deletingLastPathComponent()`
	`806`	`+.deletingLastPathComponent()`
	`807`	`+.appendingPathComponent("Sources/OpenClawApp.swift")`
	`808`	`+}`
	`809`	`+`
`789`	`810`	`private static func notificationPermissionGuidanceDialogSourceURL() -> URL {`
`790`	`811`	`URL(fileURLWithPath: #filePath)`
`791`	`812`	`.deletingLastPathComponent()`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main