- SDK updated.

- Added code removed while rebasing against.
owncloud · Nov 30, 2018 · 7edde84 · 7edde84
1 parent af94881
commit 7edde84
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/ios-sdk b/ios-sdk
diff --git a/ownCloud/Client/Actions/MoreViewController.swift b/ownCloud/Client/Actions/MoreViewController.swift
@@ -21,6 +21,9 @@ import ownCloudSDK
 
 class MoreViewController: UIViewController {
 
+	private var item: OCItem
+	private var core: OCCore
+
 	private var headerView: UIView
 	private var viewController: UIViewController
 
@@ -32,7 +35,9 @@ class MoreViewController: UIViewController {
 		}
 	}
 
-	init(header: UIView, viewController: UIViewController) {
+	init(item: OCItem, core: OCCore, header: UIView, viewController: UIViewController) {
+		self.item = item
+		self.core = core
 		self.headerView = header
 		self.viewController = viewController
 

diff --git a/ownCloud/Client/ClientQueryViewController.swift b/ownCloud/Client/ClientQueryViewController.swift
@@ -486,6 +486,20 @@ class ClientQueryViewController: UITableViewController, Themeable {
 	// MARK: - Search
 	var searchController: UISearchController?
 
+	func upload(itemURL: URL, name: String, completionHandler: ClientActionCompletionHandler? = nil) {
+		if let progress = core.importFileNamed(name, at: query.rootItem, from: itemURL, isSecurityScoped: false, options: nil, placeholderCompletionHandler: nil, resultHandler: { [weak self](error, _ core, _ item, _) in
+			if error != nil {
+				Log.debug("Error uploading \(Log.mask(name)) file to \(Log.mask(self?.query.rootItem.path))")
+				completionHandler?(false)
+			} else {
+				Log.debug("Success uploading \(Log.mask(name)) file to \(Log.mask(self?.query.rootItem.path))")
+				completionHandler?(true)
+			}
+		}) {
+			self.progressSummarizer?.startTracking(progress: progress)
+		}
+	}
+
 	// MARK: - Navigation Bar Actions
 	@objc func uploadsBarButtonPressed(_ sender: UIBarButtonItem) {
 
@@ -717,11 +731,7 @@ extension ClientQueryViewController: UITableViewDropDelegate {
 
 			}
 
-<<<<<<< HEAD
-			if let progress = self.core.move(item, to: destinationItem, withName:  item.name, options: nil, resultHandler: { (error, _, _, _) in
-=======
-			if let progress = self.core.move(item, to: destinationItem!, withName: item.name, options: nil, resultHandler: { (error, _, _, _) in
->>>>>>> 3aded8b... - Made de Duplicate action.
+			if let progress = self.core.move(item, to: destinationItem, withName: item.name, options: nil, resultHandler: { (error, _, _, _) in
 				if error != nil {
 					Log.log("Error \(String(describing: error)) moving \(String(describing: item.path))")
 				}
+1 −1		Example/Ocean/ViewController.m
+1 −1		doc/RECIPES.md
+8 −0		ownCloudSDK.xcodeproj/project.pbxproj
+1 −1		ownCloudSDK/Authentication/OCAuthenticationMethod.h
+1 −1		ownCloudSDK/Authentication/OCAuthenticationMethodBasicAuth.h
+7 −7		ownCloudSDK/Authentication/OCAuthenticationMethodBasicAuth.m
+1 −1		ownCloudSDK/Authentication/OCAuthenticationMethodOAuth2.h
+6 −6		ownCloudSDK/Authentication/OCAuthenticationMethodOAuth2.m
+14 −8		ownCloudSDK/Bookmark/OCBookmark.h
+23 −0		ownCloudSDK/Bookmark/OCBookmark.m
+1 −3		ownCloudSDK/Connection/OCConnection+Tools.m
+2 −2		ownCloudSDK/Connection/OCConnection.h
+1 −1		ownCloudSDK/Connection/OCConnection.m
+30 −0		ownCloudSDK/Errors/NSError+OCHTTPStatus.h
+34 −0		ownCloudSDK/Errors/NSError+OCHTTPStatus.m
+1 −0		ownCloudSDK/Errors/OCHTTPStatus.h
+8 −2		ownCloudSDK/Resource Management/OCBookmarkManager.h
+20 −0		ownCloudSDK/Resource Management/OCBookmarkManager.m
+10 −0		ownCloudSDK/Resource Management/OCCoreManager.m
+4 −0		ownCloudSDK/Vaults/Database/SQLite/OCSQLiteDB.h
+37 −1		ownCloudSDK/Vaults/Database/SQLite/OCSQLiteDB.m
+9 −3		ownCloudSDK/XML/Parsing/OCXMLParserNode.m
+3 −0		ownCloudSDK/ownCloudSDK.h
+11 −11		ownCloudSDKTests/AuthenticationTests.m
+5 −5		ownCloudSDKTests/ConnectionTests.m
+9 −9		ownCloudSDKTests/CoreSyncTests.m
+6 −6		ownCloudSDKTests/CoreTests.m
+2 −2		ownCloudSDKTests/HostSimulatorTests.m