mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-12 07:20:45 +00:00
iOS: normalize watch quick actions and fix test signing
This commit is contained in:
committed by
Peter Steinberger
parent
d18ae2256f
commit
d06d8701fd
@@ -1490,8 +1490,9 @@ private extension NodeAppModel {
|
||||
return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: json)
|
||||
case OpenClawWatchCommand.notify.rawValue:
|
||||
let params = try Self.decodeParams(OpenClawWatchNotifyParams.self, from: req.paramsJSON)
|
||||
let title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let body = params.body.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let normalizedParams = Self.normalizeWatchNotifyParams(params)
|
||||
let title = normalizedParams.title
|
||||
let body = normalizedParams.body
|
||||
if title.isEmpty && body.isEmpty {
|
||||
return BridgeInvokeResponse(
|
||||
id: req.id,
|
||||
@@ -1503,13 +1504,13 @@ private extension NodeAppModel {
|
||||
do {
|
||||
let result = try await self.watchMessagingService.sendNotification(
|
||||
id: req.id,
|
||||
params: params)
|
||||
params: normalizedParams)
|
||||
if result.queuedForDelivery || !result.deliveredImmediately {
|
||||
let invokeID = req.id
|
||||
Task { @MainActor in
|
||||
await WatchPromptNotificationBridge.scheduleMirroredWatchPromptNotificationIfNeeded(
|
||||
invokeID: invokeID,
|
||||
params: params,
|
||||
params: normalizedParams,
|
||||
sendResult: result)
|
||||
}
|
||||
}
|
||||
@@ -1535,6 +1536,105 @@ private extension NodeAppModel {
|
||||
}
|
||||
}
|
||||
|
||||
private static func normalizeWatchNotifyParams(_ params: OpenClawWatchNotifyParams) -> OpenClawWatchNotifyParams {
|
||||
var normalized = params
|
||||
normalized.title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
normalized.body = params.body.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
normalized.promptId = self.trimmedOrNil(params.promptId)
|
||||
normalized.sessionKey = self.trimmedOrNil(params.sessionKey)
|
||||
normalized.kind = self.trimmedOrNil(params.kind)
|
||||
normalized.details = self.trimmedOrNil(params.details)
|
||||
normalized.priority = self.normalizedWatchPriority(params.priority, risk: params.risk)
|
||||
normalized.risk = self.normalizedWatchRisk(params.risk, priority: normalized.priority)
|
||||
|
||||
let normalizedActions = self.normalizeWatchActions(
|
||||
params.actions,
|
||||
kind: normalized.kind,
|
||||
promptId: normalized.promptId)
|
||||
normalized.actions = normalizedActions.isEmpty ? nil : normalizedActions
|
||||
return normalized
|
||||
}
|
||||
|
||||
private static func normalizeWatchActions(
|
||||
_ actions: [OpenClawWatchAction]?,
|
||||
kind: String?,
|
||||
promptId: String?) -> [OpenClawWatchAction]
|
||||
{
|
||||
let provided = (actions ?? []).compactMap { action -> OpenClawWatchAction? in
|
||||
let id = action.id.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let label = action.label.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !id.isEmpty, !label.isEmpty else { return nil }
|
||||
return OpenClawWatchAction(
|
||||
id: id,
|
||||
label: label,
|
||||
style: self.trimmedOrNil(action.style))
|
||||
}
|
||||
if !provided.isEmpty {
|
||||
return Array(provided.prefix(4))
|
||||
}
|
||||
|
||||
// Only auto-insert quick actions when this is a prompt/decision flow.
|
||||
guard promptId?.isEmpty == false else {
|
||||
return []
|
||||
}
|
||||
|
||||
let normalizedKind = kind?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() ?? ""
|
||||
if normalizedKind.contains("approval") || normalizedKind.contains("approve") {
|
||||
return [
|
||||
OpenClawWatchAction(id: "approve", label: "Approve"),
|
||||
OpenClawWatchAction(id: "decline", label: "Decline", style: "destructive"),
|
||||
OpenClawWatchAction(id: "open_phone", label: "Open iPhone"),
|
||||
OpenClawWatchAction(id: "escalate", label: "Escalate"),
|
||||
]
|
||||
}
|
||||
|
||||
return [
|
||||
OpenClawWatchAction(id: "done", label: "Done"),
|
||||
OpenClawWatchAction(id: "snooze_10m", label: "Snooze 10m"),
|
||||
OpenClawWatchAction(id: "open_phone", label: "Open iPhone"),
|
||||
OpenClawWatchAction(id: "escalate", label: "Escalate"),
|
||||
]
|
||||
}
|
||||
|
||||
private static func normalizedWatchRisk(
|
||||
_ risk: OpenClawWatchRisk?,
|
||||
priority: OpenClawNotificationPriority?) -> OpenClawWatchRisk?
|
||||
{
|
||||
if let risk { return risk }
|
||||
switch priority {
|
||||
case .passive:
|
||||
return .low
|
||||
case .active:
|
||||
return .medium
|
||||
case .timeSensitive:
|
||||
return .high
|
||||
case nil:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
private static func normalizedWatchPriority(
|
||||
_ priority: OpenClawNotificationPriority?,
|
||||
risk: OpenClawWatchRisk?) -> OpenClawNotificationPriority?
|
||||
{
|
||||
if let priority { return priority }
|
||||
switch risk {
|
||||
case .low:
|
||||
return .passive
|
||||
case .medium:
|
||||
return .active
|
||||
case .high:
|
||||
return .timeSensitive
|
||||
case nil:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
private static func trimmedOrNil(_ value: String?) -> String? {
|
||||
let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||
return trimmed.isEmpty ? nil : trimmed
|
||||
}
|
||||
|
||||
func locationMode() -> OpenClawLocationMode {
|
||||
let raw = UserDefaults.standard.string(forKey: "location.enabledMode") ?? "off"
|
||||
return OpenClawLocationMode(rawValue: raw) ?? .off
|
||||
|
||||
Reference in New Issue
Block a user