فهرست منبع

fix encryptedMetadata

Marino Faggiana 7 سال پیش
والد
کامیت
70f6db988d
2فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 4 0
      iOSClient/Library/OCCommunicationLib/OCCommunication.m
  2. 1 3
      iOSClient/Networking/CCNetworking.m

+ 4 - 0
iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -2412,6 +2412,8 @@
     serverPath = [NSString stringWithFormat:@"%@/meta-data/%@", serverPath, fileID];
     serverPath = [serverPath encodeString:NSUTF8StringEncoding];
     
+    encryptedMetadata = [encryptedMetadata encodeString:NSUTF8StringEncoding];
+
     OCWebDAVClient *request = [[OCWebDAVClient alloc] init];
     request = [self getRequestWithCredentials:request];
     
@@ -2526,6 +2528,8 @@
     serverPath = [NSString stringWithFormat:@"%@/meta-data/%@", serverPath, fileID];
     serverPath = [serverPath encodeString:NSUTF8StringEncoding];
     
+    encryptedMetadata = [encryptedMetadata encodeString:NSUTF8StringEncoding];
+
     OCWebDAVClient *request = [[OCWebDAVClient alloc] init];
     request = [self getRequestWithCredentials:request];
     

+ 1 - 3
iOSClient/Networking/CCNetworking.m

@@ -1633,11 +1633,9 @@
 {
     tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", _activeAccount, serverUrl]];
     
-    NSString *e2eTokenLock;
+    NSString *e2eTokenLock = @"";
     NSError *error;
     
-    [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithServerUrl:serverUrl token:e2eTokenLock];
-    
     if (directory.e2eMetadataJSON.length > 0) {
         error = [[NCNetworkingSync sharedManager] updateEndToEndMetadata:_activeUser userID:_activeUserID password:_activePassword url:_activeUrl fileID:directory.fileID metadata:metadata token:&e2eTokenLock];
     } else {