|
|
@@ -863,7 +863,7 @@
|
|
|
|
|
|
[self encryptedE2EFile:fileName serverUrl:serverUrl directoryID:directoryID account:_activeAccount user:_activeUser userID:_activeUserID password:_activePassword url:_activeUrl errorMessage:&errorMessage fileNameIdentifier:&fileNameIdentifier e2eMetadata:&e2eMetadata];
|
|
|
|
|
|
- if (fileNameIdentifier == nil) {
|
|
|
+ if (errorMessage != nil || fileNameIdentifier == nil) {
|
|
|
[[self getDelegate:uploadID] uploadFileSuccessFailure:fileName fileID:uploadID assetLocalIdentifier:assetLocalIdentifier serverUrl:serverUrl selector:selector selectorPost:selectorPost errorMessage:errorMessage errorCode:k_CCErrorInternalError];
|
|
|
return;
|
|
|
}
|
|
|
@@ -1536,8 +1536,10 @@
|
|
|
|
|
|
error = [[NCNetworkingSync sharedManager] getEndToEndMetadata:user userID:userID password:password url:url fileID:directory.fileID metadata:&metadata];
|
|
|
if (error == nil) {
|
|
|
- if ([[NCEndToEndMetadata sharedInstance] decoderMetadata:metadata privateKey:[CCUtility getEndToEndPrivateKey:account] serverUrl:serverUrl account:account url:url] == false)
|
|
|
- error = [NSError errorWithDomain:@"com.nextcloud.nextcloud" code:k_CCErrorInternalError userInfo:[NSDictionary dictionaryWithObject:@"Serious internal error in decoding metadata" forKey:NSLocalizedDescriptionKey]];
|
|
|
+ if ([[NCEndToEndMetadata sharedInstance] decoderMetadata:metadata privateKey:[CCUtility getEndToEndPrivateKey:account] serverUrl:serverUrl account:account url:url] == false) {
|
|
|
+ *errorMessage = @"Serious internal error in decoding metadata";
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
*e2eMetadata = metadata;
|
|
|
|
Marino Faggiana