|
@@ -28,12 +28,6 @@ class NCNetworkingE2EE: NSObject {
|
|
|
return instance
|
|
|
}()
|
|
|
|
|
|
- func getRoute() -> String {
|
|
|
- let e2eeRouteV1 = "v1"
|
|
|
- let e2eeRouteV2 = "v2"
|
|
|
- return (NCGlobal.shared.capabilityE2EEApiVersion == NCGlobal.shared.e2eeVersionV20) ? e2eeRouteV1 : e2eeRouteV1
|
|
|
- }
|
|
|
-
|
|
|
func isInUpload(account: String, serverUrl: String) -> Bool {
|
|
|
|
|
|
let counter = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND (status == %d OR status == %d OR status == %d)", account, serverUrl, NCGlobal.shared.metadataStatusWaitUpload, NCGlobal.shared.metadataStatusInUpload, NCGlobal.shared.metadataStatusUploading)).count
|
|
@@ -74,7 +68,7 @@ class NCNetworkingE2EE: NSObject {
|
|
|
|
|
|
// METHOD
|
|
|
//
|
|
|
- let resultsGetE2EEMetadata = await NextcloudKit.shared.getE2EEMetadata(fileId: fileId, e2eToken: e2eToken, route: getRoute())
|
|
|
+ let resultsGetE2EEMetadata = await NextcloudKit.shared.getE2EEMetadata(fileId: fileId, e2eToken: e2eToken)
|
|
|
if resultsGetE2EEMetadata.error == .success {
|
|
|
method = "PUT"
|
|
|
} else if resultsGetE2EEMetadata.error.errorCode != NCGlobal.shared.errorResourceNotFound {
|
|
@@ -112,7 +106,7 @@ class NCNetworkingE2EE: NSObject {
|
|
|
fileId: String,
|
|
|
e2eToken: String) async -> NKError {
|
|
|
|
|
|
- let resultsGetE2EEMetadata = await NextcloudKit.shared.getE2EEMetadata(fileId: fileId, e2eToken: e2eToken, route: getRoute())
|
|
|
+ let resultsGetE2EEMetadata = await NextcloudKit.shared.getE2EEMetadata(fileId: fileId, e2eToken: e2eToken)
|
|
|
guard resultsGetE2EEMetadata.error == .success, let e2eMetadata = resultsGetE2EEMetadata.e2eMetadata else {
|
|
|
return resultsGetE2EEMetadata.error
|
|
|
}
|
|
@@ -141,7 +135,7 @@ class NCNetworkingE2EE: NSObject {
|
|
|
return resultsEncodeMetadata.error
|
|
|
}
|
|
|
|
|
|
- let putE2EEMetadataResults = await NextcloudKit.shared.putE2EEMetadata(fileId: fileId, e2eToken: e2eToken, e2eMetadata: e2eMetadata, signature: resultsEncodeMetadata.signature, method: method, route: getRoute())
|
|
|
+ let putE2EEMetadataResults = await NextcloudKit.shared.putE2EEMetadata(fileId: fileId, e2eToken: e2eToken, e2eMetadata: e2eMetadata, signature: resultsEncodeMetadata.signature, method: method)
|
|
|
guard putE2EEMetadataResults.error == .success else {
|
|
|
return putE2EEMetadataResults.error
|
|
|
}
|
|
@@ -173,7 +167,7 @@ class NCNetworkingE2EE: NSObject {
|
|
|
e2eCounter = "\(counter)"
|
|
|
}
|
|
|
|
|
|
- let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: directory.fileId, e2eToken: e2eToken, e2eCounter: e2eCounter, method: "POST", route: getRoute())
|
|
|
+ let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: directory.fileId, e2eToken: e2eToken, e2eCounter: e2eCounter, method: "POST")
|
|
|
if resultsLockE2EEFolder.error == .success, let e2eToken = resultsLockE2EEFolder.e2eToken {
|
|
|
NCManageDatabase.shared.setE2ETokenLock(account: account, serverUrl: serverUrl, fileId: directory.fileId, e2eToken: e2eToken)
|
|
|
}
|
|
@@ -187,7 +181,7 @@ class NCNetworkingE2EE: NSObject {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: tableLock.fileId, e2eToken: tableLock.e2eToken, e2eCounter: nil, method: "DELETE", route: getRoute())
|
|
|
+ let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: tableLock.fileId, e2eToken: tableLock.e2eToken, e2eCounter: nil, method: "DELETE")
|
|
|
if resultsLockE2EEFolder.error == .success {
|
|
|
NCManageDatabase.shared.deleteE2ETokenLock(account: account, serverUrl: serverUrl)
|
|
|
}
|
|
@@ -201,7 +195,7 @@ class NCNetworkingE2EE: NSObject {
|
|
|
|
|
|
Task {
|
|
|
for result in NCManageDatabase.shared.getE2EAllTokenLock(account: account) {
|
|
|
- let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: result.fileId, e2eToken: result.e2eToken, e2eCounter: nil, method: "DELETE", route: getRoute())
|
|
|
+ let resultsLockE2EEFolder = await NextcloudKit.shared.lockE2EEFolder(fileId: result.fileId, e2eToken: result.e2eToken, e2eCounter: nil, method: "DELETE")
|
|
|
if resultsLockE2EEFolder.error == .success {
|
|
|
NCManageDatabase.shared.deleteE2ETokenLock(account: account, serverUrl: result.serverUrl)
|
|
|
}
|