setDirectoryE2ETokenLock

iOSClient/AppDelegate.m

@@ -1601,13 +1601,13 @@
 
 - (void)unlockEndToEndFolderEncryptedSuccess:(CCMetadataNet *)metadataNet
 {
-    [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithServerUrl:metadataNet.serverUrl token:@""];
+    [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithFileID:metadataNet.fileID token:@""];
 }
 
 - (void)unlockEndToEndFolderEncryptedFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     if (errorCode == 404)
-         [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithServerUrl:metadataNet.serverUrl token:@""];
+         [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithFileID:metadataNet.fileID token:@""];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Database/NCManageDatabase.swift

@@ -1012,7 +1012,7 @@ class NCManageDatabase: NSObject {
         }
     }
 
-    @objc func setDirectoryE2ETokenLock(serverUrl: String, token: String?) {
+    @objc func setDirectoryE2ETokenLock(fileID: String, token: String?) {
         
         guard let tableAccount = self.getAccountActive() else {
             return
@@ -1022,7 +1022,7 @@ class NCManageDatabase: NSObject {
         
         realm.beginWrite()
         
-        guard let result = realm.objects(tableDirectory.self).filter("account = %@ AND serverUrl = %@", tableAccount.account, serverUrl).first else {
+        guard let result = realm.objects(tableDirectory.self).filter("account = %@ AND fileID = %@", tableAccount.account, fileID).first else {
             realm.cancelWrite()
             return
         }

iOSClient/Networking/CCNetworking.m

@@ -1665,7 +1665,7 @@
         error = [[NCNetworkingSync sharedManager] storeEndToEndMetadata:_activeUser userID:_activeUserID password:_activePassword url:_activeUrl fileID:directory.fileID metadata:metadata token:&e2eTokenLock];
     }
     if (error) {
-        [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithServerUrl:serverUrl token:e2eTokenLock];
+        [[NCManageDatabase sharedInstance] setDirectoryE2ETokenLockWithFileID:directory.fileID token:e2eTokenLock];
         return false;
     }
     

iOSClient/Security/NCEntoToEndInterface.swift

@@ -325,7 +325,7 @@ class NCEntoToEndInterface : NSObject, OCNetworkingDelegate  {
             
             appDelegate.messageNotification("E2E Mark folder as encrypted", description: error.localizedDescription+" code \(error.code)", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: error.code)
 
-            NCManageDatabase.sharedInstance.setDirectoryE2ETokenLock(serverUrl: serverUrl, token: token as String?)
+            NCManageDatabase.sharedInstance.setDirectoryE2ETokenLock(fileID: fileID, token: token as String?)
 
             return false
         }
@@ -341,7 +341,7 @@ class NCEntoToEndInterface : NSObject, OCNetworkingDelegate  {
             
             appDelegate.messageNotification("E2E Remove mark folder as encrypted", description: error.localizedDescription+" code \(error.code)", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: error.code)
             
-            NCManageDatabase.sharedInstance.setDirectoryE2ETokenLock(serverUrl: serverUrl, token: token as String?)
+            NCManageDatabase.sharedInstance.setDirectoryE2ETokenLock(fileID: fileID, token: token as String?)
 
             return false
         }