mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Do not reset device keys if migrating to CryptoSDK
This commit is contained in:
parent
062789d331
commit
ef4044f0cb
2 changed files with 4 additions and 2 deletions
|
@ -947,9 +947,10 @@ static NSArray<NSNumber*> *initialSyncSilentErrorsHTTPStatusCodes;
|
||||||
|
|
||||||
if (clearStore)
|
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.
|
// 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];
|
[(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
|
Loading…
Reference in a new issue