From ac6b478eb1a65893da569b7c12b1044f8bc16624 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Mon, 20 Oct 2025 15:49:07 +0200 Subject: [PATCH] Edit carddav friend --- .../Main/Contacts/Fragments/ContactInnerActionsFragment.swift | 2 +- .../UI/Main/Contacts/Fragments/ContactInnerFragment.swift | 4 +++- Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Linphone/UI/Main/Contacts/Fragments/ContactInnerActionsFragment.swift b/Linphone/UI/Main/Contacts/Fragments/ContactInnerActionsFragment.swift index d77ad3971..1279fd6dc 100644 --- a/Linphone/UI/Main/Contacts/Fragments/ContactInnerActionsFragment.swift +++ b/Linphone/UI/Main/Contacts/Fragments/ContactInnerActionsFragment.swift @@ -211,7 +211,7 @@ struct ContactInnerActionsFragment: View { .background(Color.gray100) VStack(spacing: 0) { - if !contactAvatarModel.nativeUri.isEmpty { + if !contactAvatarModel.editable { Button { actionEditButton() } label: { diff --git a/Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift b/Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift index 5798a0311..eb9088e58 100644 --- a/Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift +++ b/Linphone/UI/Main/Contacts/Fragments/ContactInnerFragment.swift @@ -72,8 +72,9 @@ struct ContactInnerFragment: View { Spacer() - if !contactAvatarModel.nativeUri.isEmpty { + if !contactAvatarModel.editable { Button(action: { + print("nativeUrinativeUri 00 \(contactAvatarModel.nativeUri)") editNativeContact() }, label: { Image("pencil-simple") @@ -99,6 +100,7 @@ struct ContactInnerFragment: View { } .simultaneousGesture( TapGesture().onEnded { + print("nativeUrinativeUri 11 \(contactAvatarModel.nativeUri)") isShowEditContactFragmentInContactDetails = true } ) diff --git a/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift b/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift index 356c8c6e0..dfc17eb88 100644 --- a/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift +++ b/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift @@ -32,6 +32,7 @@ class ContactAvatarModel: ObservableObject, Identifiable { @Published var phoneNumbersWithLabel: [(label: String, phoneNumber: String)] = [] var nativeUri: String = "" + var editable: Bool = true var withPresence: Bool? @Published var starred: Bool = false @@ -70,6 +71,7 @@ class ContactAvatarModel: ObservableObject, Identifiable { } } let nativeUriTmp = friend?.nativeUri ?? "" + let editableTmp = friend?.friendList?.type == .CardDAV || nativeUriTmp.isEmpty let withPresenceTmp = withPresence let starredTmp = friend?.starred ?? false let vcardTmp = friend?.vcard ?? nil @@ -108,6 +110,7 @@ class ContactAvatarModel: ObservableObject, Identifiable { self.addresses = addressesTmp self.phoneNumbersWithLabel = phoneNumbersWithLabelTmp self.nativeUri = nativeUriTmp + self.editable = editableTmp self.withPresence = withPresenceTmp self.starred = starredTmp self.vcard = vcardTmp