witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Fix user avatar issue

Browse source
This commit is contained in:
Benoit Martins 2025-02-17 14:18:19 +01:00
parent f1fcb9129c
commit a524d3c362
2 changed files with 53 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Linphone/Contacts/ContactsManager.swift
View file

@ -324,12 +324,15 @@ final class ContactsManager: ObservableObject {
if directory != nil { if directory != nil {
DispatchQueue.main.async { DispatchQueue.main.async {
do { do {
let urlName = URL(string: name + prefix) if let urlName = URL(string: name + prefix) {
let imagePath = urlName != nil ? urlName!.absoluteString.replacingOccurrences(of: "%", with: "") : "ImageError" let imagePath = urlName.absoluteString.replacingOccurrences(of: "%", with: "")
let decodedData: () = try data.write(to: directory!.appendingPathComponent(imagePath + ".png")) let decodedData: () = try data.write(to: directory!.appendingPathComponent(imagePath + ".png"))
completion(decodedData, imagePath + ".png") completion(decodedData, imagePath + ".png")
} else {
completion((), "")
}
} catch { } catch {
print("Error: ", error) print("Error: ", error)
completion((), "") completion((), "")

37
Linphone/UI/Main/ContentView.swift
View file

@ -81,6 +81,7 @@ struct ContentView: View {
@State private var isShowLoginFragment: Bool = false @State private var isShowLoginFragment: Bool = false
private let avatarSize = 45.0 private let avatarSize = 45.0
@State private var imagePath: URL?
var body: some View { var body: some View {
let pub = NotificationCenter.default let pub = NotificationCenter.default
@ -316,8 +317,7 @@ struct ContentView: View {
if searchIsActive == false { if searchIsActive == false {
HStack { HStack {
if (accountProfileViewModel.accountModelIndex ?? 0) < CoreContext.shared.accounts.count { if (accountProfileViewModel.accountModelIndex ?? 0) < CoreContext.shared.accounts.count {
if sharedMainViewModel.defaultAvatar != nil { AsyncImage(url: imagePath) { image in
AsyncImage(url: sharedMainViewModel.defaultAvatar) { image in
switch image { switch image {
case .empty: case .empty:
ProgressView() ProgressView()
@ -342,30 +342,31 @@ struct ContentView: View {
.onTapGesture { .onTapGesture {
openMenu() openMenu()
} }
.onAppear {
if let accountModelIndex = accountProfileViewModel.accountModelIndex,
accountModelIndex < CoreContext.shared.accounts.count {
let imagePathTmp = CoreContext.shared.accounts[accountModelIndex].getImagePath()
if !(imagePathTmp.lastPathComponent.isEmpty || imagePathTmp.lastPathComponent == "Error" || imagePathTmp.lastPathComponent == "ImageError.png") {
imagePath = imagePathTmp
}
}
}
.onChange(of: CoreContext.shared.accounts[accountProfileViewModel.accountModelIndex ?? 0].usernaneAvatar) { _ in .onChange(of: CoreContext.shared.accounts[accountProfileViewModel.accountModelIndex ?? 0].usernaneAvatar) { _ in
if let accountModelIndex = accountProfileViewModel.accountModelIndex, if let accountModelIndex = accountProfileViewModel.accountModelIndex,
accountModelIndex < CoreContext.shared.accounts.count { accountModelIndex < CoreContext.shared.accounts.count {
sharedMainViewModel.changeDefaultAvatar(defaultAvatarURL: CoreContext.shared.accounts[accountModelIndex].getImagePath()) let imagePathTmp = CoreContext.shared.accounts[accountModelIndex].getImagePath()
if !(imagePathTmp.lastPathComponent.isEmpty || imagePathTmp.lastPathComponent == "Error" || imagePathTmp.lastPathComponent == "ImageError.png") {
sharedMainViewModel.changeDefaultAvatar(defaultAvatarURL: imagePathTmp)
imagePath = imagePathTmp
}
} }
} }
.onReceive(imageChanged) { _ in .onReceive(imageChanged) { _ in
if let accountModelIndex = accountProfileViewModel.accountModelIndex, if let accountModelIndex = accountProfileViewModel.accountModelIndex,
accountModelIndex < CoreContext.shared.accounts.count { accountModelIndex < CoreContext.shared.accounts.count {
sharedMainViewModel.changeDefaultAvatar(defaultAvatarURL: CoreContext.shared.accounts[accountModelIndex].getImagePath()) let imagePathTmp = CoreContext.shared.accounts[accountModelIndex].getImagePath()
} sharedMainViewModel.changeDefaultAvatar(defaultAvatarURL: imagePathTmp)
} imagePath = imagePathTmp
} else {
Image(uiImage: contactsManager.textToImage(
firstName: CoreContext.shared.accounts[accountProfileViewModel.accountModelIndex ?? 0].avatarModel?.name ?? "",
lastName: ""))
.resizable()
.frame(width: avatarSize, height: avatarSize)
.clipShape(Circle())
.onAppear {
if let accountModelIndex = accountProfileViewModel.accountModelIndex,
accountModelIndex < CoreContext.shared.accounts.count {
sharedMainViewModel.changeDefaultAvatar(defaultAvatarURL: CoreContext.shared.accounts[accountModelIndex].getImagePath())
}
} }
} }
} }