From a441df2bd79df1a1de3ad2fbe531ce4e432d7375 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 30 May 2017 22:37:53 +0200
Subject: [PATCH] tls-psk: display warning if not connected to wifi before
 connecting

---
 .../transfer/presenter/TransferPresenter.java |  35 ++++++++++++++--
 .../ui/transfer/view/TransferFragment.java    |  38 ++++++++++++++++++
 .../res/drawable-hdpi/ic_wifi_off_96dp.png    | Bin 0 -> 1918 bytes
 .../res/drawable-mdpi/ic_wifi_off_96dp.png    | Bin 0 -> 1435 bytes
 .../res/drawable-xhdpi/ic_wifi_off_96dp.png   | Bin 0 -> 2933 bytes
 .../res/drawable-xxhdpi/ic_wifi_off_96dp.png  | Bin 0 -> 3983 bytes
 .../src/main/res/layout/transfer_fragment.xml |  28 ++++++++++++-
 graphics/drawables/ic_wifi_off.svg            |   4 ++
 graphics/update-drawables.sh                  |   2 +-
 9 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_off_96dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_off_96dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_off_96dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_off_96dp.png
 create mode 100644 graphics/drawables/ic_wifi_off.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 53ab375f1..7a0006068 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
@@ -23,6 +23,8 @@ import java.util.List;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
@@ -76,6 +78,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
     private KeyTransferInteractor keyTransferServerInteractor;
 
     private boolean wasConnected = false;
+    private boolean waitingForWifi = false;
 
     public TransferPresenter(Context context, LoaderManager loaderManager, int loaderId, TransferMvpView view) {
         this.context = context;
@@ -95,7 +98,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         loaderManager.restartLoader(loaderId, null, this);
 
         if (keyTransferServerInteractor == null && keyTransferClientInteractor == null && !wasConnected) {
-            connectionResetAndStartListen();
+            checkWifiResetAndStartListen();
         }
     }
 
@@ -115,7 +118,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
 
     public void onUiBackStackPop() {
         if (wasConnected) {
-            connectionResetAndStartListen();
+            checkWifiResetAndStartListen();
         }
     }
 
@@ -175,6 +178,11 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         op.cryptoOperation();
     }
 
+    public void onWifiConnected() {
+        if (waitingForWifi) {
+            resetAndStartListen();
+        }
+    }
 
     @Override
     public void onServerStarted(String qrCodeData) {
@@ -200,7 +208,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         Log.d(Constants.TAG, "Lost connection!");
         if (!wasConnected) {
             view.showErrorConnectionFailed();
-            connectionResetAndStartListen();
+            checkWifiResetAndStartListen();
         } else {
             view.showViewDisconnected();
             secretKeyAdapter.setAllDisabled(true);
@@ -249,7 +257,18 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         keyTransferClientInteractor.connectToServer(qrCodeContent, this);
     }
 
-    private void connectionResetAndStartListen() {
+    private void checkWifiResetAndStartListen() {
+        if (!isWifiConnected()) {
+            waitingForWifi = true;
+            view.showNotOnWifi();
+            return;
+        }
+
+        resetAndStartListen();
+    }
+
+    private void resetAndStartListen() {
+        waitingForWifi = false;
         wasConnected = false;
         connectionClear();
 
@@ -259,6 +278,13 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         view.showWaitingForConnection();
     }
 
+    private boolean isWifiConnected() {
+        ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo wifiNetwork = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+
+        return wifiNetwork.isConnected();
+    }
+
     private void connectionClear() {
         if (keyTransferServerInteractor != null) {
             keyTransferServerInteractor.closeConnection();
@@ -296,6 +322,7 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
 
 
     public interface TransferMvpView {
+        void showNotOnWifi();
         void showWaitingForConnection();
         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 251933cda..d4ef472e6 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
@@ -19,8 +19,13 @@ package org.sufficientlysecure.keychain.ui.transfer.view;
 
 
 import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.graphics.Bitmap;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Parcelable;
@@ -58,6 +63,7 @@ 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 REQUEST_CODE_SCAN = 1;
     public static final int LOADER_ID = 1;
@@ -72,6 +78,17 @@ public class TransferFragment extends Fragment implements TransferMvpView {
     private RecyclerView vReceivedKeyList;
 
     private CryptoOperationHelper currentCryptoOperationHelper;
+    private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(intent.getAction())) {
+                NetworkInfo networkInfo = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
+                if (networkInfo != null && networkInfo.isConnected()) {
+                    presenter.onWifiConnected();
+                }
+            }
+        }
+    };
 
 
     @Override
@@ -108,6 +125,22 @@ public class TransferFragment extends Fragment implements TransferMvpView {
         presenter.onUiStart();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        getContext().registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        getContext().unregisterReceiver(broadcastReceiver);
+    }
+
     @Override
     public void onStop() {
         super.onStop();
@@ -115,6 +148,11 @@ public class TransferFragment extends Fragment implements TransferMvpView {
         presenter.onUiStop();
     }
 
+    @Override
+    public void showNotOnWifi() {
+        vTransferAnimator.setDisplayedChild(VIEW_NO_WIFI);
+    }
+
     @Override
     public void showWaitingForConnection() {
         vTransferAnimator.setDisplayedChild(VIEW_WAITING);
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_off_96dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_off_96dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fae3d36c9322f676e95d3cc62eb00bcb8bf1c556
GIT binary patch
literal 1918
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
Ef?&)|BLDyZ

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_off_96dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_off_96dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..76a879e752a38c2d432d5145bda88fba2a0d388e
GIT binary patch
literal 1435
zcmV;M1!Ve(P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00004b3#c}2nYxW
zd<bNS00009a7bBm0027<0027<0nE0cg8%>k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11sF+0K~#90?cHgp6=fX9@z1?RWiBlyWtnD+tyDx1y@^&L+9)ET
z7m-m^*h0N10s~tRE9!+16fKk$6%iCh(qd2=MQKKxVVjv{i&AEmx!l`}IT!Wnz2`aS
z&df7&X1?&}yg7Hy|Nr})XZ|zKd7in{)YR0})YO!QVHgoRiK;RTv+*8AMb4#ibmJ-X
zHlj8mN4oK(E#lWE<VY7Dw!QeZ2|4kYfyM8O`4|~1!A|E&Y}VX_dL*<#SK#}u!XuJi
zFc=GPHvS$$PNOjyhvE?IgK>@5vDi&=8QhKC8-Mdh<MmI;m*Lk&tiW&h5lgXTtM`_U
ztI;Ff)6rO*hr93^ehxVPP-7+L;Xz!C{aaQdBG*XQgoCj>;CNZbay*O6B_plSTr13k
zca_V8zUaXs+=-)F)FwBs)7d6$9iL$uCbgtc4utlE1;Vb5CgQt*<Hd^2cvEtk8s36V
znKD(nBjF(Y5OBQMu~ITB#)M0iK4UNg>xCuVX(sey9Uj8?K+RHN6mFATPq&(Ir<{)Z
z$A6Ohq<sTwYnzeU7rqK6^h$0(XJU_l`hw|}G~87wCfbRoqpf2#Zjk(bG9-?Z%<*KA
zWG9b=zF3SC18Urk(U^rz87CMz5+*6<Na$^7IIE#)5GUd591{#32@{leB=kzYK&K2=
z;4ZjN*wk~{@s9A3u&e-Lwi}xzO?v14g^kDik&~;+Na)2v{iZgKmE2UsPOK^>{EHL%
z7j;<y603>{R}56t0|iK~RTI7~K)$WS{eu-W408*RWT%?&7Itb@&|dha0LgZm3Cpl|
zKrP@H$-GAFq&vlge{g(24cl;$u(|#`V!ra4(1S|@a^E5M7NCH#n=msV=K<-KEEkDg
zL|ILELkcsZd&+lis8dY%UJFgP8Ao7E#A3>3!de_1kY7t&s5niz&xDW(yu3~5!6gBC
zwZ)7a3n{A!_XOnAHr;qNr$WkT!s}9Ky3H7kFEcJAOB1rX%U>$xAL9q(aK&oMt(b6t
z^i5bR!aC9m6ssx6GNDJZ%smQs2PD|(CQJ_%D+{_Y$Iy!?s|l}YzH2CRM&S$bMbF!W
zuWZ>O6`jLu*`HOU$jXGjaAZpg<-qykENRKxgv~g&MQw6py7+=;ZNeR`ijpT?cu{=8
zvohgj;ahv7F$$lHFZhlkbS>(ROjx2oO}8174SgR$kxW=4nUXIRXUTqbbsi=x#W`(i
z5S?k_i#<@hEqUxgGYYdKvK_kcg7{(&btIIUk&?~MvBj>m36rF|$E-G?4bD{Drd$~l
zZWmwZ!D61U##~yu@Vxj!S9&Cjz^CF1U1<{z#P8w@U1<}}Q0%5$2@`G=U*t-g(1qv3
z6L+DoACWrx>S(w`h`h!BL~=neMVJX4JrX8Lp6{8L_^TyPV(Ftc0jFc5?8V<CnJVv3
zZ31qQy#Y55^7*w1ctUpKKNIlzl{aBmd?bDG7Yo0Vsk{jjq}!BNY5l>gl{ev3=``hy
zjbpV#=%f4Rw0Zo(bCaPPaN`hjXf_hoNv_~JmdCX({?jStFpvoyFFr|A{!r`Ue=ObU
zgZ?H|Li|4V)7n3G_(ig&CvEynsFe79oQw^ci@%}q-mI8{(=t4Mp}Agj1ExmHt|B~Y
zVDV>1%&Ri&f)8vj{vst`Mp!1s;V0WR-CUpHUz0pydA;nLZl+}ZT!Rc*A(`Wui<ctj
pQd3h?Q&Uq@Q&Uq@Q&UqD#QzhbnXDaAnE3zz002ovPDHLkV1kQ$qdWir

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_off_96dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_off_96dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4e09119f4d3edc3863c8454d293e5bf041a4668
GIT binary patch
literal 3983
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
b@_?(j?p%MfB4ighJcBIFE?=xM^|=2Z-B5RS

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 7518b3434..45d826c13 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="02">
+    custom:initialView="03">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -140,4 +140,30 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        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_off_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:text="This feature can only be used on Wifi."
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    </LinearLayout>
+
 </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
\ No newline at end of file
diff --git a/graphics/drawables/ic_wifi_off.svg b/graphics/drawables/ic_wifi_off.svg
new file mode 100644
index 000000000..b4332030b
--- /dev/null
+++ b/graphics/drawables/ic_wifi_off.svg
@@ -0,0 +1,4 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M23.64 7c-.45-.34-4.93-4-11.64-4-1.5 0-2.89.19-4.15.48L18.18 13.8 23.64 7zm-6.6 8.22L3.27 1.44 2 2.72l2.05 2.06C1.91 5.76.59 6.82.36 7l11.63 14.49.01.01.01-.01 3.9-4.86 3.32 3.32 1.27-1.27-3.46-3.46z"/>
+</svg>
\ No newline at end of file
diff --git a/graphics/update-drawables.sh b/graphics/update-drawables.sh
index f4c998e4b..1df705739 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 "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_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"