Do not reset device keys if migrating to CryptoSDK

element-hq · Feb 13, 2023 · ef4044f · ef4044f
1 parent 062789d
commit ef4044f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Riot/Modules/MatrixKit/Models/Account/MXKAccount.m b/Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
@@ -947,9 +947,10 @@ - (void)closeSession:(BOOL)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.
-            if ([mxSession.crypto isKindOfClass:[MXLegacyCrypto class]])
+            if ([mxSession.crypto isKindOfClass:[MXLegacyCrypto class]] && !MXSDKOptions.sharedInstance.enableCryptoSDK)
             {
                 [(MXLegacyCrypto *)mxSession.crypto resetDeviceKeys];
             }

diff --git a/changelog.d/pr-7369.change b/changelog.d/pr-7369.change
@@ -0,0 +1 @@
+Do not reset device keys if migrating to CryptoSDK