TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-03 18:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

When processing PreKeyBundle, archive current session if it exists.

Browse Source
This commit is contained in:
Moxie Marlinspike 2014-08-19 14:46:01 -07:00
parent 3e287f930d
commit 07c61394e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libaxolotl/src/main/java/org/whispersystems/libaxolotl/SessionBuilder.java
View File

@ -222,6 +222,7 @@ public class SessionBuilder {
throw new InvalidKeyException("Both signed and unsigned prekeys are absent!"); throw new InvalidKeyException("Both signed and unsigned prekeys are absent!");
} }
boolean isExistingSession = sessionStore.containsSession(recipientId, deviceId);
SessionRecord sessionRecord = sessionStore.loadSession(recipientId, deviceId); SessionRecord sessionRecord = sessionStore.loadSession(recipientId, deviceId);
ECKeyPair ourBaseKey = Curve.generateKeyPair(); ECKeyPair ourBaseKey = Curve.generateKeyPair();
ECPublicKey theirSignedPreKey = preKey.getSignedPreKey() != null ? preKey.getSignedPreKey() : ECPublicKey theirSignedPreKey = preKey.getSignedPreKey() != null ? preKey.getSignedPreKey() :
@ -238,7 +239,7 @@ public class SessionBuilder {
Optional.fromNullable(preKey.getPreKey()) : Optional.fromNullable(preKey.getPreKey()) :
Optional.<ECPublicKey>absent()); Optional.<ECPublicKey>absent());
if (sessionRecord.getSessionState().getNeedsRefresh()) sessionRecord.archiveCurrentState(); if (isExistingSession) sessionRecord.archiveCurrentState();
else sessionRecord.reset(); else sessionRecord.reset();
RatchetingSession.initializeSession(sessionRecord.getSessionState(), RatchetingSession.initializeSession(sessionRecord.getSessionState(),