swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show ElementCalls in the system Recents list and allow deep linking back into a call from there

Browse Source
This commit is contained in:
Stefan Ceriu 2024-05-27 12:49:24 +03:00 committed by Stefan Ceriu
parent 16fc7caa62
commit f6c476eeca
10 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ElementX/Sources/Application/AppCoordinator.swift
View File

@ -17,6 +17,7 @@
import AnalyticsEvents
import BackgroundTasks
import Combine
import Intents
import MatrixRustSDK
import SwiftUI
import Version
@ -236,6 +237,20 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationFlowCoordinatorDeleg
return false
}
func handleUserActivity(_ userActivity: NSUserActivity) {
// `INStartVideoCallIntent` is to be replaced with `INStartCallIntent`
// but calls from Recents still send it ¯\_(ツ)_/¯
guard let intent = userActivity.interaction?.intent as? INStartVideoCallIntent,
let contact = intent.contacts?.first,
let roomIdentifier = contact.personHandle?.value else {
MXLog.error("Failed retrieving information from userActivity: \(userActivity)")
return
}
MXLog.info("Starting call in room: \(roomIdentifier)")
handleAppRoute(AppRoute.call(roomID: roomIdentifier))
}
// MARK: - AuthenticationFlowCoordinatorDelegate
func authenticationFlowCoordinator(didLoginWithSession userSession: UserSessionProtocol) {

3
ElementX/Sources/Application/AppCoordinatorProtocol.swift
View File

@ -18,5 +18,8 @@ import Foundation
protocol AppCoordinatorProtocol: CoordinatorProtocol {
var windowManager: SecureWindowManagerProtocol { get }
@discardableResult func handleDeepLink(_ url: URL, isExternalURL: Bool) -> Bool
func handleUserActivity(_ userActivity: NSUserActivity)
}

5
ElementX/Sources/Application/Application.swift
View File

@ -51,6 +51,11 @@ struct Application: App {
openURLInSystemBrowser($0)
}
}
.onContinueUserActivity("INStartVideoCallIntent", perform: { userActivity in
// `INStartVideoCallIntent` is to be replaced with `INStartCallIntent`
// but calls from Recents still send it ¯\_(ツ)_/¯
appCoordinator.handleUserActivity(userActivity)
})
.task {
appCoordinator.start()
}

16
ElementX/Sources/Services/ElementCall/ElementCallService.swift
View File

@ -91,7 +91,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
guard let roomID = payload.dictionaryPayload[ElementCallServiceNotificationKey.roomID.rawValue] as? String else {
MXLog.error("Somethnig went wrong, missing room identifier for incoming voip call: \(payload)")
MXLog.error("Something went wrong, missing room identifier for incoming voip call: \(payload)")
return
}
@ -102,20 +102,18 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
let configuration = CXProviderConfiguration()
configuration.supportsVideo = true
configuration.includesCallsInRecents = false
configuration.includesCallsInRecents = true
// https://stackoverflow.com/a/46077628/730924
configuration.supportedHandleTypes = [.generic]
let update = CXCallUpdate()
update.hasVideo = true
update.localizedCallerName = payload.dictionaryPayload[ElementCallServiceNotificationKey.roomDisplayName.rawValue] as? String
if let senderDisplayName = payload.dictionaryPayload[ElementCallServiceNotificationKey.senderDisplayName.rawValue] as? String {
update.remoteHandle = .init(type: .generic, value: senderDisplayName)
} else if let senderID = payload.dictionaryPayload[ElementCallServiceNotificationKey.senderID.rawValue] as? String {
update.remoteHandle = .init(type: .generic, value: senderID)
} else {
MXLog.error("Something went wrong, both the user display name and ID are nil")
}
// https://stackoverflow.com/a/41230020/730924
update.remoteHandle = .init(type: .generic, value: roomID)
let callProvider = CXProvider(configuration: configuration)
callProvider.setDelegate(self, queue: nil)

2
ElementX/Sources/Services/ElementCall/ElementCallServiceProtocol.swift
View File

@ -24,8 +24,6 @@ enum ElementCallServiceAction {
enum ElementCallServiceNotificationKey: String {
case roomID
case roomDisplayName
case senderID
case senderDisplayName
}
let ElementCallServiceNotificationDiscardDelta = 10.0

4
ElementX/Sources/UITests/UITestsAppCoordinator.swift
View File

@ -70,6 +70,10 @@ class UITestsAppCoordinator: AppCoordinatorProtocol, SecureWindowManagerDelegate
fatalError("Not implemented.")
}
func handleUserActivity(_ activity: NSUserActivity) {
fatalError("Not implemented.")
}
func windowManagerDidConfigureWindows(_ windowManager: SecureWindowManagerProtocol) {
ServiceLocator.shared.userIndicatorController.window = windowManager.overlayWindow

4
ElementX/Sources/UnitTests/UnitTestsAppCoordinator.swift
View File

@ -41,4 +41,8 @@ class UnitTestsAppCoordinator: AppCoordinatorProtocol {
func handleDeepLink(_ url: URL, isExternalURL: Bool) -> Bool {
fatalError("Not implemented.")
}
func handleUserActivity(_ activity: NSUserActivity) {
fatalError("Not implemented.")
}
}

1
ElementX/SupportingFiles/Info.plist
View File

@ -77,6 +77,7 @@
<key>NSUserActivityTypes</key>
<array>
<string>INSendMessageIntent</string>
<string>INStartCallIntent</string>
</array>
<key>UIBackgroundModes</key>
<array>

3
ElementX/SupportingFiles/target.yml
View File

@ -82,7 +82,8 @@ targets:
productionAppName: $(PRODUCTION_APP_NAME)
ITSAppUsesNonExemptEncryption: false
NSUserActivityTypes: [
INSendMessageIntent
INSendMessageIntent,
INStartCallIntent,
]
NSCameraUsageDescription: To take pictures or videos and send them as a message $(APP_DISPLAY_NAME) needs access to the camera.
NSMicrophoneUsageDescription: To record and send messages with audio, $(APP_DISPLAY_NAME) needs to access the microphone.

8
NSE/Sources/NotificationServiceExtension.swift
View File

@ -206,12 +206,8 @@ class NotificationServiceExtension: UNNotificationServiceExtension {
return true
}
var payload = [ElementCallServiceNotificationKey.roomID.rawValue: itemProxy.roomID,
ElementCallServiceNotificationKey.roomDisplayName.rawValue: itemProxy.roomDisplayName,
ElementCallServiceNotificationKey.senderID.rawValue: itemProxy.senderID]
if let senderDisplayName = itemProxy.senderDisplayName {
payload[ElementCallServiceNotificationKey.senderDisplayName.rawValue] = senderDisplayName
}
let payload = [ElementCallServiceNotificationKey.roomID.rawValue: itemProxy.roomID,
ElementCallServiceNotificationKey.roomDisplayName.rawValue: itemProxy.roomDisplayName]
do {
try await CXProvider.reportNewIncomingVoIPPushPayload(payload)