From 77951adaa1bea61f7f0c55b78806c7e1899936eb Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Tue, 5 Dec 2023 16:59:46 +0100 Subject: [PATCH] Fix contact image --- Linphone/Contacts/ContactsManager.swift | 5 +++-- Linphone/Core/CoreContext.swift | 2 -- .../UI/Main/Contacts/Fragments/EditContactFragment.swift | 3 +-- Linphone/Utils/EditContactController.swift | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Linphone/Contacts/ContactsManager.swift b/Linphone/Contacts/ContactsManager.swift index 139e62338..0b00df121 100644 --- a/Linphone/Contacts/ContactsManager.swift +++ b/Linphone/Contacts/ContactsManager.swift @@ -123,7 +123,7 @@ final class ContactsManager: ObservableObject { ? contact.phoneNumbers.first!.value.stringValue : contact.givenName, lastName: contact.familyName), name: contact.givenName + contact.familyName, - prefix: String(Int.random(in: 1...1000)) + ((imageThumbnail == nil) ? "-default" : ""), + prefix: ((imageThumbnail == nil) ? "-default" : ""), contact: newContact, linphoneFriend: false, existingFriend: nil) } }) @@ -269,7 +269,8 @@ final class ContactsManager: ObservableObject { DispatchQueue.main.async { do { let urlName = URL(string: name + prefix) - let imagePath = urlName != nil ? urlName!.absoluteString.replacingOccurrences(of: "%", with: "") : String(Int.random(in: 1...1000)) + let imagePath = urlName != nil ? urlName!.absoluteString.replacingOccurrences(of: "%", with: "") : "ImageError" + let decodedData: () = try data.write(to: directory!.appendingPathComponent(imagePath + ".png")) completion(decodedData, imagePath + ".png") diff --git a/Linphone/Core/CoreContext.swift b/Linphone/Core/CoreContext.swift index ce88facec..7d9bb5e6e 100644 --- a/Linphone/Core/CoreContext.swift +++ b/Linphone/Core/CoreContext.swift @@ -87,8 +87,6 @@ final class CoreContext: ObservableObject { self.mCore.autoIterateEnabled = false self.mCore.friendsDatabasePath = "\(configDir)/friends.db" - print("configDirconfigDirconfigDir \(configDir)") - self.mCore.friendListSubscriptionEnabled = true self.mCore.publisher?.onGlobalStateChanged?.postOnMainQueue { (cbVal: (core: Core, state: GlobalState, message: String)) in diff --git a/Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift b/Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift index 0798aa34d..1f1c86112 100644 --- a/Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift +++ b/Linphone/UI/Main/Contacts/Fragments/EditContactFragment.swift @@ -492,8 +492,7 @@ struct EditContactFragment: View { firstName: editContactViewModel.firstName, lastName: editContactViewModel.lastName), name: editContactViewModel.firstName + editContactViewModel.lastName, - prefix: String(Int.random(in: 1...1000)) - + ((selectedImage == nil) ? "-default" : ""), + prefix: ((selectedImage == nil) ? "-default" : ""), contact: newContact, linphoneFriend: true, existingFriend: editContactViewModel.selectedEditFriend) } diff --git a/Linphone/Utils/EditContactController.swift b/Linphone/Utils/EditContactController.swift index df8e0c67f..4734b5562 100644 --- a/Linphone/Utils/EditContactController.swift +++ b/Linphone/Utils/EditContactController.swift @@ -51,7 +51,7 @@ struct EditContactView: UIViewControllerRepresentable { ? cnc.phoneNumbers.first!.value.stringValue : cnc.givenName, lastName: cnc.familyName), name: cnc.givenName + cnc.familyName, - prefix: String(Int.random(in: 1...1000)) + ((imageThumbnail == nil) ? "-default" : ""), + prefix: ((imageThumbnail == nil) ? "-default" : ""), contact: newContact, linphoneFriend: false, existingFriend: ContactsManager.shared.getFriendWithContact(contact: newContact))