|
@@ -200,40 +200,42 @@ extension NCEndToEndMetadata {
|
|
|
// users
|
|
|
//
|
|
|
|
|
|
- for user in users {
|
|
|
-
|
|
|
- var decryptedMetadataKey: Data?
|
|
|
- var decryptedFiledropKey: Data?
|
|
|
- var metadataKey: String?
|
|
|
- var filedropKey: String?
|
|
|
-
|
|
|
- if let encryptedMetadataKey = user.encryptedMetadataKey {
|
|
|
- let data = Data(base64Encoded: encryptedMetadataKey)
|
|
|
- if let decrypted = NCEndToEndEncryption.sharedManager().decryptAsymmetricData(data, privateKey: CCUtility.getEndToEndPrivateKey(account)) {
|
|
|
- decryptedMetadataKey = decrypted
|
|
|
- metadataKey = decrypted.base64EncodedString()
|
|
|
+ if let users {
|
|
|
+ for user in users {
|
|
|
+
|
|
|
+ var decryptedMetadataKey: Data?
|
|
|
+ var decryptedFiledropKey: Data?
|
|
|
+ var metadataKey: String?
|
|
|
+ var filedropKey: String?
|
|
|
+
|
|
|
+ if let encryptedMetadataKey = user.encryptedMetadataKey {
|
|
|
+ let data = Data(base64Encoded: encryptedMetadataKey)
|
|
|
+ if let decrypted = NCEndToEndEncryption.sharedManager().decryptAsymmetricData(data, privateKey: CCUtility.getEndToEndPrivateKey(account)) {
|
|
|
+ decryptedMetadataKey = decrypted
|
|
|
+ metadataKey = decrypted.base64EncodedString()
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- if let encryptedFiledropKey = user.encryptedFiledropKey {
|
|
|
- let data = Data(base64Encoded: encryptedFiledropKey)
|
|
|
- if let decrypted = NCEndToEndEncryption.sharedManager().decryptAsymmetricData(data, privateKey: CCUtility.getEndToEndPrivateKey(account)) {
|
|
|
- decryptedFiledropKey = decrypted
|
|
|
- filedropKey = decrypted.base64EncodedString()
|
|
|
+
|
|
|
+ if let encryptedFiledropKey = user.encryptedFiledropKey {
|
|
|
+ let data = Data(base64Encoded: encryptedFiledropKey)
|
|
|
+ if let decrypted = NCEndToEndEncryption.sharedManager().decryptAsymmetricData(data, privateKey: CCUtility.getEndToEndPrivateKey(account)) {
|
|
|
+ decryptedFiledropKey = decrypted
|
|
|
+ filedropKey = decrypted.base64EncodedString()
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+ NCManageDatabase.shared.addE2EUsersV2(account: account,
|
|
|
+ serverUrl: serverUrl,
|
|
|
+ ocIdServerUrl: ocIdServerUrl,
|
|
|
+ userId: user.userId,
|
|
|
+ certificate: user.certificate,
|
|
|
+ encryptedFiledropKey: user.encryptedFiledropKey,
|
|
|
+ encryptedMetadataKey: user.encryptedMetadataKey,
|
|
|
+ decryptedFiledropKey: decryptedFiledropKey,
|
|
|
+ decryptedMetadataKey: decryptedMetadataKey,
|
|
|
+ filedropKey: filedropKey,
|
|
|
+ metadataKey: metadataKey)
|
|
|
}
|
|
|
-
|
|
|
- NCManageDatabase.shared.addE2EUsersV2(account: account,
|
|
|
- serverUrl: serverUrl,
|
|
|
- ocIdServerUrl: ocIdServerUrl,
|
|
|
- userId: user.userId,
|
|
|
- certificate: user.certificate,
|
|
|
- encryptedFiledropKey: user.encryptedFiledropKey,
|
|
|
- encryptedMetadataKey: user.encryptedMetadataKey,
|
|
|
- decryptedFiledropKey: decryptedFiledropKey,
|
|
|
- decryptedMetadataKey: decryptedMetadataKey,
|
|
|
- filedropKey: filedropKey,
|
|
|
- metadataKey: metadataKey)
|
|
|
}
|
|
|
|
|
|
//
|