mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update CoreContext.doOnCoreQueue

Browse source
This commit is contained in:
Benoit Martins 2025-05-23 15:50:27 +02:00
parent 9465f7bc68
commit 0bc0eb8e19
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/Contacts/ContactsManager.swift
View file

@ -88,7 +88,7 @@ final class ContactsManager: ObservableObject {
linphoneFriendList.displayName = self.linphoneAddressBookFriendList
core.addFriendList(list: linphoneFriendList)
}
linphoneFriendList.subscriptionsEnabled = true
core.friendListSubscriptionEnabled = true
}
}
@ -383,8 +383,6 @@ final class ContactsManager: ObservableObject {
}
func addFriendListDelegate() {
self.linphoneFriendList?.updateSubscriptions()
self.friendList?.updateSubscriptions()
CoreContext.shared.mCore.friendsLists.forEach { friendList in
friendList.updateSubscriptions()
}

42
Linphone/Core/CoreContext.swift
View file

@ -67,21 +67,33 @@ final class CoreContext: ObservableObject {
}
func doOnCoreQueue(synchronous: Bool = false, lambda: @escaping (Core) -> Void) {
if synchronous {
coreQueue.sync {
lambda(self.mCore)
}
} else {
coreQueue.async {
if self.mCore.globalState != .Off {
lambda(self.mCore)
} else {
Log.warn("Doesn't run the asynchronous function because the core is off")
}
let isOnQueue = DispatchQueue.getSpecific(key: coreQueueKey) != nil
let execute = {
guard self.mCore.globalState != .Off else {
Log.warn("Skipped execution: core is off")
return
}
lambda(self.mCore)
}
switch (synchronous, isOnQueue) {
case (true, true), (false, true):
// Already on the queue → run directly
execute()
case (true, false):
coreQueue.sync(execute: execute)
case (false, false):
coreQueue.async(execute: execute)
}
}
private let coreQueueKey: DispatchSpecificKey<Void> = {
let key = DispatchSpecificKey<Void>()
coreQueue.setSpecific(key: key, value: ())
return key
}()
func initialiseCore() throws {
Log.info("Initialising core")
#if USE_CRASHLYTICS
@ -145,7 +157,6 @@ final class CoreContext: ObservableObject {
self.mCore.videoDisplayEnabled = true
self.mCore.videoPreviewEnabled = false
self.mCore.fecEnabled = true
self.mCore.friendListSubscriptionEnabled = true
// Migration
self.mCore.config!.setBool(section: "sip", key: "auto_answer_replacing_calls", value: false)
@ -230,6 +241,7 @@ final class CoreContext: ObservableObject {
self.coreIsStarted = state == GlobalState.On
}
}
}, onCallStateChanged: { (core: Core, call: Call, cstate: Call.State, message: String) in
TelecomManager.shared.onCallStateChanged(core: core, call: call, state: cstate, message: message)
@ -384,13 +396,11 @@ final class CoreContext: ObservableObject {
}
func onEnterForeground() {
coreQueue.sync {
coreQueue.async {
// We can't rely on defaultAccount?.params?.isPublishEnabled
// as it will be modified by the SDK when changing the presence status
try? self.mCore.start()
Log.info("App is in foreground, PUBLISHING presence as Online")
self.updatePresence(core: self.mCore, presence: ConsolidatedPresence.Online)
}
}
@ -416,7 +426,7 @@ final class CoreContext: ObservableObject {
}
func performActionOnCoreQueueWhenCoreIsStarted(action: @escaping (_ core: Core) -> Void ) {
if coreHasStartedOnce {
if coreIsStarted {
CoreContext.shared.doOnCoreQueue { core in
action(core)
}