From ba5a1a1969187ea30b5538051b3a14ac9230a393 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 28 Jun 2017 23:59:29 +0200
Subject: [PATCH] tls-psk: add specialized error screen if on bad wifi

---
 .../transfer/presenter/TransferPresenter.java |  20 ++++-
 .../ui/transfer/view/TransferFragment.java    |  24 ++++++
 .../drawable-hdpi/ic_wifi_question_96dp.png   | Bin 0 -> 2064 bytes
 .../drawable-mdpi/ic_wifi_question_96dp.png   | Bin 0 -> 1524 bytes
 .../drawable-xhdpi/ic_wifi_question_96dp.png  | Bin 0 -> 3127 bytes
 .../drawable-xxhdpi/ic_wifi_question_96dp.png | Bin 0 -> 4334 bytes
 .../src/main/res/layout/transfer_fragment.xml |  54 +++++++++++-
 OpenKeychain/src/main/res/values/strings.xml  |   4 +
 graphics/drawables/ic_wifi_question.svg       |  80 ++++++++++++++++++
 graphics/update-drawables.sh                  |   2 +-
 10 files changed, 180 insertions(+), 4 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_question_96dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_question_96dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_question_96dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_question_96dp.png
 create mode 100644 graphics/drawables/ic_wifi_question.svg

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 ef9b4e29f..40e674a09 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
@@ -134,6 +134,10 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         view.scanQrCode();
     }
 
+    public void onUiClickScanAgain() {
+        onUiClickScan();
+    }
+
     public void onUiClickDone() {
         view.finishFragmentOrActivity();
     }
@@ -296,6 +300,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
 
     @Override
     public void onConnectionErrorConnect() {
+        view.showWaitingForConnection();
         view.showErrorConnectionFailed();
 
         resetAndStartListen();
@@ -303,9 +308,17 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
 
     @Override
     public void onConnectionErrorNoRouteToHost(String wifiSsid) {
-        view.showErrorConnectionFailed();
+        connectionClear();
 
-        resetAndStartListen();
+        String ownWifiSsid = getConnectedWifiSsid();
+        if (!wifiSsid.equalsIgnoreCase(ownWifiSsid)) {
+            view.showWifiError(wifiSsid);
+        } else {
+            view.showWaitingForConnection();
+            view.showErrorConnectionFailed();
+
+            resetAndStartListen();
+        }
     }
 
     @Override
@@ -440,6 +453,9 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         void showWaitingForConnection();
         void showEstablishingConnection();
         void showConnectionEstablished(String hostname);
+
+        void showWifiError(String wifiSsid);
+
         void showReceivingKeys();
 
         void showViewDisconnected();
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 0f4f53f98..1a9f0f285 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
@@ -42,6 +42,7 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AlertDialog.Builder;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.Adapter;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -102,6 +103,7 @@ public class TransferFragment extends Fragment implements TransferMvpView {
     };
     private boolean showDoneIcon;
     private AlertDialog confirmationDialog;
+    private TextView vWifiErrorInstructions;
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -116,6 +118,7 @@ public class TransferFragment extends Fragment implements TransferMvpView {
         vTransferKeyList = (RecyclerView) view.findViewById(R.id.transfer_key_list);
         vTransferKeyListEmptyView = view.findViewById(R.id.transfer_key_list_empty);
         vReceivedKeyList = (RecyclerView) view.findViewById(R.id.received_key_list);
+        vWifiErrorInstructions = (TextView) view.findViewById(R.id.transfer_wifi_error_instructions);
 
         vQrCodeImage = (ImageView) view.findViewById(R.id.qr_code_image);
 
@@ -128,6 +131,15 @@ public class TransferFragment extends Fragment implements TransferMvpView {
             }
         });
 
+        view.findViewById(R.id.button_scan_again).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (presenter != null) {
+                    presenter.onUiClickScanAgain();
+                }
+            }
+        });
+
         presenter = new TransferPresenter(getContext(), getLoaderManager(), LOADER_ID, this);
 
         setHasOptionsMenu(true);
@@ -223,6 +235,18 @@ public class TransferFragment extends Fragment implements TransferMvpView {
         vTransferAnimator.setDisplayedChildId(R.id.transfer_layout_connected);
     }
 
+    @Override
+    public void showWifiError(String wifiSsid) {
+        vTransferAnimator.setDisplayedChildId(R.id.transfer_layout_wifi_error);
+
+        if (!TextUtils.isEmpty(wifiSsid)) {
+            vWifiErrorInstructions
+                    .setText(getResources().getString(R.string.transfer_error_wifi_text_instructions_ssid, wifiSsid));
+        } else {
+            vWifiErrorInstructions.setText(R.string.transfer_error_wifi_text_instructions);
+        }
+    }
+
     @Override
     public void showReceivingKeys() {
         vTransferAnimator.setDisplayedChildId(R.id.transfer_layout_passive);
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_question_96dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_question_96dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..36dbfcfcc6b819fc36413f4304392d6c0cf9dd66
GIT binary patch
literal 2064
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

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_question_96dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_question_96dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..335547b9c577774980f74a27e965931515511ef9
GIT binary patch
literal 1524
zcmV<Q1q=F#P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00004b3#c}2nYxW
zd<bNS00009a7bBm0027<0027<0nE0cg8%>k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11#wA4K~#90?VVk06-5+)zt&n*OpR5*Yt=*~lBy9CNd)wf7k_!7
z=-YiTR+CozjpCCen)nwqk{H8_1|KBRH%*MDL5WCIL_<^pDu#+cz*?vUTfD8shjXv3
z*Y3>j-I<-)z4Ij}x5@6zIdf+3J$vS_5C{YUfj}S-2m}IwKp+rk7Ft{zFbfv|-N0g?
z3%CTh3|LT=7U06_y|vF1Gd|A%$AF{2;TfO%s`7{R79_xR2P^=V12+RVAdc^{tn(1C
z7uXH#06qtPv#iq_I)S@^H-Y`g)9Qo#1iS&PVftHD7_I`ILY}rs+&fz*lfY-dI^aqR
z{>X$9@F=ho_YO@fUjmOHvB+y$ftA2JKn3@Xv+>Os0D6G44Ef9m=L2hjpK<S`tYkmX
z56m^-zlP}qo&|<+?+{lq3_L@|fqO3SB-8KQL0}Yk9_UEnS1o4)y}%I<8tkhKArI#{
z4f;5eHNc<;4a|!i09H5R=z10cA9&E9yvkPK>cn10er_HDPI}OYyvrD{9+(r?`Q5<R
z9vEIU`3|^V<@grhL8QlA8(UNv1NxX{5VQk$*8>BaMc$*DJG53i;5=klIFJoX5ug8u
zWx#3NKOIGvap0z?o+*1^VA18?DCgJM<bjbzl~;An2gw0G^}yJo$#$SUP6vQYJ{<DE
z=%UCVFfXq2YlNU|M#g{}6Z-yN${sWz&oTwvli2HZgrMBGJlBA~|3?VQjmbyEm^+TU
zFslUY0xpete^IF*3%Rx-3%h<mR^FWgCXk7k`M?t7t!Kof^5wu^xPP)-$X;X+?V{9P
zOi3^9osp#+K$fA@#>~8+8G`Z@uz^_y%zU67S!U?kNw#DZxWkyYEKx$1e7km*X&FL>
zigQ8HGUZWHWUQ_zN>HA{(a(;F4H}z}j>t1F1CJ%Rzm4flCG&xckrgDzk=;3akcABs
zX3d<Pyl2Y45Py+v7w|gbXkER-z((xv_yO`AlzU>f@p0hK2I?P27VuhM(w@hlybpbn
z)rM?eN~>!C*??%3yanaH7;SpdpuP{u;G2+_Ou2#tPZhT#Z%8KfJ{-%7DacDu{zTJ`
zR^VGr9q$9T0+$2VB9kw=eR0RgV2GoH|N98mYud0%Q~v3Qa_z`aw5sf#8r??lJt(iz
z*uPm(c01}EYNbZ^OB&tA@Hr@VE9`DTCR(D(>Rw&X)#%=$DQ^^CgL0?B=6Ra3y5J4!
z$*Z?&H)S!=(2sm&edCnkT1jzj1o&N3cL(Z4SjTIBv}r0b!346$Y!?}&<uR!!t_=bA
zM_e0=QMYb?*zOp07{|AuY>S0R2S(|gM2_EaLRn#05jtQAGPtMG`?e+BvGFA+o2Cbe
zD=M8Mz!esBC&HIZ*(47De{1wr@Mx~tht=1n=tn<ZbON}|piU#W4$3B2ivDPxoyeh8
zUQ#CC9k5NK;}zs5*K1q_<+NO*ss9NBIx@jkP)^G_MctW>^_U>*;p-m_*sK~YU1XsC
z%*iS!p9HQmVDHw5`VS_l#HUriUl2Y1Vu~}!KHcvP)D`8sM0*0V7>rB8W?%*O7J9va
zoa$(TEy$6U^&B-+zcXwF<pDf9ZqjE=XUc=bn?%VR*N1njScW7zu}_+cU>vvw_$IAE
zGgtxKrMUhY@T)<6&M1@q=`UNbYpq6S<Y_2*Bu%Eg!IDi))d7tL<&UxVmS?O3e98l&
zsLd%KPEh6`@_z~@typA`JahoayY*^hsfUi!)q97mT4ad4bO6N9l>30MEZfr5sDkpw
zjBIGCAY4yWP~Jg;6R85}sLzy-5DpT_oZ9ep1<7;+4(J8$b8SQ*5C{YUfj}S-2m}Iw
axcmbEbpkjpOc+K00000<MNUMnLSTZI6T=Gt

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_question_96dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_question_96dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e200fdd9fecb54bc51b1d5c4226593c8dcb1080
GIT binary patch
literal 3127
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

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_question_96dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_question_96dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5300ff76640e1ad54b9334e46000ee410c30545e
GIT binary patch
literal 4334
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
E0Qn@}?EnA(

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/layout/transfer_fragment.xml b/OpenKeychain/src/main/res/layout/transfer_fragment.xml
index e50a62ddb..575315889 100644
--- a/OpenKeychain/src/main/res/layout/transfer_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/transfer_fragment.xml
@@ -8,7 +8,7 @@
     android:id="@+id/transfer_animator"
     android:inAnimation="@anim/fade_in_delayed"
     android:outAnimation="@anim/fade_out"
-    custom:initialView="0">
+    custom:initialView="05">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -303,4 +303,56 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/transfer_layout_wifi_error"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <ImageView
+            android:layout_width="96dp"
+            android:layout_height="96dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="16dp"
+            android:src="@drawable/ic_wifi_question_96dp"
+            android:tint="@color/md_grey_600"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="8dp"
+            android:gravity="center_horizontal"
+            android:text="@string/transfer_error_wifi_text"
+            tools:text="Connection failed!"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="8dp"
+            android:gravity="center_horizontal"
+            android:id="@+id/transfer_wifi_error_instructions"
+            android:text="@string/transfer_error_wifi_text_instructions"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:layout_gravity="center_horizontal"
+            android:id="@+id/button_scan_again"
+            android:text="@string/button_scan_again"
+            android:drawableLeft="@drawable/ic_qrcode_white_24dp"
+            android:drawableTint="@color/md_black_1000"
+            android:drawablePadding="8dp"
+            />
+
+    </LinearLayout>
+
 </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 95072395f..07ca9cc22 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1912,5 +1912,9 @@
     <string name="transfer_confirm_ok">"Send"</string>
     <string name="transfer_confirm_title">"Send your key?"</string>
     <string name="transfer_confirm_text">"This will transfer full access to your key to the connected device. You should never send your own keys to devices you don't own!"</string>
+    <string name="button_scan_again">"Scan Again"</string>
+    <string name="transfer_error_wifi_text">"Connection failed!"</string>
+    <string name="transfer_error_wifi_text_instructions">"Make sure you are on the same network, then scan again."</string>
+    <string name="transfer_error_wifi_text_instructions_ssid">"Make sure you are on the &quot;%s&quot; network, then scan again."</string>
 
 </resources>
diff --git a/graphics/drawables/ic_wifi_question.svg b/graphics/drawables/ic_wifi_question.svg
new file mode 100644
index 000000000..c9678516b
--- /dev/null
+++ b/graphics/drawables/ic_wifi_question.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   fill="#000000"
+   height="24"
+   viewBox="0 0 24 24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="ic_wifi_question.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview8"
+     showgrid="false"
+     inkscape:measure-start="15.5,6.9"
+     inkscape:measure-end="21.5,14.4"
+     inkscape:zoom="39.333333"
+     inkscape:cx="12.121876"
+     inkscape:cy="9.0333709"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M0 0h24v24H0V0z"
+     fill="none"
+     id="path2" />
+  <path
+     d="m 15.5,14.5 c 0,-2.8 2.2,-5 5,-5 0.4,0 0.7,0 1,0.1 L 23.6,7 C 23.2,6.7 18.7,3 12,3 5.3,3 0.8,6.7 0.4,7 L 12,21.5 15.5,17.1 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssccscccs" />
+  <g
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+     id="Page-1"
+     sketch:type="MSPage"
+     transform="matrix(0.14184741,0,0,0.14184741,13.309409,9.1313496)">
+    <g
+       style="fill:#000000"
+       id="signature-unverified"
+       sketch:type="MSArtboardGroup">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 56.359,80.095 H 42.883 V 66.877 H 56.359 Z M 70.222,40.709 c -0.717,1.773 -1.602,3.289 -2.66,4.547 -1.061,1.259 -2.232,2.332 -3.52,3.218 -1.287,0.888 -2.504,1.772 -3.648,2.659 -1.145,0.889 -2.16,1.903 -3.047,3.047 -0.889,1.145 -1.445,2.573 -1.674,4.289 v 3.26 H 44.086 v -3.861 c 0.172,-2.457 0.643,-4.518 1.416,-6.176 0.771,-1.658 1.674,-3.075 2.703,-4.248 1.031,-1.172 2.117,-2.188 3.261,-3.046 1.145,-0.856 2.203,-1.716 3.176,-2.573 0.973,-0.858 1.76,-1.801 2.361,-2.831 0.601,-1.03 0.871,-2.316 0.814,-3.86 0,-2.631 -0.643,-4.576 -1.93,-5.836 -1.289,-1.256 -3.078,-1.887 -5.365,-1.887 -1.545,0 -2.875,0.301 -3.992,0.901 -1.115,0.601 -2.031,1.401 -2.746,2.402 -0.717,1.001 -1.244,2.174 -1.588,3.517 -0.344,1.346 -0.516,2.79 -0.516,4.334 H 29.065 c 0.055,-3.09 0.586,-5.921 1.588,-8.494 1,-2.574 2.402,-4.805 4.205,-6.691 1.803,-1.889 3.977,-3.361 6.523,-4.422 2.547,-1.059 5.395,-1.588 8.541,-1.588 4.062,0 7.453,0.559 10.171,1.674 2.717,1.116 4.906,2.504 6.566,4.164 1.66,1.659 2.846,3.446 3.562,5.362 0.715,1.917 1.072,3.703 1.072,5.362 0.002,2.745 -0.356,5.006 -1.071,6.777 z"
+         sketch:type="MSShapeGroup"
+         id="path8"
+         sodipodi:nodetypes="ccccccccccccccccccsccsccccccccsccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/graphics/update-drawables.sh b/graphics/update-drawables.sh
index 2a3ac39dd..83b4bad47 100755
--- a/graphics/update-drawables.sh
+++ b/graphics/update-drawables.sh
@@ -32,7 +32,7 @@ inkscape -w 72 -h 72 -e "$XXDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
 inkscape -w 96 -h 96 -e "$XXXDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
 done
 
-for NAME in "ic_android" "ic_wifi_off" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "status_signature_verified_inner"
+for NAME in "ic_android" "ic_wifi_question" "ic_wifi_off" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "status_signature_verified_inner"
 do
 echo $NAME
 inkscape -w 96 -h 96 -e "$MDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg"