diff --git a/apps/ios/Sources/Voice/VoiceWakeManager.swift b/apps/ios/Sources/Voice/VoiceWakeManager.swift index 15a993feaa0..3a5b7585962 100644 --- a/apps/ios/Sources/Voice/VoiceWakeManager.swift +++ b/apps/ios/Sources/Voice/VoiceWakeManager.swift @@ -180,9 +180,7 @@ final class VoiceWakeManager: NSObject { let micOk = await Self.requestMicrophonePermission() guard micOk else { - self.statusText = Self.permissionMessage( - kind: "Microphone", - status: AVAudioSession.sharedInstance().recordPermission) + self.statusText = Self.microphonePermissionMessage(kind: "Microphone") self.isListening = false return } @@ -389,8 +387,7 @@ final class VoiceWakeManager: NSObject { } private nonisolated static func requestMicrophonePermission() async -> Bool { - let session = AVAudioSession.sharedInstance() - switch session.recordPermission { + switch AVAudioApplication.shared.recordPermission { case .granted: return true case .denied: @@ -402,9 +399,20 @@ final class VoiceWakeManager: NSObject { } return await self.requestPermissionWithTimeout { completion in - AVAudioSession.sharedInstance().requestRecordPermission { ok in - completion(ok) - } + AVAudioApplication.requestRecordPermission(completionHandler: completion) + } + } + + private nonisolated static func microphonePermissionMessage(kind: String) -> String { + switch AVAudioApplication.shared.recordPermission { + case .denied: + return "\(kind) permission denied" + case .undetermined: + return "\(kind) permission not granted" + case .granted: + return "\(kind) permission denied" + @unknown default: + return "\(kind) permission denied" } } @@ -429,7 +437,7 @@ final class VoiceWakeManager: NSObject { } private nonisolated static func requestPermissionWithTimeout( - _ operation: @escaping @Sendable (@escaping (Bool) -> Void) -> Void) async -> Bool + _ operation: @escaping @Sendable (@escaping @Sendable (Bool) -> Void) -> Void) async -> Bool { do { return try await AsyncTimeout.withTimeout( diff --git a/apps/ios/project.yml b/apps/ios/project.yml index cd10f582249..fdc19c827a8 100644 --- a/apps/ios/project.yml +++ b/apps/ios/project.yml @@ -8,6 +8,7 @@ options: settings: base: SWIFT_VERSION: "6.0" + ENABLE_APP_INTENTS_METADATA_GENERATION: NO packages: OpenClawKit: @@ -80,9 +81,11 @@ targets: DEVELOPMENT_TEAM: "$(OPENCLAW_DEVELOPMENT_TEAM)" PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_APP_BUNDLE_ID)" PROVISIONING_PROFILE_SPECIFIER: "$(OPENCLAW_APP_PROFILE)" + TARGETED_DEVICE_FAMILY: "1" SWIFT_VERSION: "6.0" SWIFT_STRICT_CONCURRENCY: complete ENABLE_APPINTENTS_METADATA: NO + ENABLE_APP_INTENTS_METADATA_GENERATION: NO info: path: Sources/Info.plist properties: @@ -140,6 +143,7 @@ targets: CODE_SIGN_STYLE: "$(OPENCLAW_CODE_SIGN_STYLE)" DEVELOPMENT_TEAM: "$(OPENCLAW_DEVELOPMENT_TEAM)" ENABLE_APPINTENTS_METADATA: NO + ENABLE_APP_INTENTS_METADATA_GENERATION: NO PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_SHARE_BUNDLE_ID)" PROVISIONING_PROFILE_SPECIFIER: "$(OPENCLAW_SHARE_PROFILE)" SWIFT_VERSION: "6.0" @@ -174,6 +178,7 @@ targets: settings: base: ENABLE_APPINTENTS_METADATA: NO + ENABLE_APP_INTENTS_METADATA_GENERATION: NO PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_WATCH_APP_BUNDLE_ID)" info: path: WatchApp/Info.plist @@ -191,6 +196,7 @@ targets: sources: - path: WatchExtension/Sources dependencies: + - sdk: AppIntents.framework - sdk: WatchConnectivity.framework - sdk: UserNotifications.framework configFiles: @@ -229,6 +235,7 @@ targets: CODE_SIGN_STYLE: "$(OPENCLAW_CODE_SIGN_STYLE)" DEVELOPMENT_TEAM: "$(OPENCLAW_DEVELOPMENT_TEAM)" PRODUCT_BUNDLE_IDENTIFIER: ai.openclaw.ios.tests + ENABLE_APP_INTENTS_METADATA_GENERATION: NO SWIFT_VERSION: "6.0" SWIFT_STRICT_CONCURRENCY: complete TEST_HOST: "$(BUILT_PRODUCTS_DIR)/OpenClaw.app/OpenClaw"