From 13873e934fce5873aced2e216012d645d9c7c98b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 30 May 2017 21:34:53 +0200
Subject: [PATCH] tls-psk: clear all data on connection reset

---
 .../keychain/ui/transfer/presenter/TransferPresenter.java | 6 +++++-
 .../keychain/ui/transfer/view/ReceivedSecretKeyList.java  | 7 +++++++
 .../keychain/ui/transfer/view/TransferSecretKeyList.java  | 8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

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 17775ca1f..53ab375f1 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
@@ -187,6 +187,10 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         wasConnected = true;
 
         secretKeyAdapter.clearFinishedItems();
+        secretKeyAdapter.focusItem(null);
+        secretKeyAdapter.setAllDisabled(false);
+        receivedKeyAdapter.clear();
+
         view.showConnectionEstablished(otherName);
         view.addFakeBackStackItem(BACKSTACK_TAG_TRANSFER);
     }
@@ -199,7 +203,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
             connectionResetAndStartListen();
         } else {
             view.showViewDisconnected();
-            secretKeyAdapter.disableAll();
+            secretKeyAdapter.setAllDisabled(true);
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/ReceivedSecretKeyList.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/ReceivedSecretKeyList.java
index b02273902..38e545c7f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/ReceivedSecretKeyList.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/ReceivedSecretKeyList.java
@@ -101,6 +101,13 @@ public class ReceivedSecretKeyList extends RecyclerView {
             data.add(receivedKeyItem);
             notifyItemInserted(data.size() -1);
         }
+
+        public void clear() {
+            data.clear();
+            finishedItems.clear();
+            focusedMasterKeyId = null;
+            notifyDataSetChanged();
+        }
     }
 
     static class ReceivedKeyViewHolder extends ViewHolder {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferSecretKeyList.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferSecretKeyList.java
index f7398e7b7..affe566a1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferSecretKeyList.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferSecretKeyList.java
@@ -60,7 +60,7 @@ public class TransferSecretKeyList extends RecyclerView {
         private Long focusedMasterKeyId;
         private List<SecretKeyItem> data;
         private ArrayList<Long> finishedItems = new ArrayList<>();
-        private boolean disableAll;
+        private boolean allItemsDisabled;
 
 
         public TransferKeyAdapter(Context context, LayoutInflater layoutInflater,
@@ -79,7 +79,7 @@ public class TransferSecretKeyList extends RecyclerView {
         public void onBindViewHolder(TransferKeyViewHolder holder, int position) {
             SecretKeyItem item = data.get(position);
             boolean isFinished = finishedItems.contains(item.masterKeyId);
-            holder.bind(context, item, onClickTransferKeyListener, focusedMasterKeyId, isFinished, disableAll);
+            holder.bind(context, item, onClickTransferKeyListener, focusedMasterKeyId, isFinished, allItemsDisabled);
         }
 
         @Override
@@ -116,8 +116,8 @@ public class TransferSecretKeyList extends RecyclerView {
             return new SecretKeyLoader(context, context.getContentResolver());
         }
 
-        public void disableAll() {
-            disableAll = true;
+        public void setAllDisabled(boolean allItemsdisablde) {
+            allItemsDisabled = allItemsdisablde;
             notifyItemRangeChanged(0, getItemCount());
         }
     }