Marino Faggiana 7 سال پیش
والد
کامیت
6570c2e581
2فایلهای تغییر یافته به همراه9 افزوده شده و 6 حذف شده
  1. 3 5
      iOSClient/Main/CCMain.m
  2. 6 1
      iOSClient/Security/NCEntoToEndInterface.swift

+ 3 - 5
iOSClient/Main/CCMain.m

@@ -4000,11 +4000,9 @@
                                        type:AHKActionSheetButtonTypeEncrypted
                                     handler:^(AHKActionSheet *as) {
                                         
-                                        NSString *token = [[NCNetworkingSync sharedManager] lockEndToEndFolderEncrypted:app.activeUser userID:app.activeUserID password:app.activePassword url:self.serverUrl fileID:_metadata.fileID token:nil];
-                                        
-                                        [[NCNetworkingSync sharedManager] markEndToEndFolderEncrypted:app.activeUser userID:app.activeUserID password:app.activePassword url:self.serverUrl fileID:_metadata.fileID];
-                                        
-                                        [[NCNetworkingSync sharedManager] unlockEndToEndFolderEncrypted:app.activeUser userID:app.activeUserID password:app.activePassword url:self.serverUrl fileID:_metadata.fileID token:token];
+                                        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+                                            [app.endToEndInterface markEndToEndFolderEncrypted:self.serverUrl fileID:_metadata.fileID token:@""];
+                                        });
                                     }];
         }
         

+ 6 - 1
iOSClient/Security/NCEntoToEndInterface.swift

@@ -342,7 +342,12 @@ class NCEntoToEndInterface : NSObject, OCNetworkingDelegate  {
     
     @objc func markEndToEndFolderEncrypted(_ serverUrl: String, fileID: String, token: String) {
         
-        NCNetworkingSync.sharedManager().lockEnd(toEndFolderEncrypted: appDelegate.activeUser, userID: appDelegate.activeUserID, password: appDelegate.activePassword, serverUrl: serverUrl , fileID: fileID, token: token)
+        let token = NCNetworkingSync.sharedManager().lockEnd(toEndFolderEncrypted: appDelegate.activeUser, userID: appDelegate.activeUserID, password: appDelegate.activePassword, serverUrl: serverUrl , fileID: fileID, token: token)
+        
+        NCNetworkingSync.sharedManager().markEnd(toEndFolderEncrypted: appDelegate.activeUser, userID: appDelegate.activeUserID, password: appDelegate.activePassword, serverUrl: serverUrl, fileID: fileID)
+        
+        NCNetworkingSync.sharedManager().unlockEnd(toEndFolderEncrypted: appDelegate.activeUser, userID: appDelegate.activeUserID, password: appDelegate.activePassword, serverUrl: serverUrl, fileID: fileID, token: token)
+        
     }
     
     func deletemarkEnd(toEndFolderEncryptedSuccess metadataNet: CCMetadataNet!) {