From 3ca3baf7803480f7d9c11929fe81b75c402b71c9 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 30 May 2017 23:01:10 +0200
Subject: [PATCH] tls-psk: fix drawer icon and text

---
 .../keychain/ui/MainActivity.java                |   5 ++++-
 .../main/res/drawable-hdpi/ic_wifi_lock_24dp.png | Bin 0 -> 614 bytes
 .../main/res/drawable-mdpi/ic_wifi_lock_24dp.png | Bin 0 -> 445 bytes
 .../res/drawable-xhdpi/ic_wifi_lock_24dp.png     | Bin 0 -> 708 bytes
 .../res/drawable-xxhdpi/ic_wifi_lock_24dp.png    | Bin 0 -> 1095 bytes
 .../res/drawable-xxxhdpi/ic_wifi_lock_24dp.png   | Bin 0 -> 1379 bytes
 OpenKeychain/src/main/res/values/strings.xml     |   2 +-
 graphics/drawables/ic_wifi_lock.svg              |   4 ++++
 graphics/update-drawables.sh                     |   2 +-
 9 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_lock_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_lock_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_lock_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_lock_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_wifi_lock_24dp.png
 create mode 100644 graphics/drawables/ic_wifi_lock.svg

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index a34d470bc..743536bdf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -84,7 +84,10 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
                                 .withIdentifier(ID_APPS).withSelectable(false),
                         new PrimaryDrawerItem().withName(R.string.nav_backup).withIcon(CommunityMaterial.Icon.cmd_backup_restore)
                                 .withIdentifier(ID_BACKUP).withSelectable(false),
-                        new PrimaryDrawerItem().withName(R.string.nav_transfer).withIcon(CommunityMaterial.Icon.cmd_backup_restore)
+                        new PrimaryDrawerItem().withName(R.string.nav_transfer)
+                                .withIcon(R.drawable.ic_wifi_lock_24dp)
+                                .withIconColorRes(R.color.md_grey_600)
+                                .withIconTintingEnabled(true)
                                 .withIdentifier(ID_TRANSFER).withSelectable(false),
                         new DividerDrawerItem(),
                         new PrimaryDrawerItem().withName(R.string.menu_preferences).withIcon(GoogleMaterial.Icon.gmd_settings).withIdentifier(ID_SETTINGS).withSelectable(false),
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3881c3f1b201cd15d66ed02512cb68dc070f6d22
GIT binary patch
literal 614
zcmV-s0-61ZP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10pm$TK~z|U?bg3*6hRoq@sDCo3z7Jvh!$!o7Fvi!tON^N3$?Zo
z#SpZT1Z)HwZNxN!poM=yK<j`gf(TkDir5I^8Ab3;o8+|6V&~v8UhZ~h_q-JMz{|43
zJMVsX_Stuakwz+~b&2yPupc`xj;&$5fhNA;ExwioTupm%2@g@npPW$-b1q^}S%}S;
z!pi~x{o(~Kgxa~a9XDi4Ulm9kO<c#eULa$b88Ap34O|Y-UZI0{{U1T%c!dLPn0;6p
zB1}7$0t>ja27qpNezGw<9wN+B)I^%Vry;=9v8xRccj`$z>PB0U8kolud<oD0fOown
zoimt~xFy?Wl2o<H&!&R3Rg)R5s+FlkI~ChVyTy0^ex}1%knITXaSa>uLQSGo0_a{B
zm|ysaIXnn?^Lc?NXYw;qt%U&7xv9>C++#(cQcZq5s`CRkqp|UjI}7V`0!_<$M^Uw+
z`z`nxjWxq{QxTxwI4v{zno?1d9}V+%<4vF3Wn4*tDq`|OVa{yM{N)rN@|k?DBmZiF
zmq=2-<4Sy-$PJX&)UkS*d=aN)4Y06Mfyj;zC$0RoTR4HwsYS~G!84rixSz)JG6gr3
z!pU?WM`RwjyGl;pzb9^_$*Spn${c7P8fmEd3%lw1zw9us*Z=?k07*qoM6N<$f&h&O
AkpKVy

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d4b657d33207ae4b3687931f82a95eee7caeaba
GIT binary patch
literal 445
zcmV;u0Yd(XP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10Xj)UK~zYI?bAI<Ls1X~;7`E>OAA4*jBY>>K?_%4EtWRMO7{@l
zfsGJw8$t?=pb{HV+<-RzfEG3uMj=|{KJxO&&r3|e!UMzmnS0Nfb7wC9=z@_Bxp}N%
z5et~aM99721-H1u5$@6mj$<1)`0g>Tkq;a#ovh=&58`Azgd#^H@;OunK%9&V<X{;e
zLlF4HYUE;b2m<-&>?0Jz+4YMjl<<mY>?apw^w*0T3Soa&%!EpM5h(QN)C#I8$sdso
z`*JwJJB~3+Y*u5q#BR!BN}(7y#3`n57QQ>8n8LwcY<*Ru57|h#m4gU7IPX$KE%u&K
zpZzAWP6A)pP#?K&D2Hd<UHpGXv}^hYmRb-eBNbZR^sQL_*8(&*{UDJWh`^Zo_*FD!
nf1m;|9U_Tx8}d|5{@eHgoxS5O_ul>M00000NkvXXu0mjfSxmF0

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..621506209c48327cc25adad6e51ca12b9026a98a
GIT binary patch
literal 708
zcmV;#0z3VQP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10zpYcK~!jg?btnQ6j2z(@t=tiB_KB9OOiq`ilv33U=aKUN>T?D
zgJAFzL=mwSUz>D+bbbXzG@y;3rJ$w|M6i>%WHm8~#Z1UDyR$nxFPRDKfro{?bNBww
z>>Tbhm!5j+si!ivE93lroW$v{PGJOxum=ai>we)ce&Rbm;UhlaGuAS4bfpnY<0Wd?
z$XGSJz)cJn1-&1)@E+?qK*!a3xW;t2W@e4z8I}r!j;kd+#ql)Y!<fZt3E<IM!*d)<
z0=^IT@uvdd(W>Jf_Qt_q#McUdcB(HJYXtAdUHq#6TsM!^V+{1650^qCJ4Jms6Mllj
zf(@qZJDaqA;Aqs<In@krwCXt9>TiL`3IKMhYjN<Knymn2Ts`arPtb(DD-m)T^O(R1
z42E1o*qy`x91#R%yW!{L*wCF9w7}Z|zJjT|z#BEWO$Kfh0l%rDLp@g{JjI53S^P6U
zjs?LBPYrKyC9R2~LOma|-lH~i9;7u<M5rfPtTP^ttzt&dG7RCit@o45X-!P!Y+$s-
z8VljrOpCEQ;n?f62FN$mgPOH@P|(z@h2L%9cNPN!w(e5aYNd8#NyZZ?ulBn%1LV_w
zrvc2(0NF#`s4*;dF?Uhq-8ikXgt}4Pz&D!6th77ztH|%<`51PsZbSVI2diX&<e{z$
zP86al-2lnj@2fF$D`9~4p?=b4US$l#?bL4tfv>y)nnT_4AS$9t8DJ~aE4Yy0`pOv~
q*r~54ytcHBEH9PTO7zszPS$@Uo$B8`Yr^yZ0000<MNUMnLSTYY>Og`3

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8001979380616469ca0467f4fe949327b98120a
GIT binary patch
literal 1095
zcmV-N1i1T&P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm001mY001mY0i`{bsQ>@~8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11H?&0K~#90?b<zv9aR{{@n7O~N#R$Nh-;xBhU{Wt;a3t7{H#S$
zJ6(jJl|{s$MT%IcK`pef&`t$AD@_%PL`?jMg%|`a6n8aIlthI<HraKP;@pdKFLUqA
zoy?h;d!0YL4D24xdCxO<9?p5sp{1pzrKP2%rKKf>brp@%!40?xbGRPYVis57if+4&
z-REE3=ifMi-*5~|_#WTkC#=R!JeEM0<8IuE?YIRSN*-ewU*j+i;UNAgd5luoj2DDN
zS8%T4Siu22j~nAoH9uG4S>a7qEl5@z!Om`ul{1GoaVlrBb;dH@!_85YNU#nM<I|cZ
zT1FhiLn3(Z{hIk16^)~Kv<zXk3#!*Wp;&PMTZ;&@QSg|58!(C3u_k!bro7@T;Lipm
zUUmF|$43cs89r!0qIJiIQkDjH;Kv3e*OXYqU9i3@(44SWY6)D2`N2QFt^POHlz1ym
zwTn&mBCxDDgqbvf;2QkefF$dRC0spBoE}?+{Y%}+Rvo8tTb4LI78;On)$wFraeDlp
zO#8KAB8=MA&Io&zZ6n%D3aj`AKj65qy&#l(JJ=y?tHx%w+hN^rxM=LhW4NTq<nuC#
zru`M}jUmP`79va{Myz44|8@wK(sa{4B~%M*qsc4nHNk6Yr>QIL-7zOUF57TM{i5{Z
zOVyna=jJK(3)72xa^%~=6WAv#Th4Z$9}88)i;BrGnkJa`{v3JE3upPG`Z<a%#bg-H
zjBqYqr$AZ8Jdcw(`#LFtNOi8XS8(Zw+&cPyIcM;)aBe>%+$DHLzn^|9!sk|(X&=eR
zYeBy__YG<HfZ$2Jwj)nAic*JZzn_uQzC_!XGTQD<wEZa8j0;e;X}_M4Px8~>oY8hm
zqV2JK(;c6xP5Z@+d{z@}vwWqKXxn#dt;|i`S>g6av^Oxoxs3lOMaio5Bt_{Hv+P~(
z?|4Ko#i<}hS>Ovi9iiV^h*dXv7w<&syHa8nmY%`q5&KVLJ)RTJx02*B{Ul4>exeuN
zVy?9Jq>Q(#<S}-YqCy6-YTA2J##$<Qj9<!;Ae*vR+G}_)Wt<ql)XFGxrTyxVF(z7|
zvTE9&2rJ(-CR!jayr#Wq^kvJ57l`7feHyoB^gR^<QS2Zx&+Ut;5s2|j`;DA^PL)7;
zP5Uz=uEY&6RRWQ1+Q)^}cwVMXAcmXvGHxHUuc;J>bkp8Zpr5G~h<?*fy{DXmsTQbb
z+K1&g<v|veE6&da^N7Z*@l1J;i7a<iNwQ#eA;MHvFl%XPX=!PR$9aU<AXopwPxk--
N002ovPDHLkV1nK-2`>Nu

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..447c5d1557bebe4e3054bf4f09e28dd065b1e69d
GIT binary patch
literal 1379
zcmV-p1)TbcP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00004b3#c}2nYxW
zd<bNS00009a7bBm0027<0027<0nE0cg8%>k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11mH<TK~#90?VU|%9aR*^f2nP>)<ldSHP%fPlz^yMMN5q<mx3Ex
zMI#Rsx~W!lW4kLT=%$OhF;cAHO6#tRLMeWrR#6lL7csTcw5CO^jW!8sO-gie=h<}f
zX5PIs_iJX(4-PMjcjw;oKl9#s=gyf42!bF8f*=TjAP9mW2u-0U^a46?EieS!39JKd
z25tq`Ce{O7m%O+A`qz@ze}UhD-+)s~UVlpLoO2Hh2pxd6z(!yba4$;ub&ltp1jc|L
zfFr=yz#oq1jD`W=N#H%;80u_|!F~qz0b98Asj3aP13OV?+eN~Q-OVlnUjjRT^$zs#
z!XWSp@Gap5Eo<KZFQal%)T{s=1@;5;gcr`mC*v@%8MwldW>&Zc*be+cc#(YBG2jJY
zjRpM*GXT5}oF%*<q3kU18lDsP8sJqf{pJ>fY2Zzuzl5$`Sp{qbPDkKytab)<a$Z$X
z<4m>y6A?IA6*~?*QAFr8w*dzuaHy*GF>r^m>Zq@qmw=fFoT$3Z0lR=Jb;Tb7zK>wx
zb+aFVyYqza0bWE!Ec9aQYIDFgI&6aW10O}Oz^2#%lG<TK5`e2w+rok$?nh~U84m#$
z2!D3e-Od9KW<{nI!2;`U&u59>=A8%@Sy$WBO?*%_z~>Pxwr=(X(5n*wP!}I2BUp4@
zYy!AZSNt}Tl<n9Yu)$FK|7k_wK$UF~c*<Dy6q1yS+ZzS+UWO#)Vs;3PYsb2cS%biL
zz%82ZuPgJYMy}6Lja}oY&bwJ)0d*nfCg2{_ub#hcPQDTNhwx`s2pdCfqFrBF#gc3#
zycj<1II0b$y=N8$O-Ra%z-~Hhn8iRZs?9L8NUm%ec+8qwju=F>e1{gxww*z36<30~
zRm#(ps8~Z$m!!N%1-^E&s6$fTZCw?QRJ~F@LEt7^8&o+dZ!X~PYG4G_ia(C3glCh#
zKLnn^L3?61s#qzHVP0glfL}F^eG+)q@YtoPT2kI-;M*#S<-5^jtT(EXl;?pP4E%b#
z#9Z$h%u||P;Hwgg^<|$L_|)n!egW7EJPh<DHjEOx)6Iw@2J@9>kofN-*rn;qYL<WJ
z|A`Vli(!`EIdl@wi8=P9{J5qcBdKu<<cr_t5te@vp4Obx8Zjs3Ax$6lr^f9y@PA)w
z><0#8tr2Td9?)F>(bTw22EGrc#*Q0|wMML!vTl>qY-(Jef$x2(u`>o^trBCSmo7!e
z*&1(+*tV~AsZ9VNu0}6iY83#8Cn@Vvy8y(Jly#|H03eQ}tV=Be0O2d;Jo-_)m{Shs
zol1`F^tlqcgshaa=tmVyuIC>ok|2ai%2|whT*IibS`G-ceVv7iubnKLGFHnGzPGQB
z=By=_6Tv&aD&-mAuAFr=HUQwhQeH$o`zVh_2LRkAWu04w8Xo{xmGWWq9yi(e0D%2U
zc>?_o2nj%ft)x5$+-ESa1Yij*$~)LHoKpgjqD)dQ()BC>NKrH?e*&y5FrNgV1Exv&
z1O*<BkstxcKsPC$2OcOfj|3ox7Tq0suH+mNfG*@E<+m&xUjopDtfYJdgC|nuAOX-I
zos>^w??ECG08QH0lrNwXv@N_|kcsMlp%^lW`u|@CQBR_^#d`eRE&sl!c`8NYF3QJ9
lW7<*#K@bE%5ClQ+&wo0;p5#8cFh~FZ002ovPDHLkV1jJ?WX1ph

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index cd28f0126..3cbb268de 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -848,7 +848,7 @@
     <string name="drawer_close">"Close navigation drawer"</string>
     <string name="my_keys">"My Keys"</string>
     <string name="nav_backup">"Backup/Restore"</string>
-    <string name="nav_transfer">"Transfer"</string>
+    <string name="nav_transfer">"Secure Device Setup"</string>
 
     <!-- hints -->
     <string name="encrypt_content_edit_text_hint">"Type text"</string>
diff --git a/graphics/drawables/ic_wifi_lock.svg b/graphics/drawables/ic_wifi_lock.svg
new file mode 100644
index 000000000..b06541558
--- /dev/null
+++ b/graphics/drawables/ic_wifi_lock.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 0h24v24H0V0z" fill="none"/>
+    <path d="M23 16v-1.5c0-1.4-1.1-2.5-2.5-2.5S18 13.1 18 14.5V16c-.5 0-1 .5-1 1v4c0 .5.5 1 1 1h5c.5 0 1-.5 1-1v-4c0-.5-.5-1-1-1zm-1 0h-3v-1.5c0-.8.7-1.5 1.5-1.5s1.5.7 1.5 1.5V16zm-6.5-1.5c0-2.8 2.2-5 5-5 .4 0 .7 0 1 .1L23.6 7c-.4-.3-4.9-4-11.6-4C5.3 3 .8 6.7.4 7L12 21.5l3.5-4.4v-2.6z"/>
+</svg>
\ No newline at end of file
diff --git a/graphics/update-drawables.sh b/graphics/update-drawables.sh
index 1df705739..ec4f972ed 100755
--- a/graphics/update-drawables.sh
+++ b/graphics/update-drawables.sh
@@ -22,7 +22,7 @@ SRC_DIR=./drawables/
 #inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
 
 
-for NAME in "ic_cloud_unknown" "ic_cloud_off" "broken_heart" "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
+for NAME in "ic_cloud_unknown" "ic_cloud_off" "ic_wifi_lock" "broken_heart" "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
 do
 echo $NAME
 inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"