From 34a466622ecf52d0a0c10a38fda5d963564d5f50 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 12 Jun 2017 21:08:52 +0200
Subject: [PATCH] =?UTF-8?q?tls-psk:=20show=20"Connecting=E2=80=A6"=20view?=
 =?UTF-8?q?=20while=20waiting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network/KeyTransferInteractor.java        |  3 +++
 .../transfer/presenter/TransferPresenter.java |  7 +++++-
 .../ui/transfer/view/TransferFragment.java    | 12 +++++++---
 .../src/main/res/layout/transfer_fragment.xml | 24 +++++++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml  |  1 +
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java
index b550d471e..47cc40326 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java
@@ -82,6 +82,7 @@ public class KeyTransferInteractor {
     private static final int CONNECTION_ERROR_LISTEN = 8;
 
     private static final String QRCODE_URI_FORMAT = "PGP+TRANSFER://%s@%s:%s";
+    private static final int TIMEOUT_CONNECTING = 2500;
     private static final int TIMEOUT_RECEIVING = 2000;
     private static final int TIMEOUT_WAITING = 500;
     private static final int PSK_BYTE_LENGTH = 16;
@@ -237,6 +238,8 @@ public class KeyTransferInteractor {
         }
 
         private void handleOpenConnection(Socket socket) throws IOException {
+            socket.setSoTimeout(TIMEOUT_CONNECTING);
+
             BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             OutputStream outputStream = new BufferedOutputStream(socket.getOutputStream());
 
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 587ded895..23a711433 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
@@ -273,6 +273,8 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
     @Override
     public void onConnectionErrorConnect() {
         view.showErrorConnectionFailed();
+
+        resetAndStartListen();
     }
 
     @Override
@@ -294,8 +296,10 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
     private void connectionStartConnect(String qrCodeContent) {
         connectionClear();
 
+        view.showEstablishingConnection();
+
         keyTransferClientInteractor = new KeyTransferInteractor(DELIMITER_START, DELIMITER_END);
-        keyTransferClientInteractor.connectToServer(qrCodeContent, this);
+        keyTransferClientInteractor.connectToServer(qrCodeContent, TransferPresenter.this);
     }
 
     private void checkWifiResetAndStartListen() {
@@ -368,6 +372,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
     public interface TransferMvpView {
         void showNotOnWifi();
         void showWaitingForConnection();
+        void showEstablishingConnection();
         void showConnectionEstablished(String hostname);
         void showReceivingKeys();
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
index 6fc9f616e..5f7662b33 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
@@ -63,9 +63,10 @@ import org.sufficientlysecure.keychain.ui.widget.ConnectionStatusView;
 @RequiresApi(api = VERSION_CODES.LOLLIPOP)
 public class TransferFragment extends Fragment implements TransferMvpView {
     public static final int VIEW_WAITING = 0;
-    public static final int VIEW_CONNECTED = 1;
-    public static final int VIEW_RECEIVING = 2;
-    public static final int VIEW_NO_WIFI = 3;
+    public static final int VIEW_CONNECTING = 1;
+    public static final int VIEW_CONNECTED = 2;
+    public static final int VIEW_RECEIVING = 3;
+    public static final int VIEW_NO_WIFI = 4;
 
     public static final int REQUEST_CODE_SCAN = 1;
     public static final int LOADER_ID = 1;
@@ -182,6 +183,11 @@ public class TransferFragment extends Fragment implements TransferMvpView {
         vTransferAnimator.setDisplayedChild(VIEW_WAITING);
     }
 
+    @Override
+    public void showEstablishingConnection() {
+        vTransferAnimator.setDisplayedChild(VIEW_CONNECTING);
+    }
+
     @Override
     public void showConnectionEstablished(String hostname) {
         String statusText = getString(R.string.transfer_status_connected, hostname);
diff --git a/OpenKeychain/src/main/res/layout/transfer_fragment.xml b/OpenKeychain/src/main/res/layout/transfer_fragment.xml
index cde70eef5..93fd6ef26 100644
--- a/OpenKeychain/src/main/res/layout/transfer_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/transfer_fragment.xml
@@ -68,6 +68,30 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <org.sufficientlysecure.keychain.ui.widget.ConnectionStatusView
+            android:layout_width="96dp"
+            android:layout_height="96dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="16dp"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="8dp"
+            android:text="@string/transfer_connecting"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8c33c67dc..c6404d5bc 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1905,5 +1905,6 @@
     <string name="transfer_error_generic_msg">"Communication error: %s"</string>
     <string name="transfer_not_available">"Sorry, this feature can only be used on Android 5 or newer :("</string>
     <string name="transfer_list_empty">No keys on this device that could be sent.  Waiting for incoming keys…</string>
+    <string name="transfer_connecting">Connecting…</string>
 
 </resources>