[fix/improve_photo_upload_responsiveness] More reliable photo upload

ownCloud.xcodeproj/project.pbxproj

@@ -73,11 +73,13 @@
 		39E98B3E22797D1B009911F1 /* PublicLinkTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E98B3D22797D1B009911F1 /* PublicLinkTableViewController.swift */; };
 		39E98B452279ACF5009911F1 /* PublicLinkEditTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E98B442279ACF5009911F1 /* PublicLinkEditTableViewController.swift */; };
 		46B9D336BF7FE50321823888 /* Pods_ownCloudScreenshotsTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54199937F74A129BC74DEB0A /* Pods_ownCloudScreenshotsTests.framework */; };
+		4C05D8A5238708D40073EF50 /* MediaUploadStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C05D8A4238708D40073EF50 /* MediaUploadStorage.swift */; };
 		4C11EE5B22E88D4200B84869 /* InstantMediaUploadTaskExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C11EE5A22E88D4200B84869 /* InstantMediaUploadTaskExtension.swift */; };
 		4C1561E8222321E0009C4EF3 /* PhotoSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1561E7222321E0009C4EF3 /* PhotoSelectionViewController.swift */; };
 		4C1561EF22232357009C4EF3 /* PhotoSelectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1561EE22232357009C4EF3 /* PhotoSelectionViewCell.swift */; };
 		4C16CBA7226F0F1A00D67BB6 /* FileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C16CBA6226F0F1900D67BB6 /* FileTests.swift */; };
 		4C235CEE21F88C0300A989A8 /* UIViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C235CED21F88C0300A989A8 /* UIViewController+Extension.swift */; };
+		4C3E17DB234DBF9A000D7BA8 /* PendingMediaUploadTaskExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3E17DA234DBF9A000D7BA8 /* PendingMediaUploadTaskExtension.swift */; };
 		4C464BEF2187AF1500D30602 /* PDFThumbnailCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C464BE12187AF1400D30602 /* PDFThumbnailCollectionViewCell.swift */; };
 		4C464BF02187AF1500D30602 /* PDFTocTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C464BE82187AF1400D30602 /* PDFTocTableViewController.swift */; };
 		4C464BF12187AF1500D30602 /* PDFTocTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C464BE92187AF1400D30602 /* PDFTocTableViewCell.swift */; };
@@ -95,6 +97,7 @@
 		4C7295D8228C384E00FA4E68 /* LogFilesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7295D7228C384E00FA4E68 /* LogFilesViewController.swift */; };
 		4C82D07022C9387300835F0B /* MediaDisplayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C82D06F22C9387300835F0B /* MediaDisplayViewController.swift */; };
 		4C88041822E78D790016CBA9 /* MediaFilesSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C88041722E78D790016CBA9 /* MediaFilesSettings.swift */; };
+		4C96463C238489E4003278B7 /* MediaUploadActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C96463B238489E4003278B7 /* MediaUploadActivity.swift */; };
 		4C9BFA2323158C3F0059CA3E /* PreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9BFA2223158C3F0059CA3E /* PreviewViewController.swift */; };
 		4CAF783C2282FD40000C85CF /* FileManager+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAF783B2282FD40000C85CF /* FileManager+Extension.swift */; };
 		4CB8ADDE22DF5D3700F1FEBC /* PHPhotoLibrary+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8ADDD22DF5D3700F1FEBC /* PHPhotoLibrary+Extension.swift */; };
@@ -669,11 +672,13 @@
 		39E98B442279ACF5009911F1 /* PublicLinkEditTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicLinkEditTableViewController.swift; sourceTree = "<group>"; };
 		3D753147564B1E4F47826109 /* Pods-ownCloud Screenshots Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ownCloud Screenshots Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ownCloud Screenshots Tests/Pods-ownCloud Screenshots Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		42866B2892DC9EDC65D844E7 /* Pods_ownCloud_Screenshots_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ownCloud_Screenshots_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4C05D8A4238708D40073EF50 /* MediaUploadStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaUploadStorage.swift; sourceTree = "<group>"; };
 		4C11EE5A22E88D4200B84869 /* InstantMediaUploadTaskExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstantMediaUploadTaskExtension.swift; sourceTree = "<group>"; };
 		4C1561E7222321E0009C4EF3 /* PhotoSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoSelectionViewController.swift; sourceTree = "<group>"; };
 		4C1561EE22232357009C4EF3 /* PhotoSelectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoSelectionViewCell.swift; sourceTree = "<group>"; };
 		4C16CBA6226F0F1900D67BB6 /* FileTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileTests.swift; sourceTree = "<group>"; };
 		4C235CED21F88C0300A989A8 /* UIViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = "<group>"; };
+		4C3E17DA234DBF9A000D7BA8 /* PendingMediaUploadTaskExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PendingMediaUploadTaskExtension.swift; sourceTree = "<group>"; };
 		4C464BE12187AF1400D30602 /* PDFThumbnailCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFThumbnailCollectionViewCell.swift; sourceTree = "<group>"; };
 		4C464BE82187AF1400D30602 /* PDFTocTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFTocTableViewController.swift; sourceTree = "<group>"; };
 		4C464BE92187AF1400D30602 /* PDFTocTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFTocTableViewCell.swift; sourceTree = "<group>"; };
@@ -691,6 +696,7 @@
 		4C7295D7228C384E00FA4E68 /* LogFilesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogFilesViewController.swift; sourceTree = "<group>"; };
 		4C82D06F22C9387300835F0B /* MediaDisplayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaDisplayViewController.swift; sourceTree = "<group>"; };
 		4C88041722E78D790016CBA9 /* MediaFilesSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaFilesSettings.swift; sourceTree = "<group>"; };
+		4C96463B238489E4003278B7 /* MediaUploadActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaUploadActivity.swift; sourceTree = "<group>"; };
 		4C9BFA2223158C3F0059CA3E /* PreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewViewController.swift; sourceTree = "<group>"; };
 		4CAF783B2282FD40000C85CF /* FileManager+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Extension.swift"; sourceTree = "<group>"; };
 		4CB8ADDD22DF5D3700F1FEBC /* PHPhotoLibrary+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PHPhotoLibrary+Extension.swift"; sourceTree = "<group>"; };
@@ -1246,6 +1252,7 @@
 				4C51727622DE04BD001BC97F /* BackgroundFetchUpdateTaskAction.swift */,
 				4C51727722DE04BD001BC97F /* ScheduledTaskManager.swift */,
 				4C11EE5A22E88D4200B84869 /* InstantMediaUploadTaskExtension.swift */,
+				4C3E17DA234DBF9A000D7BA8 /* PendingMediaUploadTaskExtension.swift */,
 			);
 			path = Tasks;
 			sourceTree = "<group>";
@@ -1264,6 +1271,8 @@
 				4CB8ADDD22DF5D3700F1FEBC /* PHPhotoLibrary+Extension.swift */,
 				4CB8ADE222DF6BA700F1FEBC /* PHAsset+Upload.swift */,
 				4CC4A21822FB4F4C00AE7E2C /* MediaUploadQueue.swift */,
+				4C96463B238489E4003278B7 /* MediaUploadActivity.swift */,
+				4C05D8A4238708D40073EF50 /* MediaUploadStorage.swift */,
 			);
 			path = "PhotoKit Extensions";
 			sourceTree = "<group>";
@@ -2603,6 +2612,7 @@
 				4C9BFA2323158C3F0059CA3E /* PreviewViewController.swift in Sources */,
 				DC1B2709209CF0D3004715E1 /* CertificateViewController.swift in Sources */,
 				DC248C67213E7DB00067FE94 /* NSLayoutConstraint+Extension.swift in Sources */,
+				4C3E17DB234DBF9A000D7BA8 /* PendingMediaUploadTaskExtension.swift in Sources */,
 				6E586CFC2199A72600F680C4 /* OpenInAction.swift in Sources */,
 				DC136582208223F000FC0F60 /* OCBookmark+Extension.swift in Sources */,
 				23D77FCD212BFBD100DE76F1 /* NamingViewController.swift in Sources */,
@@ -2642,11 +2652,13 @@
 				DC85572C20513B8C00189B9A /* ServerListTableViewController.swift in Sources */,
 				233BDEA0204FEFE500C06732 /* AppDelegate.swift in Sources */,
 				4C51727E22DE04BD001BC97F /* BackgroundFetchUpdateTaskAction.swift in Sources */,
+				4C05D8A5238708D40073EF50 /* MediaUploadStorage.swift in Sources */,
 				236735A621217C3500E5834A /* MoreViewController.swift in Sources */,
 				39E2FE0021FF814A00F0117F /* ThemeRoundedButton.swift in Sources */,
 				23957A6D209AFFE8003C8537 /* MoreSettingsSection.swift in Sources */,
 				4C464BEF2187AF1500D30602 /* PDFThumbnailCollectionViewCell.swift in Sources */,
 				232B01F62126B10900366FA0 /* MoreStaticTableViewController.swift in Sources */,
+				4C96463C238489E4003278B7 /* MediaUploadActivity.swift in Sources */,
 				6E91F37E21ECA6FD009436D2 /* CopyAction.swift in Sources */,
 				4CC4A21922FB4F4C00AE7E2C /* MediaUploadQueue.swift in Sources */,
 				593BAB97209F8A0500023634 /* AppLockManager.swift in Sources */,

ownCloud/AVFoundation Extensions/AVAsset+Extension.swift

@@ -19,28 +19,39 @@
 import AVFoundation
 
 extension AVAsset {
-	func exportVideo(targetURL:URL, type:AVFileType, completion:@escaping (_ success:Bool) -> Void) {
+	func exportVideo(targetURL:URL, type:AVFileType) -> Bool {
 		if self.isExportable {
-
+			let group = DispatchGroup()
 			let preset = AVAssetExportPresetHighestQuality
+			var compatiblePreset = false
+			var exportSuccess = false
 
+			group.enter()
 			AVAssetExportSession.determineCompatibility(ofExportPreset: preset, with: self, outputFileType: type, completionHandler: { (isCompatible) in
-				if !isCompatible {
-					completion(false)
-				}})
+				compatiblePreset = isCompatible
+				group.leave()
+			})
 
-			guard let export = AVAssetExportSession(asset: self, presetName: preset) else {
-				completion(false)
-				return
-			}
+			if compatiblePreset {
+				guard let export = AVAssetExportSession(asset: self, presetName: preset) else {
+					return false
+				}
+				// Configure export session
+				export.outputFileType = type
+				export.outputURL = targetURL
 
-			export.outputFileType = type
-			export.outputURL = targetURL
-			export.exportAsynchronously {
-				completion( export.status == .completed )
+				// Start export
+				group.enter()
+				export.exportAsynchronously {
+					exportSuccess = (export.status == .completed)
+					group.leave()
+				}
 			}
-		} else {
-			completion(false)
+
+			group.wait()
+			return exportSuccess
 		}
+
+		return false
 	}
 }

ownCloud/AppDelegate.swift

@@ -73,20 +73,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		OCExtensionManager.shared.addExtension(UploadFileAction.actionExtension)
 		OCExtensionManager.shared.addExtension(UploadMediaAction.actionExtension)
 		OCExtensionManager.shared.addExtension(UnshareAction.actionExtension)
-		OCExtensionManager.shared.addExtension(BackgroundFetchUpdateTaskAction.taskExtension)
-		OCExtensionManager.shared.addExtension(InstantMediaUploadTaskExtension.taskExtension)
 		OCExtensionManager.shared.addExtension(MakeAvailableOfflineAction.actionExtension)
 		OCExtensionManager.shared.addExtension(MakeUnavailableOfflineAction.actionExtension)
 		OCExtensionManager.shared.addExtension(CollaborateAction.actionExtension)
 		OCExtensionManager.shared.addExtension(LinksAction.actionExtension)
 		OCExtensionManager.shared.addExtension(FavoriteAction.actionExtension)
 		OCExtensionManager.shared.addExtension(UnfavoriteAction.actionExtension)
 		// OCExtensionManager.shared.addExtension(ScanAction.actionExtension)
+
 		if #available(iOS 13.0, *), UIDevice.current.isIpad() {
 			OCExtensionManager.shared.addExtension(DiscardSceneAction.actionExtension)
 			OCExtensionManager.shared.addExtension(OpenSceneAction.actionExtension)
 		}
 
+		// Task extensions
+		OCExtensionManager.shared.addExtension(BackgroundFetchUpdateTaskAction.taskExtension)
+		OCExtensionManager.shared.addExtension(InstantMediaUploadTaskExtension.taskExtension)
+		OCExtensionManager.shared.addExtension(PendingMediaUploadTaskExtension.taskExtension)
+
+		// Theming
 		Theme.shared.activeCollection = ThemeCollection(with: ThemeStyle.preferredStyle)
 
 		// Licenses

ownCloud/Client/Actions/Actions+Extensions/UploadMediaAction.swift

@@ -57,15 +57,11 @@ class UploadMediaAction: UploadBaseAction {
 			photoAlbumViewController.selectionCallback = {(assets) in
 				self.completed()
 
-				guard let rootItem = self.context.items.first else { return }
+				guard let path = self.context.items.first?.path else { return }
 
-				MediaUploadQueue.shared.uploadAssets(assets, with: self.core, at: rootItem, progressHandler: { (progress) in
-					if progress.isFinished || progress.isCancelled {
-						self.unpublish(progress: progress)
-					} else {
-						self.publish(progress: progress)
-					}
-				})
+				guard let bookmark = OCBookmarkManager.lastBookmarkSelectedForConnection else { return }
+
+				MediaUploadQueue.shared.addUploads(assets, for: bookmark, at: path)
 			}
 			let navigationController = ThemeNavigationController(rootViewController: photoAlbumViewController)
 

ownCloud/Client/ClientRootViewController.swift

@@ -224,17 +224,6 @@ class ClientRootViewController: UITabBarController, UINavigationControllerDelega
 		}
 	}
 
-	override func viewDidAppear(_ animated: Bool) {
-		super.viewDidAppear(animated)
-
-		if MediaUploadQueue.isMediaUploadPendingFlagSet(for: self.bookmark) {
-			let unfinishedUploadAlert = ThemedAlertController(with: "Warning".localized,
-														   message: "Media upload in the previous session was incomplete since the application was terminated".localized)
-			self.present(unfinishedUploadAlert, animated: true, completion: nil)
-			MediaUploadQueue.resetUploadPendingFlag(for: self.bookmark)
-		}
-	}
-
 	var closeClientCompletionHandler : (() -> Void)?
 
 	func closeClient(completion: (() -> Void)? = nil) {

ownCloud/Client/Viewer/Media/MediaDisplayViewController.swift

@@ -32,7 +32,10 @@ class MediaDisplayViewController : DisplayViewController {
 	deinit {
 		playerStatusObservation?.invalidate()
 		playerItemStatusObservation?.invalidate()
-		NotificationCenter.default.removeObserver(self)
+
+		NotificationCenter.default.removeObserver(self, name: UIApplication.didEnterBackgroundNotification, object: nil)
+		NotificationCenter.default.removeObserver(self, name: UIApplication.willEnterForegroundNotification, object: nil)
+		NotificationCenter.default.removeObserver(self, name: Notification.Name.AVPlayerItemDidPlayToEndTime, object: nil)
 	}
 
 	override func viewDidLoad() {

ownCloud/FileLists/FileListTableViewController.swift

@@ -226,7 +226,7 @@ class FileListTableViewController: UITableViewController, ClientItemCellDelegate
 		}
 	}
 
-	func open(item: OCItem, animated: Bool, pushViewController: Bool = true) -> ClientQueryViewController? {
+	@discardableResult func open(item: OCItem, animated: Bool, pushViewController: Bool = true) -> ClientQueryViewController? {
 		if let core = self.core {
 			if #available(iOS 13.0, *) {
 				if  let tabBarController = self.tabBarController as? ClientRootViewController {

ownCloud/PhotoKit Extensions/MediaUploadActivity.swift

@@ -0,0 +1,60 @@
+//
+//  MediaUploadActivity.swift
+//  ownCloud
+//
+//  Created by Michael Neuwert on 19.11.2019.
+//  Copyright © 2019 ownCloud GmbH. All rights reserved.
+//
+
+/*
+* Copyright (C) 2019, ownCloud GmbH.
+*
+* This code is covered by the GNU Public License Version 3.
+*
+* For distribution utilizing Apple mechanisms please see https://owncloud.org/contribute/iOS-license-exception/
+* You should have received a copy of this license along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.en.html>.
+*
+*/
+
+import ownCloudSDK
+
+class MediaUploadActivity : OCActivity {
+
+	var isCancelled: Bool {
+		if let progress = self.progress {
+			return progress.isCancelled
+		}
+		return false
+	}
+
+	init(identifier: String, assetCount:Int) {
+		super.init(identifier: identifier)
+		self.isCancellable = true
+		self.localizedDescription = "Media import".localized
+
+		if assetCount <= 0 {
+			self.progress = Progress.indeterminate()
+		} else {
+			self.progress = Progress(totalUnitCount: Int64(assetCount))
+			self.updateStatusMessage()
+		}
+	}
+
+	public func updateAfterSingleFinishedUpload() {
+		guard let progress = self.progress else { return }
+		guard progress.isIndeterminate == false else { return }
+
+		self.progress?.completedUnitCount += 1
+		self.updateStatusMessage()
+	}
+
+	// MARK: - Private helper methods
+
+	private func updateStatusMessage() {
+		if let progress = self.progress, progress.isIndeterminate == false {
+			let total = progress.totalUnitCount
+			let current = progress.completedUnitCount
+			self.localizedStatusMessage = String(format: "%@ of %@".localized, "\(current)", "\(total)")
+		}
+	}
+}