Enable database encryption for new logins on Nightly/PR builds. (#2328)

- Slightly reworks where the pusher client ID is generated.
2026-11-03 06:55:59 +00:00 · 2024-01-12 16:45:59 +00:00
parent d475c9c63b
commit 01f42546e1
20 changed files with 147 additions and 60 deletions
@@ -113,7 +113,14 @@ class KeychainController: KeychainControllerProtocol {
    
    func saveSessionInKeychain(session: Session) {
        MXLog.info("Saving session changes in the keychain.")
-        let restorationToken = RestorationToken(session: session)
+        
+        guard let oldToken = restorationTokenForUsername(session.userId) else {
+            MXLog.error("Failed retrieving the restoration token for \(session.userId)")
+            fatalError("Something has gone mega wrong, all bets are off.")
+        }
+        let restorationToken = RestorationToken(session: session,
+                                                passphrase: oldToken.passphrase,
+                                                pusherNotificationClientIdentifier: oldToken.pusherNotificationClientIdentifier)
        setRestorationToken(restorationToken, forUsername: session.userId)
    }