mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 10:33:45 +00:00
Multi file uploads (#4358)
* Allow MediaPickerScreen users to select the media selection mode (single or multiple) * Fix cancellation * Add support for multiple media URLs on the MediaUploadPreviewScreen. * Support processing more URLs on the `MediaUploadingPreprocessor` and sending more on the `MediaUploadPreviewScreen` * Add feature flag for `multipleAttachmentUploadEnabled` * Add a label showing the current preview item index in the MediaUploadPreviewScreen * Add support for dragging and dropping or pasting multiple items at the same time. * Support sharing more than one file through the share extension. * Limit the number of items that can be shared in one go to 5. * Fix unit tests * Fix incorrect fatal error when dealing with single selection media pickers. * Document the `multipleAttachmentUploadEnabled` usage in the context of the MediaPicker. * Use a task group for processing selected media in the photo library picker. * Use a task group for processing multiple selected media in the MediaUploadingPreprocessor * Switch the maximum number of items that can be shared to 10. * Allow multiple items to be pasted at the same time.
This commit is contained in:
@@ -8,29 +8,35 @@
|
||||
import SwiftUI
|
||||
|
||||
enum DocumentPickerAction {
|
||||
case selectFile(URL)
|
||||
case selectedMediaAtURLs([URL])
|
||||
case cancel
|
||||
case error(Error)
|
||||
}
|
||||
|
||||
enum DocumentPickerError: Error {
|
||||
case unknown
|
||||
}
|
||||
|
||||
struct DocumentPicker: UIViewControllerRepresentable {
|
||||
private let selectionType: MediaPickerScreenSelectionType
|
||||
private let userIndicatorController: UserIndicatorControllerProtocol
|
||||
private let callback: (DocumentPickerAction) -> Void
|
||||
|
||||
init(userIndicatorController: UserIndicatorControllerProtocol, callback: @escaping (DocumentPickerAction) -> Void) {
|
||||
init(selectionType: MediaPickerScreenSelectionType,
|
||||
userIndicatorController: UserIndicatorControllerProtocol,
|
||||
callback: @escaping (DocumentPickerAction) -> Void) {
|
||||
self.selectionType = selectionType
|
||||
self.userIndicatorController = userIndicatorController
|
||||
self.callback = callback
|
||||
}
|
||||
|
||||
func makeUIViewController(context: Context) -> UIDocumentPickerViewController {
|
||||
let documentPicker = UIDocumentPickerViewController(forOpeningContentTypes: [.data])
|
||||
documentPicker.allowsMultipleSelection = false
|
||||
documentPicker.delegate = context.coordinator
|
||||
|
||||
documentPicker.allowsMultipleSelection = switch selectionType {
|
||||
case .single:
|
||||
false
|
||||
case .multiple:
|
||||
true
|
||||
}
|
||||
|
||||
return documentPicker
|
||||
}
|
||||
|
||||
@@ -56,11 +62,6 @@ struct DocumentPicker: UIViewControllerRepresentable {
|
||||
private static let loadingIndicatorIdentifier = "\(DocumentPicker.self)-Loading"
|
||||
|
||||
func documentPicker(_ picker: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
|
||||
guard let url = urls.first else {
|
||||
documentPicker.callback(.error(DocumentPickerError.unknown))
|
||||
return
|
||||
}
|
||||
|
||||
picker.delegate = nil
|
||||
|
||||
documentPicker.userIndicatorController.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier, type: .modal, title: L10n.commonLoading))
|
||||
@@ -68,14 +69,19 @@ struct DocumentPicker: UIViewControllerRepresentable {
|
||||
documentPicker.userIndicatorController.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
|
||||
}
|
||||
|
||||
do {
|
||||
_ = url.startAccessingSecurityScopedResource()
|
||||
let newURL = try FileManager.default.copyFileToTemporaryDirectory(file: url)
|
||||
url.stopAccessingSecurityScopedResource()
|
||||
documentPicker.callback(.selectFile(newURL))
|
||||
} catch {
|
||||
documentPicker.callback(.error(error))
|
||||
var selectedURLs = [URL]()
|
||||
for url in urls.prefix(10) {
|
||||
do {
|
||||
_ = url.startAccessingSecurityScopedResource()
|
||||
let newURL = try FileManager.default.copyFileToTemporaryDirectory(file: url)
|
||||
url.stopAccessingSecurityScopedResource()
|
||||
selectedURLs.append(newURL)
|
||||
} catch {
|
||||
documentPicker.callback(.error(error))
|
||||
}
|
||||
}
|
||||
|
||||
documentPicker.callback(.selectedMediaAtURLs(selectedURLs))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user