瀏覽代碼

add encryptedMetadata on metadataNet

Marino Faggiana 7 年之前
父節點
當前提交
f8c6d678cc
共有 3 個文件被更改,包括 7 次插入5 次删除
  1. 1 0
      iOSClient/Networking/CCNetworking.h
  2. 1 0
      iOSClient/Networking/CCNetworking.m
  3. 5 5
      iOSClient/Networking/OCNetworking.m

+ 1 - 0
iOSClient/Networking/CCNetworking.h

@@ -100,6 +100,7 @@
 @property BOOL directory;
 @property BOOL directory;
 @property (nonatomic, strong) NSString *directoryID;
 @property (nonatomic, strong) NSString *directoryID;
 @property (nonatomic, strong) NSString *directoryIDTo;
 @property (nonatomic, strong) NSString *directoryIDTo;
+@property (nonatomic, strong) NSString *encryptedMetadata;
 @property NSInteger errorCode;
 @property NSInteger errorCode;
 @property NSInteger errorRetry;
 @property NSInteger errorRetry;
 @property (nonatomic, strong) NSString *etag;
 @property (nonatomic, strong) NSString *etag;

+ 1 - 0
iOSClient/Networking/CCNetworking.m

@@ -1541,6 +1541,7 @@
     [metadataNet setDirectory: self.directory];
     [metadataNet setDirectory: self.directory];
     [metadataNet setDirectoryID: self.directoryID];
     [metadataNet setDirectoryID: self.directoryID];
     [metadataNet setDirectoryIDTo: self.directoryIDTo];
     [metadataNet setDirectoryIDTo: self.directoryIDTo];
+    [metadataNet setEncryptedMetadata: self.encryptedMetadata];
     [metadataNet setErrorCode: self.errorCode];
     [metadataNet setErrorCode: self.errorCode];
     [metadataNet setErrorRetry: self.errorRetry];
     [metadataNet setErrorRetry: self.errorRetry];
     [metadataNet setEtag:self.etag];
     [metadataNet setEtag:self.etag];

+ 5 - 5
iOSClient/Networking/OCNetworking.m

@@ -2047,9 +2047,9 @@
     [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
     [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
     [communication setUserAgent:[CCUtility getUserAgent]];
     [communication setUserAgent:[CCUtility getUserAgent]];
     
     
-    [communication storeEndToEndMetadata:[_activeUrl stringByAppendingString:@"/"] fileID:_metadataNet.fileID encryptedMetadata:_metadataNet.options onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *encryptedMetadata, NSString *redirectedServer) {
+    [communication storeEndToEndMetadata:[_activeUrl stringByAppendingString:@"/"] fileID:_metadataNet.fileID encryptedMetadata:_metadataNet.encryptedMetadata onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *encryptedMetadata, NSString *redirectedServer) {
         
         
-        _metadataNet.options = encryptedMetadata;
+        _metadataNet.encryptedMetadata = encryptedMetadata;
         
         
         if ([self.delegate respondsToSelector:@selector(storeEndToEndMetadataSuccess:)])
         if ([self.delegate respondsToSelector:@selector(storeEndToEndMetadataSuccess:)])
         [self.delegate storeEndToEndMetadataSuccess:_metadataNet];
         [self.delegate storeEndToEndMetadataSuccess:_metadataNet];
@@ -2083,7 +2083,7 @@
     
     
     [communication getEndToEndMetadata:[_activeUrl stringByAppendingString:@"/"] fileID:_metadataNet.fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *encryptedMetadata, NSString *redirectedServer) {
     [communication getEndToEndMetadata:[_activeUrl stringByAppendingString:@"/"] fileID:_metadataNet.fileID onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *encryptedMetadata, NSString *redirectedServer) {
         
         
-        _metadataNet.options = encryptedMetadata;
+        _metadataNet.encryptedMetadata = encryptedMetadata;
         
         
         if ([self.delegate respondsToSelector:@selector(getEndToEndMetadataSuccess:)])
         if ([self.delegate respondsToSelector:@selector(getEndToEndMetadataSuccess:)])
         [self.delegate getEndToEndMetadataSuccess:_metadataNet];
         [self.delegate getEndToEndMetadataSuccess:_metadataNet];
@@ -2115,9 +2115,9 @@
     [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
     [communication setCredentialsWithUser:_activeUser andUserID:_activeUserID andPassword:_activePassword];
     [communication setUserAgent:[CCUtility getUserAgent]];
     [communication setUserAgent:[CCUtility getUserAgent]];
     
     
-    [communication updateEndToEndMetadata:[_activeUrl stringByAppendingString:@"/"] fileID:_metadataNet.fileID encryptedMetadata:_metadataNet.options onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *encryptedMetadata, NSString *redirectedServer) {
+    [communication updateEndToEndMetadata:[_activeUrl stringByAppendingString:@"/"] fileID:_metadataNet.fileID encryptedMetadata:_metadataNet.encryptedMetadata onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *encryptedMetadata, NSString *redirectedServer) {
         
         
-        _metadataNet.options = encryptedMetadata;
+        _metadataNet.encryptedMetadata = encryptedMetadata;
         
         
         if ([self.delegate respondsToSelector:@selector(updateEndToEndMetadataSuccess:)])
         if ([self.delegate respondsToSelector:@selector(updateEndToEndMetadataSuccess:)])
         [self.delegate updateEndToEndMetadataSuccess:_metadataNet];
         [self.delegate updateEndToEndMetadataSuccess:_metadataNet];