|
@@ -824,7 +824,7 @@
|
|
|
NSString *fileNameIdentifier;
|
|
|
NSString *e2eMetadata;
|
|
|
|
|
|
- [self encryptedE2EFile:metadata.fileName serverUrl:serverUrl directoryID:metadata.directoryID account:_activeAccount user:_activeUser userID:_activeUserID password:_activePassword url:_activeUrl errorMessage:&errorMessage fileNameIdentifier:&fileNameIdentifier e2eMetadata:&e2eMetadata];
|
|
|
+ [self encryptedE2EFile:metadata.fileName fileID:metadata.fileID serverUrl:serverUrl directoryID:metadata.directoryID account:_activeAccount user:_activeUser userID:_activeUserID password:_activePassword url:_activeUrl errorMessage:&errorMessage fileNameIdentifier:&fileNameIdentifier e2eMetadata:&e2eMetadata];
|
|
|
|
|
|
if (errorMessage != nil || fileNameIdentifier == nil) {
|
|
|
|
|
@@ -1153,7 +1153,7 @@
|
|
|
#pragma --------------------------------------------------------------------------------------------
|
|
|
// E2EE
|
|
|
|
|
|
-- (void)encryptedE2EFile:(NSString *)fileName serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID account:(NSString *)account user:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url errorMessage:(NSString * __autoreleasing *)errorMessage fileNameIdentifier:(NSString **)fileNameIdentifier e2eMetadata:(NSString * __autoreleasing *)e2eMetadata
|
|
|
+- (void)encryptedE2EFile:(NSString *)fileName fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID account:(NSString *)account user:(NSString *)user userID:(NSString *)userID password:(NSString *)password url:(NSString *)url errorMessage:(NSString * __autoreleasing *)errorMessage fileNameIdentifier:(NSString **)fileNameIdentifier e2eMetadata:(NSString * __autoreleasing *)e2eMetadata
|
|
|
{
|
|
|
__block NSError *error;
|
|
|
NSString *key;
|
|
@@ -1163,7 +1163,7 @@
|
|
|
NSInteger metadataKeyIndex;
|
|
|
|
|
|
// Verify File Size
|
|
|
- NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryUserData], fileName] error:&error];
|
|
|
+ NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:[CCUtility getDirectoryProviderStorageFileID:fileID fileNameView:fileName] error:&error];
|
|
|
NSNumber *fileSizeNumber = [fileAttributes objectForKey:NSFileSize];
|
|
|
long long fileSize = [fileSizeNumber longLongValue];
|
|
|
|