|
@@ -500,7 +500,7 @@ class NCMainCommon: NSObject {
|
|
|
let error = NCNetworkingEndToEnd.sharedManager().lockFolderEncrypted(onServerUrl: serverUrl, fileID: folderFileID, user: self.appDelegate.activeUser, userID: self.appDelegate.activeUserID, password: self.appDelegate.activePassword, url: self.appDelegate.activeUrl)
|
|
|
DispatchQueue.main.async {
|
|
|
if error == nil {
|
|
|
- self.delete(metadatas: metadatas, e2ee: e2ee, completion: completion)
|
|
|
+ self.delete(metadatas: metadatas, serverUrl:serverUrl, e2ee: e2ee, completion: completion)
|
|
|
} else {
|
|
|
self.appDelegate.messageNotification("_delete_", description: error?.localizedDescription, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: Int(k_CCErrorInternalError))
|
|
|
return
|
|
@@ -508,11 +508,11 @@ class NCMainCommon: NSObject {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- delete(metadatas: metadatas, e2ee: e2ee, completion: completion)
|
|
|
+ delete(metadatas: metadatas, serverUrl:serverUrl, e2ee: e2ee, completion: completion)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private func delete(metadatas: NSArray, e2ee: Bool, completion: @escaping (_ errorCode: Int, _ message: String)->()) {
|
|
|
+ private func delete(metadatas: NSArray, serverUrl: String,e2ee: Bool, completion: @escaping (_ errorCode: Int, _ message: String)->()) {
|
|
|
|
|
|
var count: Int = 0
|
|
|
var completionErrorCode: Int = 0
|
|
@@ -526,6 +526,9 @@ class NCMainCommon: NSObject {
|
|
|
continue
|
|
|
}
|
|
|
|
|
|
+ self.appDelegate.activePhotos.fileIDHide.add(metadata.fileID)
|
|
|
+ self.appDelegate.activeMain.fileIDHide.add(metadata.fileID)
|
|
|
+
|
|
|
ocNetworking?.deleteFileOrFolder(metadata.fileName, serverUrl: serverUrl, completion: { (message, errorCode) in
|
|
|
|
|
|
count += 1
|
|
@@ -549,6 +552,10 @@ class NCMainCommon: NSObject {
|
|
|
NCManageDatabase.sharedInstance.deleteE2eEncryption(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameIdentifier == %@", metadata.account, serverUrl, metadata.fileName))
|
|
|
}
|
|
|
} else {
|
|
|
+
|
|
|
+ self.appDelegate.activePhotos.fileIDHide.remove(metadata.fileID)
|
|
|
+ self.appDelegate.activeMain.fileIDHide.remove(metadata.fileID)
|
|
|
+
|
|
|
completionErrorCode = errorCode
|
|
|
completionMessage = message!
|
|
|
}
|
|
@@ -567,11 +574,13 @@ class NCMainCommon: NSObject {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
+ self.reloadDatasource(ServerUrl: serverUrl)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//MARK: -
|
|
|
-
|
|
|
+
|
|
|
class CCMainTabBarController : UITabBarController, UITabBarControllerDelegate {
|
|
|
|
|
|
override func viewDidLoad() {
|