mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +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:
@@ -12,12 +12,12 @@ enum ShareExtensionConstants {
|
||||
}
|
||||
|
||||
enum ShareExtensionPayload: Hashable, Codable {
|
||||
case mediaFile(roomID: String?, mediaFile: ShareExtensionMediaFile)
|
||||
case mediaFiles(roomID: String?, mediaFiles: [ShareExtensionMediaFile])
|
||||
case text(roomID: String?, text: String)
|
||||
|
||||
var roomID: String? {
|
||||
switch self {
|
||||
case .mediaFile(let roomID, _),
|
||||
case .mediaFiles(let roomID, _),
|
||||
.text(let roomID, _):
|
||||
roomID
|
||||
}
|
||||
@@ -27,14 +27,16 @@ enum ShareExtensionPayload: Hashable, Codable {
|
||||
/// system's `temporaryDirectory` returning a modified payload with updated file URLs.
|
||||
func withDefaultTemporaryDirectory() throws -> Self {
|
||||
switch self {
|
||||
case .mediaFile(let roomID, let mediaFile):
|
||||
let path = mediaFile.url.path.replacing(URL.appGroupTemporaryDirectory.path, with: "").trimmingPrefix("/")
|
||||
let newURL = URL.temporaryDirectory.appending(path: path)
|
||||
|
||||
try? FileManager.default.removeItem(at: newURL)
|
||||
try FileManager.default.moveItem(at: mediaFile.url, to: newURL)
|
||||
|
||||
return .mediaFile(roomID: roomID, mediaFile: mediaFile.replacingURL(with: newURL))
|
||||
case .mediaFiles(let roomID, let mediaFiles):
|
||||
return try .mediaFiles(roomID: roomID, mediaFiles: mediaFiles.map { mediaFile in
|
||||
let path = mediaFile.url.path.replacing(URL.appGroupTemporaryDirectory.path, with: "").trimmingPrefix("/")
|
||||
let newURL = URL.temporaryDirectory.appending(path: path)
|
||||
|
||||
try? FileManager.default.removeItem(at: newURL)
|
||||
try FileManager.default.moveItem(at: mediaFile.url, to: newURL)
|
||||
|
||||
return mediaFile.replacingURL(with: newURL)
|
||||
})
|
||||
case .text:
|
||||
return self
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user