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

Remove all access to core.Accounts from main thread. Directly store [AccountModel] in coreContext published variable

Browse source
This commit is contained in:
QuentinArguillere 2024-08-20 18:20:07 +02:00 • committed by Benoit Martins
parent 885c14ef9c
commit 1abc35de0c
3 changed files with 58 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Linphone/Core/CoreContext.swift
View file

@ -40,7 +40,7 @@ final class CoreContext: ObservableObject {
@Published var loggingInProgress: Bool = false
@Published var hasDefaultAccount: Bool = false
@Published var coreIsStarted: Bool = false
@Published var accounts: [Account] = []
@Published var accounts: [AccountModel] = []
private var mCore: Core!
private var mIterateSuscription: AnyCancellable?
@ -128,6 +128,7 @@ final class CoreContext: ObservableObject {
self.mCore.maxSizeForAutoDownloadIncomingFiles = 0
self.mCore.config!.setBool(section: "sip", key: "auto_answer_replacing_calls", value: false)
self.mCoreSuscriptions.insert(self.mCore.publisher?.onGlobalStateChanged?.postOnCoreQueue { (cbVal: (core: Core, state: GlobalState, message: String)) in
if cbVal.state == GlobalState.On {
#if DEBUG
@ -142,18 +143,23 @@ final class CoreContext: ObservableObject {
account.params = newParams
}
self.actionsToPerformOnCoreQueueWhenCoreIsStarted.forEach {$0(cbVal.core)}
self.actionsToPerformOnCoreQueueWhenCoreIsStarted.forEach { $0(cbVal.core) }
self.actionsToPerformOnCoreQueueWhenCoreIsStarted.removeAll()
let hasDefaultAccount = self.mCore.defaultAccount != nil ? true : false
var accountModels: [AccountModel] = []
for account in self.mCore.accountList {
accountModels.append(AccountModel(account: account, corePublisher: self.mCore.publisher))
}
DispatchQueue.main.async {
if cbVal.state == GlobalState.On {
self.hasDefaultAccount = self.mCore.defaultAccount != nil ? true : false
self.coreIsStarted = true
self.accounts = self.mCore.accountList
} else if cbVal.state == GlobalState.Off {
self.hasDefaultAccount = false
self.coreIsStarted = false
}
self.hasDefaultAccount = hasDefaultAccount
self.coreIsStarted = true
self.accounts = accountModels
}
} else if cbVal.state == GlobalState.Off {
DispatchQueue.main.async {
self.hasDefaultAccount = false
self.coreIsStarted = false
}
}
})
@ -162,11 +168,15 @@ final class CoreContext: ObservableObject {
// In this case, we want to know about the account registration status
self.mCoreSuscriptions.insert(self.mCore.publisher?.onConfiguringStatus?.postOnCoreQueue { (cbVal: (core: Core, status: ConfiguringState, message: String)) in
Log.info("New configuration state is \(cbVal.status) = \(cbVal.message)\n")
var accountModels: [AccountModel] = []
for account in self.mCore.accountList {
accountModels.append(AccountModel(account: account, corePublisher: self.mCore.publisher))
}
DispatchQueue.main.async {
if cbVal.status == ConfiguringState.Successful {
ToastViewModel.shared.toastMessage = "Successful"
ToastViewModel.shared.displayToast = true
self.accounts = self.mCore.accountList
self.accounts = accountModels
}
}
/*
@ -288,13 +298,25 @@ final class CoreContext: ObservableObject {
})
self.mCoreSuscriptions.insert(self.mCore.publisher?.onAccountAdded?
.postOnMainQueue { _ in
self.accounts = self.mCore.accountList
.postOnCoreQueue { _ in
var accountModels: [AccountModel] = []
for account in self.mCore.accountList {
accountModels.append(AccountModel(account: account, corePublisher: self.mCore.publisher))
}
DispatchQueue.main.async {
self.accounts = accountModels
}
})
self.mCoreSuscriptions.insert(self.mCore.publisher?.onAccountRemoved?
.postOnMainQueue { _ in
self.accounts = self.mCore.accountList
.postOnCoreQueue { _ in
var accountModels: [AccountModel] = []
for account in self.mCore.accountList {
accountModels.append(AccountModel(account: account, corePublisher: self.mCore.publisher))
}
DispatchQueue.main.async {
self.accounts = accountModels
}
})
self.mIterateSuscription = Timer.publish(every: 0.02, on: .main, in: .common)

5
Linphone/UI/Main/Fragments/SideMenu.swift
View file

@ -66,10 +66,7 @@ struct SideMenu: View {
List {
ForEach(0..<CoreContext.shared.accounts.count, id: \.self) { index in
SideMenuAccountRow(
model: AccountModel(account: CoreContext.shared.accounts[0],
corePublisher: CoreContext.shared.getCorePublisher())
)
SideMenuAccountRow( model: CoreContext.shared.accounts[index])
.background()
.listRowInsets(EdgeInsets(top: 0, leading: 16, bottom: 0, trailing: 16))
.listRowSeparator(.hidden)

35
Linphone/UI/Main/Viewmodel/AccountModel.swift
View file

@ -20,6 +20,7 @@
import Foundation
import linphonesw
import SwiftUI
import Combine
class AccountModel: ObservableObject {
let account: Account
@ -30,26 +31,30 @@ class AccountModel: ObservableObject {
@Published var displayName: String = ""
@Published var address: String = ""
private var mSuscriptions = Set<AnyCancellable?>()
init(account: Account, corePublisher: CoreDelegatePublisher?) {
self.account = account
mSuscriptions.insert(account.publisher?.onRegistrationStateChanged?.postOnCoreQueue { _ in
self.update()
})
mSuscriptions.insert(corePublisher?.onChatRoomRead?.postOnCoreQueue(
receiveValue: { _ in
self.computeNotificationsCount()
}))
mSuscriptions.insert(corePublisher?.onMessagesReceived?.postOnCoreQueue(
receiveValue: { _ in
self.computeNotificationsCount()
}))
mSuscriptions.insert(corePublisher?.onCallStateChanged?.postOnCoreQueue(
receiveValue: { _ in
self.computeNotificationsCount()
}))
CoreContext.shared.doOnCoreQueue { _ in
self.update()
}
account.publisher?.onRegistrationStateChanged?.postOnCoreQueue { _ in
self.update()
}
corePublisher?.onChatRoomRead?.postOnCoreQueue(
receiveValue: { _ in
self.computeNotificationsCount()
})
corePublisher?.onMessagesReceived?.postOnCoreQueue(
receiveValue: { _ in
self.computeNotificationsCount()
})
corePublisher?.onCallStateChanged?.postOnCoreQueue(
receiveValue: { _ in
self.computeNotificationsCount()
})
}
private func update() {