felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-19 16:13:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into element_3867

Browse Source 
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
This commit is contained in:
Gil Eluard
2021-01-11 11:58:53 +01:00
parent e7aa36a6ac 94c528dd58
commit 81c8828a98
76 changed files with 2379 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
+7 -7
View File
@@ -56,7 +56,7 @@ class EncryptionKeyManager: NSObject, MXKeyProviderDelegate {
func isEncryptionAvailableForData(ofType dataType: String) -> Bool {
return dataType == MXKContactManagerDataType
|| dataType == MXKAccountManagerDataType
|| dataType == MXRealmCryptoStoreDataType
// || dataType == MXRealmCryptoStoreDataType
}
func hasKeyForData(ofType dataType: String) -> Bool {
@@ -65,8 +65,8 @@ class EncryptionKeyManager: NSObject, MXKeyProviderDelegate {
return keychainStore.containsObject(forKey: EncryptionKeyManager.contactsIv) && keychainStore.containsObject(forKey: EncryptionKeyManager.contactsAesKey)
case MXKAccountManagerDataType:
return keychainStore.containsObject(forKey: EncryptionKeyManager.accountIv) && keychainStore.containsObject(forKey: EncryptionKeyManager.accountAesKey)
case MXRealmCryptoStoreDataType:
return keychainStore.containsObject(forKey: EncryptionKeyManager.realmCryptoKey)
// case MXRealmCryptoStoreDataType:
// return keychainStore.containsObject(forKey: EncryptionKeyManager.realmCryptoKey)
default:
return false
}
@@ -84,10 +84,10 @@ class EncryptionKeyManager: NSObject, MXKeyProviderDelegate {
let aesKey = try? keychainStore.data(forKey: EncryptionKeyManager.accountAesKey) {
return MXAesKeyData(iv: ivKey, key: aesKey)
}
case MXRealmCryptoStoreDataType:
if let key = try? keychainStore.data(forKey: EncryptionKeyManager.realmCryptoKey) {
return MXRawDataKey(key: key)
}
// case MXRealmCryptoStoreDataType:
// if let key = try? keychainStore.data(forKey: EncryptionKeyManager.realmCryptoKey) {
// return MXRawDataKey(key: key)
// }
default:
return nil
}