From 5cff30e7baa90b3a4c3f49b6a36e2af14f77c82a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 8 Jun 2017 10:11:46 +0200
Subject: [PATCH] tls-psk: ignore incoming data if we already sent a key

---
 .../ui/transfer/presenter/TransferPresenter.java         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java
index 025119090..44ed28f5b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java
@@ -80,6 +80,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
     private KeyTransferInteractor keyTransferServerInteractor;
 
     private boolean wasConnected = false;
+    private boolean sentData = false;
     private boolean waitingForWifi = false;
 
 
@@ -224,8 +225,12 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
 
     @Override
     public void onDataReceivedOk(String receivedData) {
-        Log.d(Constants.TAG, "received key");
+        if (sentData) {
+            Log.d(Constants.TAG, "received data, but we already sent a key! race condition, or other side misbehaving?");
+            return;
+        }
 
+        Log.d(Constants.TAG, "received data");
         UncachedKeyRing uncachedKeyRing;
         try {
             uncachedKeyRing = UncachedKeyRing.decodeFromData(receivedData.getBytes());
@@ -290,6 +295,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
     private void resetAndStartListen() {
         waitingForWifi = false;
         wasConnected = false;
+        sentData = false;
         connectionClear();
 
         keyTransferServerInteractor = new KeyTransferInteractor();
@@ -317,6 +323,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
     }
 
     private void connectionSend(byte[] armoredSecretKey, String passthrough) {
+        sentData = true;
         if (keyTransferClientInteractor != null) {
             keyTransferClientInteractor.sendData(armoredSecretKey, passthrough);
         } else if (keyTransferServerInteractor != null) {