ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-10-31 16:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent multiple file selection callbacks coming from the media upload pickers and generating incorrect transitions in the RoomFlowCoordinator state machine

Browse Source
This commit is contained in:
Stefan Ceriu
2023-06-08 10:48:16 +03:00
committed by Stefan Ceriu
parent 1bbb077e3e
commit ea91e371eb
4 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/MediaPickerScreen/CameraPicker.swift
+12 -1
View File
@@ -29,9 +29,11 @@ enum CameraPickerError: Error {
}
struct CameraPicker: UIViewControllerRepresentable {
private weak var userIndicatorController: UserIndicatorControllerProtocol?
private let callback: (CameraPickerAction) -> Void
init(callback: @escaping (CameraPickerAction) -> Void) {
init(userIndicatorController: UserIndicatorControllerProtocol?, callback: @escaping (CameraPickerAction) -> Void) {
self.userIndicatorController = userIndicatorController
self.callback = callback
}
@@ -61,7 +63,16 @@ struct CameraPicker: UIViewControllerRepresentable {
self.cameraPicker = cameraPicker
}
private static let loadingIndicatorIdentifier = "CameraPickerLoadingIndicator"
func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
picker.delegate = nil
cameraPicker.userIndicatorController?.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier, type: .modal, title: L10n.commonLoading))
defer {
cameraPicker.userIndicatorController?.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
}
if let videoURL = info[.mediaURL] as? URL {
cameraPicker.callback(.selectFile(videoURL))
} else if let image = info[.originalImage] as? UIImage {
ElementX/Sources/Screens/MediaPickerScreen/DocumentPicker.swift
+14 -2
View File
@@ -27,9 +27,11 @@ enum DocumentPickerError: Error {
}
struct DocumentPicker: UIViewControllerRepresentable {
private weak var userIndicatorController: UserIndicatorControllerProtocol?
private let callback: (DocumentPickerAction) -> Void
init(callback: @escaping (DocumentPickerAction) -> Void) {
init(userIndicatorController: UserIndicatorControllerProtocol?, callback: @escaping (DocumentPickerAction) -> Void) {
self.userIndicatorController = userIndicatorController
self.callback = callback
}
@@ -60,11 +62,21 @@ struct DocumentPicker: UIViewControllerRepresentable {
documentPicker.callback(.cancel)
}
func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
private static let loadingIndicatorIdentifier = "DocumentPickerLoadingIndicator"
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))
defer {
documentPicker.userIndicatorController?.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
}
do {
let newURL = try FileManager.default.copyFileToTemporaryDirectory(file: url)
documentPicker.callback(.selectFile(newURL))
ElementX/Sources/Screens/MediaPickerScreen/MediaPickerScreenCoordinator.swift
+3 -3
View File
@@ -48,7 +48,7 @@ class MediaPickerScreenCoordinator: CoordinatorProtocol {
case .camera:
cameraPicker
case .photoLibrary:
PhotoLibraryPicker { [weak self] action in
PhotoLibraryPicker(userIndicatorController: userIndicatorController) { [weak self] action in
switch action {
case .cancel:
self?.callback?(.cancel)
@@ -62,7 +62,7 @@ class MediaPickerScreenCoordinator: CoordinatorProtocol {
case .documents:
// The document picker automatically dismisses everything on selection
// Strongly retain self in the callback to forward actions correctly
DocumentPicker { action in
DocumentPicker(userIndicatorController: userIndicatorController) { action in
switch action {
case .cancel:
self.callback?(.cancel)
@@ -77,7 +77,7 @@ class MediaPickerScreenCoordinator: CoordinatorProtocol {
}
private var cameraPicker: some View {
CameraPicker { [weak self] action in
CameraPicker(userIndicatorController: userIndicatorController) { [weak self] action in
switch action {
case .cancel:
self?.callback?(.cancel)
ElementX/Sources/Screens/MediaPickerScreen/PhotoLibraryPicker.swift
+12 -1
View File
@@ -29,9 +29,11 @@ enum PhotoLibraryPickerError: Error {
}
struct PhotoLibraryPicker: UIViewControllerRepresentable {
private weak var userIndicatorController: UserIndicatorControllerProtocol?
private let callback: (PhotoLibraryPickerAction) -> Void
init(callback: @escaping (PhotoLibraryPickerAction) -> Void) {
init(userIndicatorController: UserIndicatorControllerProtocol?, callback: @escaping (PhotoLibraryPickerAction) -> Void) {
self.userIndicatorController = userIndicatorController
self.callback = callback
}
@@ -60,6 +62,8 @@ struct PhotoLibraryPicker: UIViewControllerRepresentable {
// MARK: PHPickerViewControllerDelegate
private static let loadingIndicatorIdentifier = "PhotoLibraryPickerLoadingIndicator"
func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
guard let provider = results.first?.itemProvider,
let contentType = provider.preferredContentType else {
@@ -67,6 +71,13 @@ struct PhotoLibraryPicker: UIViewControllerRepresentable {
return
}
picker.delegate = nil
photoLibraryPicker.userIndicatorController?.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier, type: .modal, title: L10n.commonLoading))
defer {
photoLibraryPicker.userIndicatorController?.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
}
provider.loadFileRepresentation(forTypeIdentifier: contentType.identifier) { [weak self] url, error in
guard let url else {
Task { @MainActor in