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

Replace contactAddress with params.identityAddress for defaultAccount

Browse source
This commit is contained in:
Benoit Martins 2025-12-12 15:39:11 +01:00
parent f16a0f42ae
commit 57b7b857bc
8 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/GeneratedGit.swift
View file

@ -2,6 +2,6 @@ import Foundation
public enum AppGitInfo {
public static let branch = "feature/mwi"
public static let commit = "623d2e067"
public static let commit = "742aa8025"
public static let tag = "6.1.0-alpha"
}

18
Linphone/UI/Call/ViewModel/MeetingWaitingRoomViewModel.swift
View file

@ -69,8 +69,8 @@ class MeetingWaitingRoomViewModel: ObservableObject {
let confNameTmp = conf?.subject ?? "Conference"
var userNameTmp = ""
let friend = core.defaultAccount != nil && core.defaultAccount!.contactAddress != nil
? ContactsManager.shared.getFriendWithAddress(address: core.defaultAccount?.contactAddress)
let friend = core.defaultAccount != nil && core.defaultAccount!.params?.identityAddress != nil
? ContactsManager.shared.getFriendWithAddress(address: core.defaultAccount?.params?.identityAddress)
: nil
let addressTmp = friend?.address?.asStringUriOnly() ?? ""
@ -78,13 +78,13 @@ class MeetingWaitingRoomViewModel: ObservableObject {
if friend != nil && friend!.address != nil && friend!.address!.displayName != nil {
userNameTmp = friend!.address!.displayName!
} else {
if core.defaultAccount != nil && core.defaultAccount!.contactAddress != nil {
if core.defaultAccount!.contactAddress!.displayName != nil {
userNameTmp = core.defaultAccount!.contactAddress!.displayName!
} else if core.defaultAccount!.contactAddress!.username != nil {
userNameTmp = core.defaultAccount!.contactAddress!.username!
if core.defaultAccount != nil && core.defaultAccount!.params?.identityAddress != nil {
if core.defaultAccount!.params?.identityAddress!.displayName != nil {
userNameTmp = core.defaultAccount!.params!.identityAddress!.displayName!
} else if core.defaultAccount!.params?.identityAddress!.username != nil {
userNameTmp = core.defaultAccount!.params!.identityAddress!.username!
} else {
userNameTmp = String(core.defaultAccount!.contactAddress!.asStringUriOnly().dropFirst(4))
userNameTmp = String(core.defaultAccount!.params!.identityAddress!.asStringUriOnly().dropFirst(4))
}
}
}
@ -92,7 +92,7 @@ class MeetingWaitingRoomViewModel: ObservableObject {
let avatarModelTmp = friend != nil
? ContactsManager.shared.avatarListModel.first(where: {
$0.friend!.name == friend!.name
&& $0.friend!.address!.asStringUriOnly() == core.defaultAccount!.contactAddress!.asStringUriOnly()
&& $0.friend!.address!.asStringUriOnly() == core.defaultAccount!.params?.identityAddress!.asStringUriOnly()
}) ?? ContactAvatarModel(friend: nil, name: userNameTmp, address: addressTmp, withPresence: false)
: ContactAvatarModel(friend: nil, name: userNameTmp, address: addressTmp, withPresence: false)

2
Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
View file

@ -2516,7 +2516,7 @@ class ConversationViewModel: ObservableObject {
dispatchGroup.enter()
ContactAvatarModel.getAvatarModelFromAddress(address: chatMessageReaction.fromAddress!) { avatarResult in
if let account = core.defaultAccount,
let contactAddress = account.contactAddress,
let contactAddress = account.params?.identityAddress,
contactAddress.asStringUriOnly().contains(avatarResult.address) {
let innerSheetCat = InnerSheetCategory(

6
Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift
View file

@ -185,7 +185,7 @@ class ConversationsListViewModel: ObservableObject {
coreContext.doOnCoreQueue { core in
self.coreConversationDelegate = CoreDelegateStub(
onMessagesReceived: { (core: Core, chatRoom: ChatRoom, _: [ChatMessage]) in
if let defaultAddress = core.defaultAccount?.contactAddress,
if let defaultAddress = core.defaultAccount?.params?.identityAddress,
let localAddress = chatRoom.localAddress,
defaultAddress.weakEqual(address2: localAddress) {
let idTmp = LinphoneUtils.getChatRoomId(room: chatRoom)
@ -201,7 +201,7 @@ class ConversationsListViewModel: ObservableObject {
SharedMainViewModel.shared.updateUnreadMessagesCount()
}
}, onMessageSent: { (_: Core, chatRoom: ChatRoom, _: ChatMessage) in
if let defaultAddress = core.defaultAccount?.contactAddress,
if let defaultAddress = core.defaultAccount?.params?.identityAddress,
let localAddress = chatRoom.localAddress,
defaultAddress.weakEqual(address2: localAddress) {
let idTmp = LinphoneUtils.getChatRoomId(room: chatRoom)
@ -232,7 +232,7 @@ class ConversationsListViewModel: ObservableObject {
SharedMainViewModel.shared.updateUnreadMessagesCount()
}, onChatRoomStateChanged: { (core: Core, chatroom: ChatRoom, state: ChatRoom.State) in
// Log.info("[ConversationsListViewModel] Conversation [${LinphoneUtils.getChatRoomId(chatRoom)}] state changed [$state]")
if let defaultAddress = core.defaultAccount?.contactAddress,
if let defaultAddress = core.defaultAccount?.params?.identityAddress,
let localAddress = chatroom.localAddress,
defaultAddress.weakEqual(address2: localAddress) {
if core.globalState == .On {

2
Linphone/UI/Main/Meetings/Fragments/MeetingsListBottomSheet.swift
View file

@ -56,7 +56,7 @@ struct MeetingsListBottomSheet: View {
Button {
CoreContext.shared.doOnCoreQueue { core in
if let organizerUri = self.meetingsListViewModel.selectedMeetingToDelete?.confInfo.organizer {
if core.defaultAccount?.contactAddress?.weakEqual(address2: organizerUri) ?? false {
if core.defaultAccount?.params?.identityAddress?.weakEqual(address2: organizerUri) ?? false {
// If we are the organizer, display popup for sending
DispatchQueue.main.async {
self.isShowSendCancelMeetingNotificationPopup = true

2
Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift
View file

@ -357,7 +357,7 @@ class MeetingViewModel: ObservableObject {
let organizer = meeting.confInfo.organizer
var organizerFound = false
if let myAddr = core.defaultAccount?.contactAddress {
if let myAddr = core.defaultAccount?.params?.identityAddress {
let isOrganizer = (organizer != nil) ? myAddr.weakEqual(address2: organizer!) : false
organizerFound = organizerFound || isOrganizer
ContactAvatarModel.getAvatarModelFromAddress(address: myAddr) { avatarResult in

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

@ -121,7 +121,7 @@ class AccountModel: ObservableObject {
let address = account.params?.identityAddress?.asString()
let displayNameTmp = account.params?.identityAddress?.displayName ?? displayName
let usernaneAvatarTmp = account.contactAddress?.username ?? displayName
let usernaneAvatarTmp = account.params?.identityAddress?.username ?? displayName
var photoAvatarModelTmp = ""
let preferences = UserDefaults.standard

2
Linphone/Utils/MagicSearchSingleton.swift
View file

@ -101,7 +101,7 @@ final class MagicSearchSingleton: ObservableObject {
($0.address?.asStringUriOnly() ?? "") < ($1.address?.asStringUriOnly() ?? "")
})
if let defaultAccount = core.defaultAccount, let contactAddress = defaultAccount.contactAddress {
if let defaultAccount = core.defaultAccount, let contactAddress = defaultAccount.params?.identityAddress {
lastSearchSuggestions.removeAll {
$0.address?.weakEqual(address2: contactAddress) ?? false
}