Merge pull request #7369 from vector-im/andy/crypto_fixes

Do not reset device keys if migrating to CryptoSDK
This commit is contained in:
Anderas
2023-02-13 13:01:39 +00:00
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

@@ -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];
}

View File

@@ -0,0 +1 @@
Do not reset device keys if migrating to CryptoSDK