From 145e4335fcea582f40cb7d272535060e93712181 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Thu, 20 Feb 2014 12:05:24 -0800
Subject: [PATCH] Only send round-trip key exchanges over SMS.

---
 .../thoughtcrime/securesms/transport/UniversalTransport.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/transport/UniversalTransport.java b/src/org/thoughtcrime/securesms/transport/UniversalTransport.java
index d7f18746da..f226963205 100644
--- a/src/org/thoughtcrime/securesms/transport/UniversalTransport.java
+++ b/src/org/thoughtcrime/securesms/transport/UniversalTransport.java
@@ -71,7 +71,7 @@ public class UniversalTransport {
       Recipient recipient = message.getIndividualRecipient();
       String number       = Util.canonicalizeNumber(context, recipient.getNumber());
 
-      if (isPushTransport(number)) {
+      if (isPushTransport(number) && !message.isKeyExchange()) {
         boolean isSmsFallbackSupported = isSmsFallbackSupported(number);
 
         try {