From 3bbff31d4720e51c69033addc50aaa6f2da2de7e Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 12 Jan 2015 21:04:18 +0100
Subject: [PATCH] add dns button to linked identity selection

---
 OpenKeychain/src/main/res/drawable/dns.png    | Bin 0 -> 2043 bytes
 .../layout/affirmation_select_fragment.xml    |  37 +++++++++++++++++-
 README.md                                     |   3 ++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 OpenKeychain/src/main/res/drawable/dns.png

diff --git a/OpenKeychain/src/main/res/drawable/dns.png b/OpenKeychain/src/main/res/drawable/dns.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d0a4fa831b818ae53712b57117c44b1ecc42ef
GIT binary patch
literal 2043
zcmV<X2L$+uP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000NVNkl<Zc-o~`
z2~bp57Cry}-a!xo4Vf7;rjm@tinvrtox&J(bc_*2(6~)Tqe+H|nkY-6?7NDh<5DIC
z1x}(V9W{ncmNB>l)G>mxHsVqeBc^DuK)|N={&Qb<<A71az^l6T`~Cm!x#!*Oz2*Q&
z689g?1;@`5MUkdVoZ|^Ud7h_<tuTJw(uFj&IA0GMgQNMdg#E|5)~=ZgUbKSedRL3E
zIkiN`l;#{+<dOAN2@=*VaiiDW&eem)U`xGY_a1HySv3a}5}M$t5};Jcpj1epk_nJY
zIVc4{Nu&irj-Ka=L;pIB<WH8XNw>{uiZG54#-INWj8ei_p=JcsF}uIku3kP1v-h^Z
z%R>$qr3?yER!Dg$Bpl?VET=tiHW6$6c^u0rL&}B~KBU{~B%qGjbC@t@V)mXs7;?gp
z6Nd0hjHBP4L+ZwNee49Hh`@@VX;^$n2X9X~v6ns~pd`i$L4=&MK{Np?{fx*h{tr?=
zS>B((-Xq#&f&Tq57y;RnFbv2!c>!BOodhCx9n>zI=Z_BxL_9~zF3f#ODOBV-;sGVC
zl2dHWCK16ecA~hn0_Nsw2vRAjbFi9Cko|5v7R;T55Ap|qF|q?ir!HY@*h&Y1&FNoi
z=ggXnuyPl84JYO<au@{xIvWq2(FTjr46EJ*{X-+NXBu#(yc#tn2f<5aWS$W)V%%FR
zF?;$%gqA4@gWT^Tdn!iO3_VKEUdFbF_Z$R1+wo8Bw5hKnvBm=e(bWkuqO1TfmqN5q
zrRj|jNqV|X*fY5U7cSRh>xLD9(Xk16n%ZjQ=H&)P?mnF7KgAD;)x&=sV^RmoE?&X*
zh}8}PpKj0APJDelV(WZikx9V2DD27{B@)aQh&ltr9s^7|6Vk_PQFT>=?csl&5*ZzP
zNmEme{F4P!Hl=@cX~M*@h^g}-41q9|PsbS7f~%F)*zwu>4g%q6+1gQl<FIt*C@NH|
zqhNc5<5-yK!D>jrk<#n9snH<)(^Y<(qhe|`HB~4mEcA=mexUXbWBs0i;SkP=aigvV
zJ2yE9c!xx#=O|s>{B2enY$9bUm5P;qi}afr76hK2oV|nb1kj`FF3U^}TT2A$8)}&c
zPQDfrv+HxE%5~b~7`9#v(&c!8gd;qGa-s7==9cgvdnY7$fy9foR1)dOsTsxZ1kQp)
zCWpmj#PPgR?28VWOW(}S_IsbiusJIB*0uUt<mKnROmjtFjP)s*#ft;~1YRPA(P+ds
zd1sIj{|k(tIH!Wr3Bcy=D?^iZ5A*bXoAq_J^X~SxqJ#g4+eqI!oh{wKh!cT(jhcE&
z!kpha+j1|4+miKhslQhbU*aw?Vb+W{QF-Mm+U~c*Y&Mr&xl$4K?~>x1w63SOYxf<l
zBqLa8*iM{`S<Agk^03c3_2%eUZ6oDFZtk~zn-UxDQBl!fySWb!ShP48-p_fVt*wo6
z(Tbb5ZlSKO4xOD3f_9{B%YPC9p^rx>^X%sd+p(U++Mht2_BweWr#}HMJYrL@+Q;Xc
zMT>$cUwWWvxCX1uMx9ZPkuQvZm$x^vvJW67DPHv?0s|fD%~5gM#)kUGJ)lTR+4|$O
zH>UbL@9T>nDk>qRj@i}KiRR{Ju&}biFc|dbckW1AFeCyIk@4DV<blHc6MYGIBqncZ
zU;9xA&V64FlZo22Oa=|DONfi<O+u?PtUnEjz~94@v>K}C@>Bf?sN<7TwV@l<Bfp@?
zzI&BQh04kbBqzp?rtcm2Un1)VOF+2(`K+T#xqJ~j3wlh(6Qe%*ZmDx;>iEPIE%U&s
z?@rT!q_h(#D=){k)TGCg6}<#xlu*WjSQbSxXciFm(ix0g6=Z++<Ci(ub$dD#yag6I
z8I>vp*1W$OHC46t6H`SknN>kmb(Q__;_O#4v1I$UE%SQ`cmypBZXXB%8xhc%d1TDH
zi;;n^(G|>wJGr&^TfQ%3oC&XteiciWEyw6FqjCB2Rcb;8xVpO7J)ux2>`#eAf{e^e
z>`2?{_J{z<i_YgjhU9GAt1;?f!c?ivgr=6R!nyh_W?wIl$=TCAo}V#!0xGKN@Sv;P
zZk&aHC8C_lkR|2$ix-iVnGsZ7b@kk%5RkaQ(Rc<jSdZ`|aVOzDBaUy}_u=9NKiuoY
z@ydF9{E`KeRC>_e182^C4-XGd+O=Re-qh4|;beYpa%*dABk8sbHVJ#%x65y03o_G|
zy*2-#S;V<J?a*6AoUN-z)>s41pDt<Lw}1aCI7*KVb_R5jXh~SejYBCziCa|8@h|=|
zZ=sD&%e)4yy=7WO9&I{3T5eb4c0#Z}z51D?r#FR|Q8>D){XfN^%g{UOMAn8mQ{VF&
zp~jK=78uM{SP0%MvMZPwjdyNzw8hMx;3Qyv8qi<~xQ^L*wmb9P={Qt%A6mNSk>@Gq
zRH6nW#kt{rb9}(tw2qy451s`yC<4RYc;}Td%R+BN2K*5RDt@;2c1i*0?8Y@@e10G;
zYl7p<H$Mw&Fa(&6k56Jz^O`ru3bkz<1y;aAy`C9wC*$)6YJ4am@N}6JFvBfi-7&ge
z@hXK9y1R`<_jZ4nOyBMd)c8;c$e9;N*iA^~G{$1x0>@!9Amc+J!1QEJ<E(i-?b7nA
Z<G*oiqKY=OeR==@002ovPDHLkV1nB7>I?t?

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml b/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml
index f9c28c5c3..37757ce64 100644
--- a/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml
@@ -66,7 +66,42 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="Website"
+                android:text="Website (HTTPS)"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/affirmation_create_dns_button"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <!-- separate ImageView required for recoloring -->
+            <ImageView
+                android:layout_width="60dip"
+                android:layout_height="60dip"
+                android:padding="8dp"
+                android:src="@drawable/dns"
+                android:layout_gravity="center"
+                />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="Domain Name (DNS)"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
diff --git a/README.md b/README.md
index 10d07747c..c6a28eb76 100644
--- a/README.md
+++ b/README.md
@@ -236,3 +236,6 @@ Some parts and some libraries are Apache License v2, MIT X11 License (see below)
   
 * Purple color scheme  
   http://android-holo-colors.com/
+
+* DNS icon
+  http://www.fatcow.com/free-icons