aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorTarek Galal <tare2.galal@gmail.com>2014-12-22 09:02:11 +0100
committerMoxie Marlinspike <moxie@thoughtcrime.org>2014-12-22 09:13:52 -0800
commita4d8f7f6a4c4e9e89db35f299e558dceee2362a1 (patch)
tree697d7e66b5ce87f0c6f9b50d6a77d1fcdd698b43 /src/main
parentf46e9c6d99ed7ab3b24652e93a4f81074cb1f96f (diff)
Fix typo.
Change non-short-circuit '&' to short-circuit '&&'. Closes #1
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSession.java2
1 files changed, 1 insertions, 1 deletions
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()));
}