mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Cleanup how we setup the CallKit provider and have it be used for outgoing calls as well (#2967)
- tear down ElementCall screens when ending the call from the CXCallController - make the call UI available in the task manager and lock screen - Fix broken hang up widget message format
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
//
|
||||
// Copyright 2024 New Vector Ltd
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
|
||||
import Combine
|
||||
import Foundation
|
||||
|
||||
struct ElementCallServiceMockConfiguration { }
|
||||
|
||||
extension ElementCallServiceMock {
|
||||
convenience init(_ configuration: ElementCallServiceMockConfiguration) {
|
||||
self.init()
|
||||
|
||||
underlyingActions = PassthroughSubject().eraseToAnyPublisher()
|
||||
}
|
||||
}
|
||||
@@ -4697,15 +4697,15 @@ class ElementCallServiceMock: ElementCallServiceProtocol {
|
||||
|
||||
//MARK: - setupCallSession
|
||||
|
||||
var setupCallSessionTitleUnderlyingCallsCount = 0
|
||||
var setupCallSessionTitleCallsCount: Int {
|
||||
var setupCallSessionRoomIDRoomDisplayNameUnderlyingCallsCount = 0
|
||||
var setupCallSessionRoomIDRoomDisplayNameCallsCount: Int {
|
||||
get {
|
||||
if Thread.isMainThread {
|
||||
return setupCallSessionTitleUnderlyingCallsCount
|
||||
return setupCallSessionRoomIDRoomDisplayNameUnderlyingCallsCount
|
||||
} else {
|
||||
var returnValue: Int? = nil
|
||||
DispatchQueue.main.sync {
|
||||
returnValue = setupCallSessionTitleUnderlyingCallsCount
|
||||
returnValue = setupCallSessionRoomIDRoomDisplayNameUnderlyingCallsCount
|
||||
}
|
||||
|
||||
return returnValue!
|
||||
@@ -4713,28 +4713,28 @@ class ElementCallServiceMock: ElementCallServiceProtocol {
|
||||
}
|
||||
set {
|
||||
if Thread.isMainThread {
|
||||
setupCallSessionTitleUnderlyingCallsCount = newValue
|
||||
setupCallSessionRoomIDRoomDisplayNameUnderlyingCallsCount = newValue
|
||||
} else {
|
||||
DispatchQueue.main.sync {
|
||||
setupCallSessionTitleUnderlyingCallsCount = newValue
|
||||
setupCallSessionRoomIDRoomDisplayNameUnderlyingCallsCount = newValue
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
var setupCallSessionTitleCalled: Bool {
|
||||
return setupCallSessionTitleCallsCount > 0
|
||||
var setupCallSessionRoomIDRoomDisplayNameCalled: Bool {
|
||||
return setupCallSessionRoomIDRoomDisplayNameCallsCount > 0
|
||||
}
|
||||
var setupCallSessionTitleReceivedTitle: String?
|
||||
var setupCallSessionTitleReceivedInvocations: [String] = []
|
||||
var setupCallSessionTitleClosure: ((String) async -> Void)?
|
||||
var setupCallSessionRoomIDRoomDisplayNameReceivedArguments: (roomID: String, roomDisplayName: String)?
|
||||
var setupCallSessionRoomIDRoomDisplayNameReceivedInvocations: [(roomID: String, roomDisplayName: String)] = []
|
||||
var setupCallSessionRoomIDRoomDisplayNameClosure: ((String, String) async -> Void)?
|
||||
|
||||
func setupCallSession(title: String) async {
|
||||
setupCallSessionTitleCallsCount += 1
|
||||
setupCallSessionTitleReceivedTitle = title
|
||||
func setupCallSession(roomID: String, roomDisplayName: String) async {
|
||||
setupCallSessionRoomIDRoomDisplayNameCallsCount += 1
|
||||
setupCallSessionRoomIDRoomDisplayNameReceivedArguments = (roomID: roomID, roomDisplayName: roomDisplayName)
|
||||
DispatchQueue.main.async {
|
||||
self.setupCallSessionTitleReceivedInvocations.append(title)
|
||||
self.setupCallSessionRoomIDRoomDisplayNameReceivedInvocations.append((roomID: roomID, roomDisplayName: roomDisplayName))
|
||||
}
|
||||
await setupCallSessionTitleClosure?(title)
|
||||
await setupCallSessionRoomIDRoomDisplayNameClosure?(roomID, roomDisplayName)
|
||||
}
|
||||
//MARK: - tearDownCallSession
|
||||
|
||||
|
||||
Reference in New Issue
Block a user