1 files changed, 501 insertions, 0 deletions
diff --git a/src/androidTest/java/org/whispersystems/test/SimultaneousInitiateTests.java b/src/androidTest/java/org/whispersystems/test/SimultaneousInitiateTests.java
new file mode 100644
index 00000000..dffde57c
--- /dev/null
+++ b/src/androidTest/java/org/whispersystems/test/SimultaneousInitiateTests.java
@@ -0,0 +1,501 @@
+package org.whispersystems.test;
+
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import org.whispersystems.libaxolotl.DuplicateMessageException;
+import org.whispersystems.libaxolotl.InvalidKeyException;
+import org.whispersystems.libaxolotl.InvalidKeyIdException;
+import org.whispersystems.libaxolotl.InvalidMessageException;
+import org.whispersystems.libaxolotl.InvalidVersionException;
+import org.whispersystems.libaxolotl.LegacyMessageException;
+import org.whispersystems.libaxolotl.NoSessionException;
+import org.whispersystems.libaxolotl.SessionBuilder;
+import org.whispersystems.libaxolotl.SessionCipher;
+import org.whispersystems.libaxolotl.UntrustedIdentityException;
+import org.whispersystems.libaxolotl.ecc.Curve;
+import org.whispersystems.libaxolotl.ecc.ECKeyPair;
+import org.whispersystems.libaxolotl.protocol.CiphertextMessage;
+import org.whispersystems.libaxolotl.protocol.PreKeyWhisperMessage;
+import org.whispersystems.libaxolotl.protocol.WhisperMessage;
+import org.whispersystems.libaxolotl.state.AxolotlStore;
+import org.whispersystems.libaxolotl.state.PreKeyBundle;
+import org.whispersystems.libaxolotl.state.PreKeyRecord;
+import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
+import org.whispersystems.libaxolotl.util.Medium;
+
+import java.util.Arrays;
+import java.util.Random;
+
+public class SimultaneousInitiateTests extends AndroidTestCase {
+
+  private static final long BOB_RECIPENT_ID    = 12345;
+  private static final long ALICE_RECIPIENT_ID = 6789;
+
+  private static final ECKeyPair aliceSignedPreKey = Curve.generateKeyPair();
+  private static final ECKeyPair bobSignedPreKey   = Curve.generateKeyPair();
+
+  private static final int aliceSignedPreKeyId = new Random().nextInt(Medium.MAX_VALUE);
+  private static final int bobSignedPreKeyId   = new Random().nextInt(Medium.MAX_VALUE);
+
+  public void testBasicSimultaneousInitiate()
+      throws InvalidKeyException, UntrustedIdentityException, InvalidVersionException,
+      InvalidMessageException, DuplicateMessageException, LegacyMessageException,
+      InvalidKeyIdException, NoSessionException
+  {
+    AxolotlStore aliceStore = new InMemoryAxolotlStore();
+    AxolotlStore bobStore   = new InMemoryAxolotlStore();
+
+    PreKeyBundle alicePreKeyBundle = createAlicePreKeyBundle(aliceStore);
+    PreKeyBundle bobPreKeyBundle = createBobPreKeyBundle(bobStore);
+
+    SessionBuilder aliceSessionBuilder = new SessionBuilder(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionBuilder bobSessionBuilder   = new SessionBuilder(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    SessionCipher aliceSessionCipher = new SessionCipher(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionCipher bobSessionCipher = new SessionCipher(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    aliceSessionBuilder.process(bobPreKeyBundle);
+    bobSessionBuilder.process(alicePreKeyBundle);
+
+    CiphertextMessage messageForBob   = aliceSessionCipher.encrypt("hey there".getBytes());
+    CiphertextMessage messageForAlice = bobSessionCipher.encrypt("sample message".getBytes());
+
+    assertTrue(messageForBob.getType() == CiphertextMessage.PREKEY_TYPE);
+    assertTrue(messageForAlice.getType() == CiphertextMessage.PREKEY_TYPE);
+
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    byte[] alicePlaintext = aliceSessionCipher.decrypt(new PreKeyWhisperMessage(messageForAlice.serialize()));
+    byte[] bobPlaintext   = bobSessionCipher.decrypt(new PreKeyWhisperMessage(messageForBob.serialize()));
+
+    assertTrue(new String(alicePlaintext).equals("sample message"));
+    assertTrue(new String(bobPlaintext).equals("hey there"));
+
+    assertTrue(aliceStore.loadSession(BOB_RECIPENT_ID, 1).getSessionState().getSessionVersion() == 3);
+    assertTrue(bobStore.loadSession(ALICE_RECIPIENT_ID, 1).getSessionState().getSessionVersion() == 3);
+
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage aliceResponse = aliceSessionCipher.encrypt("second message".getBytes());
+
+    assertTrue(aliceResponse.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] responsePlaintext = bobSessionCipher.decrypt(new WhisperMessage(aliceResponse.serialize()));
+
+    assertTrue(new String(responsePlaintext).equals("second message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage finalMessage = bobSessionCipher.encrypt("third message".getBytes());
+
+    assertTrue(finalMessage.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] finalPlaintext = aliceSessionCipher.decrypt(new WhisperMessage(finalMessage.serialize()));
+
+    assertTrue(new String(finalPlaintext).equals("third message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+  }
+
+  public void testLostSimultaneousInitiate() throws InvalidKeyException, UntrustedIdentityException, InvalidVersionException, InvalidMessageException, DuplicateMessageException, LegacyMessageException, InvalidKeyIdException, NoSessionException {
+    AxolotlStore aliceStore = new InMemoryAxolotlStore();
+    AxolotlStore bobStore   = new InMemoryAxolotlStore();
+
+    PreKeyBundle alicePreKeyBundle = createAlicePreKeyBundle(aliceStore);
+    PreKeyBundle bobPreKeyBundle = createBobPreKeyBundle(bobStore);
+
+    SessionBuilder aliceSessionBuilder = new SessionBuilder(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionBuilder bobSessionBuilder   = new SessionBuilder(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    SessionCipher aliceSessionCipher = new SessionCipher(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionCipher bobSessionCipher = new SessionCipher(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    aliceSessionBuilder.process(bobPreKeyBundle);
+    bobSessionBuilder.process(alicePreKeyBundle);
+
+    CiphertextMessage messageForBob   = aliceSessionCipher.encrypt("hey there".getBytes());
+    CiphertextMessage messageForAlice = bobSessionCipher.encrypt("sample message".getBytes());
+
+    assertTrue(messageForBob.getType() == CiphertextMessage.PREKEY_TYPE);
+    assertTrue(messageForAlice.getType() == CiphertextMessage.PREKEY_TYPE);
+
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    byte[] bobPlaintext   = bobSessionCipher.decrypt(new PreKeyWhisperMessage(messageForBob.serialize()));
+
+    assertTrue(new String(bobPlaintext).equals("hey there"));
+    assertTrue(bobStore.loadSession(ALICE_RECIPIENT_ID, 1).getSessionState().getSessionVersion() == 3);
+
+    CiphertextMessage aliceResponse = aliceSessionCipher.encrypt("second message".getBytes());
+
+    assertTrue(aliceResponse.getType() == CiphertextMessage.PREKEY_TYPE);
+
+    byte[] responsePlaintext = bobSessionCipher.decrypt(new PreKeyWhisperMessage(aliceResponse.serialize()));
+
+    assertTrue(new String(responsePlaintext).equals("second message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage finalMessage = bobSessionCipher.encrypt("third message".getBytes());
+
+    assertTrue(finalMessage.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] finalPlaintext = aliceSessionCipher.decrypt(new WhisperMessage(finalMessage.serialize()));
+
+    assertTrue(new String(finalPlaintext).equals("third message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+  }
+
+  public void testSimultaneousInitiateLostMessage()
+      throws InvalidKeyException, UntrustedIdentityException, InvalidVersionException,
+      InvalidMessageException, DuplicateMessageException, LegacyMessageException,
+      InvalidKeyIdException, NoSessionException
+  {
+    AxolotlStore aliceStore = new InMemoryAxolotlStore();
+    AxolotlStore bobStore   = new InMemoryAxolotlStore();
+
+    PreKeyBundle alicePreKeyBundle = createAlicePreKeyBundle(aliceStore);
+    PreKeyBundle bobPreKeyBundle = createBobPreKeyBundle(bobStore);
+
+    SessionBuilder aliceSessionBuilder = new SessionBuilder(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionBuilder bobSessionBuilder   = new SessionBuilder(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    SessionCipher aliceSessionCipher = new SessionCipher(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionCipher bobSessionCipher = new SessionCipher(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    aliceSessionBuilder.process(bobPreKeyBundle);
+    bobSessionBuilder.process(alicePreKeyBundle);
+
+    CiphertextMessage messageForBob   = aliceSessionCipher.encrypt("hey there".getBytes());
+    CiphertextMessage messageForAlice = bobSessionCipher.encrypt("sample message".getBytes());
+
+    assertTrue(messageForBob.getType() == CiphertextMessage.PREKEY_TYPE);
+    assertTrue(messageForAlice.getType() == CiphertextMessage.PREKEY_TYPE);
+
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    byte[] alicePlaintext = aliceSessionCipher.decrypt(new PreKeyWhisperMessage(messageForAlice.serialize()));
+    byte[] bobPlaintext   = bobSessionCipher.decrypt(new PreKeyWhisperMessage(messageForBob.serialize()));
+
+    assertTrue(new String(alicePlaintext).equals("sample message"));
+    assertTrue(new String(bobPlaintext).equals("hey there"));
+
+    assertTrue(aliceStore.loadSession(BOB_RECIPENT_ID, 1).getSessionState().getSessionVersion() == 3);
+    assertTrue(bobStore.loadSession(ALICE_RECIPIENT_ID, 1).getSessionState().getSessionVersion() == 3);
+
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage aliceResponse = aliceSessionCipher.encrypt("second message".getBytes());
+
+    assertTrue(aliceResponse.getType() == CiphertextMessage.WHISPER_TYPE);
+
+//    byte[] responsePlaintext = bobSessionCipher.decrypt(new WhisperMessage(aliceResponse.serialize()));
+//
+//    assertTrue(new String(responsePlaintext).equals("second message"));
+//    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage finalMessage = bobSessionCipher.encrypt("third message".getBytes());
+
+    assertTrue(finalMessage.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] finalPlaintext = aliceSessionCipher.decrypt(new WhisperMessage(finalMessage.serialize()));
+
+    assertTrue(new String(finalPlaintext).equals("third message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+  }
+
+  public void testSimultaneousInitiateRepeatedMessages()
+      throws InvalidKeyException, UntrustedIdentityException, InvalidVersionException,
+      InvalidMessageException, DuplicateMessageException, LegacyMessageException,
+      InvalidKeyIdException, NoSessionException
+  {
+    AxolotlStore aliceStore = new InMemoryAxolotlStore();
+    AxolotlStore bobStore   = new InMemoryAxolotlStore();
+
+    PreKeyBundle alicePreKeyBundle = createAlicePreKeyBundle(aliceStore);
+    PreKeyBundle bobPreKeyBundle = createBobPreKeyBundle(bobStore);
+
+    SessionBuilder aliceSessionBuilder = new SessionBuilder(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionBuilder bobSessionBuilder   = new SessionBuilder(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    SessionCipher aliceSessionCipher = new SessionCipher(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionCipher bobSessionCipher = new SessionCipher(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    aliceSessionBuilder.process(bobPreKeyBundle);
+    bobSessionBuilder.process(alicePreKeyBundle);
+
+    CiphertextMessage messageForBob   = aliceSessionCipher.encrypt("hey there".getBytes());
+    CiphertextMessage messageForAlice = bobSessionCipher.encrypt("sample message".getBytes());
+
+    assertTrue(messageForBob.getType() == CiphertextMessage.PREKEY_TYPE);
+    assertTrue(messageForAlice.getType() == CiphertextMessage.PREKEY_TYPE);
+
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    byte[] alicePlaintext = aliceSessionCipher.decrypt(new PreKeyWhisperMessage(messageForAlice.serialize()));
+    byte[] bobPlaintext   = bobSessionCipher.decrypt(new PreKeyWhisperMessage(messageForBob.serialize()));
+
+    assertTrue(new String(alicePlaintext).equals("sample message"));
+    assertTrue(new String(bobPlaintext).equals("hey there"));
+
+    assertTrue(aliceStore.loadSession(BOB_RECIPENT_ID, 1).getSessionState().getSessionVersion() == 3);
+    assertTrue(bobStore.loadSession(ALICE_RECIPIENT_ID, 1).getSessionState().getSessionVersion() == 3);
+
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    for (int i=0;i<50;i++) {
+      Log.w("SimultaneousInitiateTests", "Iteration: " + i);
+      CiphertextMessage messageForBobRepeat   = aliceSessionCipher.encrypt("hey there".getBytes());
+      CiphertextMessage messageForAliceRepeat = bobSessionCipher.encrypt("sample message".getBytes());
+
+      assertTrue(messageForBobRepeat.getType() == CiphertextMessage.WHISPER_TYPE);
+      assertTrue(messageForAliceRepeat.getType() == CiphertextMessage.WHISPER_TYPE);
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+      byte[] alicePlaintextRepeat = aliceSessionCipher.decrypt(new WhisperMessage(messageForAliceRepeat.serialize()));
+      byte[] bobPlaintextRepeat   = bobSessionCipher.decrypt(new WhisperMessage(messageForBobRepeat.serialize()));
+
+      assertTrue(new String(alicePlaintextRepeat).equals("sample message"));
+      assertTrue(new String(bobPlaintextRepeat).equals("hey there"));
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+    }
+
+    CiphertextMessage aliceResponse = aliceSessionCipher.encrypt("second message".getBytes());
+
+    assertTrue(aliceResponse.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] responsePlaintext = bobSessionCipher.decrypt(new WhisperMessage(aliceResponse.serialize()));
+
+    assertTrue(new String(responsePlaintext).equals("second message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage finalMessage = bobSessionCipher.encrypt("third message".getBytes());
+
+    assertTrue(finalMessage.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] finalPlaintext = aliceSessionCipher.decrypt(new WhisperMessage(finalMessage.serialize()));
+
+    assertTrue(new String(finalPlaintext).equals("third message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+  }
+
+  public void testRepeatedSimultaneousInitiateRepeatedMessages()
+      throws InvalidKeyException, UntrustedIdentityException, InvalidVersionException,
+      InvalidMessageException, DuplicateMessageException, LegacyMessageException,
+      InvalidKeyIdException, NoSessionException
+  {
+    AxolotlStore aliceStore = new InMemoryAxolotlStore();
+    AxolotlStore bobStore   = new InMemoryAxolotlStore();
+
+
+    SessionBuilder aliceSessionBuilder = new SessionBuilder(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionBuilder bobSessionBuilder   = new SessionBuilder(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    SessionCipher aliceSessionCipher = new SessionCipher(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionCipher bobSessionCipher = new SessionCipher(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    for (int i=0;i<15;i++) {
+      PreKeyBundle alicePreKeyBundle = createAlicePreKeyBundle(aliceStore);
+      PreKeyBundle bobPreKeyBundle   = createBobPreKeyBundle(bobStore);
+
+      aliceSessionBuilder.process(bobPreKeyBundle);
+      bobSessionBuilder.process(alicePreKeyBundle);
+
+      CiphertextMessage messageForBob = aliceSessionCipher.encrypt("hey there".getBytes());
+      CiphertextMessage messageForAlice = bobSessionCipher.encrypt("sample message".getBytes());
+
+      assertTrue(messageForBob.getType() == CiphertextMessage.PREKEY_TYPE);
+      assertTrue(messageForAlice.getType() == CiphertextMessage.PREKEY_TYPE);
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+      byte[] alicePlaintext = aliceSessionCipher.decrypt(new PreKeyWhisperMessage(messageForAlice.serialize()));
+      byte[] bobPlaintext = bobSessionCipher.decrypt(new PreKeyWhisperMessage(messageForBob.serialize()));
+
+      assertTrue(new String(alicePlaintext).equals("sample message"));
+      assertTrue(new String(bobPlaintext).equals("hey there"));
+
+      assertTrue(aliceStore.loadSession(BOB_RECIPENT_ID, 1).getSessionState().getSessionVersion() == 3);
+      assertTrue(bobStore.loadSession(ALICE_RECIPIENT_ID, 1).getSessionState().getSessionVersion() == 3);
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+    }
+
+    for (int i=0;i<50;i++) {
+      Log.w("SimultaneousInitiateTests", "Iteration: " + i);
+      CiphertextMessage messageForBobRepeat   = aliceSessionCipher.encrypt("hey there".getBytes());
+      CiphertextMessage messageForAliceRepeat = bobSessionCipher.encrypt("sample message".getBytes());
+
+      assertTrue(messageForBobRepeat.getType() == CiphertextMessage.WHISPER_TYPE);
+      assertTrue(messageForAliceRepeat.getType() == CiphertextMessage.WHISPER_TYPE);
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+      byte[] alicePlaintextRepeat = aliceSessionCipher.decrypt(new WhisperMessage(messageForAliceRepeat.serialize()));
+      byte[] bobPlaintextRepeat   = bobSessionCipher.decrypt(new WhisperMessage(messageForBobRepeat.serialize()));
+
+      assertTrue(new String(alicePlaintextRepeat).equals("sample message"));
+      assertTrue(new String(bobPlaintextRepeat).equals("hey there"));
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+    }
+
+    CiphertextMessage aliceResponse = aliceSessionCipher.encrypt("second message".getBytes());
+
+    assertTrue(aliceResponse.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] responsePlaintext = bobSessionCipher.decrypt(new WhisperMessage(aliceResponse.serialize()));
+
+    assertTrue(new String(responsePlaintext).equals("second message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage finalMessage = bobSessionCipher.encrypt("third message".getBytes());
+
+    assertTrue(finalMessage.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] finalPlaintext = aliceSessionCipher.decrypt(new WhisperMessage(finalMessage.serialize()));
+
+    assertTrue(new String(finalPlaintext).equals("third message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+  }
+
+  public void testRepeatedSimultaneousInitiateLostMessageRepeatedMessages()
+      throws InvalidKeyException, UntrustedIdentityException, InvalidVersionException,
+      InvalidMessageException, DuplicateMessageException, LegacyMessageException,
+      InvalidKeyIdException, NoSessionException
+  {
+    AxolotlStore aliceStore = new InMemoryAxolotlStore();
+    AxolotlStore bobStore   = new InMemoryAxolotlStore();
+
+
+    SessionBuilder aliceSessionBuilder = new SessionBuilder(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionBuilder bobSessionBuilder   = new SessionBuilder(bobStore, ALICE_RECIPIENT_ID, 1);
+
+    SessionCipher aliceSessionCipher = new SessionCipher(aliceStore, BOB_RECIPENT_ID, 1);
+    SessionCipher bobSessionCipher = new SessionCipher(bobStore, ALICE_RECIPIENT_ID, 1);
+
+//    PreKeyBundle aliceLostPreKeyBundle = createAlicePreKeyBundle(aliceStore);
+    PreKeyBundle bobLostPreKeyBundle   = createBobPreKeyBundle(bobStore);
+
+    aliceSessionBuilder.process(bobLostPreKeyBundle);
+//    bobSessionBuilder.process(aliceLostPreKeyBundle);
+
+    CiphertextMessage lostMessageForBob   = aliceSessionCipher.encrypt("hey there".getBytes());
+//    CiphertextMessage lostMessageForAlice = bobSessionCipher.encrypt("sample message".getBytes());
+
+    for (int i=0;i<15;i++) {
+      PreKeyBundle alicePreKeyBundle = createAlicePreKeyBundle(aliceStore);
+      PreKeyBundle bobPreKeyBundle   = createBobPreKeyBundle(bobStore);
+
+      aliceSessionBuilder.process(bobPreKeyBundle);
+      bobSessionBuilder.process(alicePreKeyBundle);
+
+      CiphertextMessage messageForBob = aliceSessionCipher.encrypt("hey there".getBytes());
+      CiphertextMessage messageForAlice = bobSessionCipher.encrypt("sample message".getBytes());
+
+      assertTrue(messageForBob.getType() == CiphertextMessage.PREKEY_TYPE);
+      assertTrue(messageForAlice.getType() == CiphertextMessage.PREKEY_TYPE);
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+      byte[] alicePlaintext = aliceSessionCipher.decrypt(new PreKeyWhisperMessage(messageForAlice.serialize()));
+      byte[] bobPlaintext = bobSessionCipher.decrypt(new PreKeyWhisperMessage(messageForBob.serialize()));
+
+      assertTrue(new String(alicePlaintext).equals("sample message"));
+      assertTrue(new String(bobPlaintext).equals("hey there"));
+
+      assertTrue(aliceStore.loadSession(BOB_RECIPENT_ID, 1).getSessionState().getSessionVersion() == 3);
+      assertTrue(bobStore.loadSession(ALICE_RECIPIENT_ID, 1).getSessionState().getSessionVersion() == 3);
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+    }
+
+    for (int i=0;i<50;i++) {
+      Log.w("SimultaneousInitiateTests", "Iteration: " + i);
+      CiphertextMessage messageForBobRepeat   = aliceSessionCipher.encrypt("hey there".getBytes());
+      CiphertextMessage messageForAliceRepeat = bobSessionCipher.encrypt("sample message".getBytes());
+
+      assertTrue(messageForBobRepeat.getType() == CiphertextMessage.WHISPER_TYPE);
+      assertTrue(messageForAliceRepeat.getType() == CiphertextMessage.WHISPER_TYPE);
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+      byte[] alicePlaintextRepeat = aliceSessionCipher.decrypt(new WhisperMessage(messageForAliceRepeat.serialize()));
+      byte[] bobPlaintextRepeat   = bobSessionCipher.decrypt(new WhisperMessage(messageForBobRepeat.serialize()));
+
+      assertTrue(new String(alicePlaintextRepeat).equals("sample message"));
+      assertTrue(new String(bobPlaintextRepeat).equals("hey there"));
+
+      assertFalse(isSessionIdEqual(aliceStore, bobStore));
+    }
+
+    CiphertextMessage aliceResponse = aliceSessionCipher.encrypt("second message".getBytes());
+
+    assertTrue(aliceResponse.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] responsePlaintext = bobSessionCipher.decrypt(new WhisperMessage(aliceResponse.serialize()));
+
+    assertTrue(new String(responsePlaintext).equals("second message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage finalMessage = bobSessionCipher.encrypt("third message".getBytes());
+
+    assertTrue(finalMessage.getType() == CiphertextMessage.WHISPER_TYPE);
+
+    byte[] finalPlaintext = aliceSessionCipher.decrypt(new WhisperMessage(finalMessage.serialize()));
+
+    assertTrue(new String(finalPlaintext).equals("third message"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+
+    byte[] lostMessagePlaintext = bobSessionCipher.decrypt(new PreKeyWhisperMessage(lostMessageForBob.serialize()));
+    assertTrue(new String(lostMessagePlaintext).equals("hey there"));
+
+    assertFalse(isSessionIdEqual(aliceStore, bobStore));
+
+    CiphertextMessage blastFromThePast          = bobSessionCipher.encrypt("unexpected!".getBytes());
+    byte[]            blastFromThePastPlaintext = aliceSessionCipher.decrypt(new WhisperMessage(blastFromThePast.serialize()));
+
+    assertTrue(new String(blastFromThePastPlaintext).equals("unexpected!"));
+    assertTrue(isSessionIdEqual(aliceStore, bobStore));
+  }
+
+  private boolean isSessionIdEqual(AxolotlStore aliceStore, AxolotlStore bobStore) {
+    return Arrays.equals(aliceStore.loadSession(BOB_RECIPENT_ID, 1).getSessionState().getAliceBaseKey(),
+                         bobStore.loadSession(ALICE_RECIPIENT_ID, 1).getSessionState().getAliceBaseKey());
+  }
+
+  private PreKeyBundle createAlicePreKeyBundle(AxolotlStore aliceStore) throws InvalidKeyException {
+    ECKeyPair aliceUnsignedPreKey   = Curve.generateKeyPair();
+    int       aliceUnsignedPreKeyId = new Random().nextInt(Medium.MAX_VALUE);
+    byte[]    aliceSignature        = Curve.calculateSignature(aliceStore.getIdentityKeyPair().getPrivateKey(),
+                                                               aliceSignedPreKey.getPublicKey().serialize());
+
+    PreKeyBundle alicePreKeyBundle = new PreKeyBundle(1, 1,
+                                                      aliceUnsignedPreKeyId, aliceUnsignedPreKey.getPublicKey(),
+                                                      aliceSignedPreKeyId, aliceSignedPreKey.getPublicKey(),
+                                                      aliceSignature, aliceStore.getIdentityKeyPair().getPublicKey());
+
+    aliceStore.storeSignedPreKey(aliceSignedPreKeyId, new SignedPreKeyRecord(aliceSignedPreKeyId, System.currentTimeMillis(), aliceSignedPreKey, aliceSignature));
+    aliceStore.storePreKey(aliceUnsignedPreKeyId, new PreKeyRecord(aliceUnsignedPreKeyId, aliceUnsignedPreKey));
+
+    return alicePreKeyBundle;
+  }
+
+  private PreKeyBundle createBobPreKeyBundle(AxolotlStore bobStore) throws InvalidKeyException {
+    ECKeyPair bobUnsignedPreKey   = Curve.generateKeyPair();
+    int       bobUnsignedPreKeyId = new Random().nextInt(Medium.MAX_VALUE);
+    byte[]    bobSignature        = Curve.calculateSignature(bobStore.getIdentityKeyPair().getPrivateKey(),
+                                                             bobSignedPreKey.getPublicKey().serialize());
+
+    PreKeyBundle bobPreKeyBundle = new PreKeyBundle(1, 1,
+                                                    bobUnsignedPreKeyId, bobUnsignedPreKey.getPublicKey(),
+                                                    bobSignedPreKeyId, bobSignedPreKey.getPublicKey(),
+                                                    bobSignature, bobStore.getIdentityKeyPair().getPublicKey());
+
+    bobStore.storeSignedPreKey(bobSignedPreKeyId, new SignedPreKeyRecord(bobSignedPreKeyId, System.currentTimeMillis(), bobSignedPreKey, bobSignature));
+    bobStore.storePreKey(bobUnsignedPreKeyId, new PreKeyRecord(bobUnsignedPreKeyId, bobUnsignedPreKey));
+
+    return bobPreKeyBundle;
+  }
+}