mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-17 15:09:31 +02:00
Merge pull request #7369 from vector-im/andy/crypto_fixes
Do not reset device keys if migrating to CryptoSDK
This commit is contained in:
@@ -947,9 +947,10 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
|
||||
|
||||
if (clearStore)
|
||||
{
|
||||
// Force a reload of device keys at the next session start.
|
||||
// Force a reload of device keys at the next session start, unless we are just about to migrate
|
||||
// all data and device keys into CryptoSDK.
|
||||
// This will fix potential UISIs other peoples receive for our messages.
|
||||
if ([mxSession.crypto isKindOfClass:[MXLegacyCrypto class]])
|
||||
if ([mxSession.crypto isKindOfClass:[MXLegacyCrypto class]] && !MXSDKOptions.sharedInstance.enableCryptoSDK)
|
||||
{
|
||||
[(MXLegacyCrypto *)mxSession.crypto resetDeviceKeys];
|
||||
}
|
||||
|
||||
1
changelog.d/pr-7369.change
Normal file
1
changelog.d/pr-7369.change
Normal file
@@ -0,0 +1 @@
|
||||
Do not reset device keys if migrating to CryptoSDK
|
||||
Reference in New Issue
Block a user