From a4d8f7f6a4c4e9e89db35f299e558dceee2362a1 Mon Sep 17 00:00:00 2001
From: Tarek Galal <tare2.galal@gmail.com>
Date: Mon, 22 Dec 2014 09:02:11 +0100
Subject: Fix typo.

Change non-short-circuit '&' to short-circuit '&&'.

Closes #1
---
 .../java/org/whispersystems/libaxolotl/ratchet/RatchetingSession.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSession.java b/src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSession.java
index 8c094ec0..ec9af6d9 100644
--- a/src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSession.java
+++ b/src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSession.java
@@ -86,7 +86,7 @@ public class RatchetingSession {
       secrets.write(Curve.calculateAgreement(parameters.getTheirSignedPreKey(),
                                              parameters.getOurBaseKey().getPrivateKey()));
 
-      if (sessionVersion >= 3 & parameters.getTheirOneTimePreKey().isPresent()) {
+      if (sessionVersion >= 3 && parameters.getTheirOneTimePreKey().isPresent()) {
         secrets.write(Curve.calculateAgreement(parameters.getTheirOneTimePreKey().get(),
                                                parameters.getOurBaseKey().getPrivateKey()));
       }
-- 
cgit v1.2.3