From fd7242d9bb3c8c24d11a8badbc349653ba7544ae Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Tue, 15 Jul 2025 12:27:02 +0200 Subject: [PATCH] Hide mediasIsLoading fragment when image or file picker returns an empty list --- .../Fragments/ConversationFragment.swift | 42 +++++++++++-------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/Linphone/UI/Main/Conversations/Fragments/ConversationFragment.swift b/Linphone/UI/Main/Conversations/Fragments/ConversationFragment.swift index 76d608f77..3517ec39c 100644 --- a/Linphone/UI/Main/Conversations/Fragments/ConversationFragment.swift +++ b/Linphone/UI/Main/Conversations/Fragments/ConversationFragment.swift @@ -117,16 +117,20 @@ struct ConversationFragment: View { isShowPhotoLibrary = false }, content: { PhotoPicker(filter: nil, limit: conversationViewModel.maxMediaCount - conversationViewModel.mediasToSend.count) { results in - PhotoPicker.convertToAttachmentArray(fromResults: results) { mediasOrNil, errorOrNil in - if let error = errorOrNil { - print(error) - } - - if let medias = mediasOrNil { - conversationViewModel.mediasToSend.append(contentsOf: medias) - } - + if results.isEmpty && conversationViewModel.mediasToSend.isEmpty { self.mediasIsLoading = false + } else { + PhotoPicker.convertToAttachmentArray(fromResults: results) { mediasOrNil, errorOrNil in + if let error = errorOrNil { + print(error) + } + + if let medias = mediasOrNil { + conversationViewModel.mediasToSend.append(contentsOf: medias) + } + + self.mediasIsLoading = false + } } } .edgesIgnoringSafeArea(.all) @@ -135,15 +139,19 @@ struct ConversationFragment: View { isShowFilePicker = false }, content: { FilePicker(onDocumentsPicked: { urlList in - FilePicker.convertToAttachmentArray(fromResults: urlList) { mediasOrNil, errorOrNil in - if let error = errorOrNil { - print(error) - } - - if let medias = mediasOrNil { - conversationViewModel.mediasToSend.append(contentsOf: medias) - } + if urlList.isEmpty && conversationViewModel.mediasToSend.isEmpty { self.mediasIsLoading = false + } else { + FilePicker.convertToAttachmentArray(fromResults: urlList) { mediasOrNil, errorOrNil in + if let error = errorOrNil { + print(error) + } + + if let medias = mediasOrNil { + conversationViewModel.mediasToSend.append(contentsOf: medias) + } + self.mediasIsLoading = false + } } }) .edgesIgnoringSafeArea(.all)