unlockEncryptedFolder

iOSClient/AppDelegate.m

@@ -1576,7 +1576,7 @@
             
             // Is locked ?
             tableDirectory *directoryLock= [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND e2eTokenLock = %@", self.activeAccount, directory.e2eTokenLock]];
-            if (directoryLock.e2eTokenLock == directory.e2eTokenLock) {
+            if ([directoryLock.e2eTokenLock  isEqualToString:directory.e2eTokenLock]) {
                 
                 CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
                 

iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -2526,9 +2526,9 @@
     
     serverPath = [serverPath stringByAppendingString:k_url_client_side_encryption];
     serverPath = [NSString stringWithFormat:@"%@/meta-data/%@", serverPath, fileID];
-    serverPath = [NSString stringWithFormat:@"%@&token=%@", serverPath, token];
-    serverPath = [NSString stringWithFormat:@"%@?metaData=%@", serverPath, encryptedMetadata];
-    serverPath = [serverPath stringByAppendingString:@"?format=json"];
+    serverPath = [NSString stringWithFormat:@"%@?token=%@", serverPath, token];
+    serverPath = [NSString stringWithFormat:@"%@&metaData=%@", serverPath, encryptedMetadata];
+    serverPath = [serverPath stringByAppendingString:@"&format=json"];
     serverPath = [serverPath encodeString:NSUTF8StringEncoding];
     
     OCWebDAVClient *request = [[OCWebDAVClient alloc] init];