From 78998d0c93265a2c668df94d5240ef5f632fd7af Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 23 Jul 2012 13:42:29 -0700
Subject: [PATCH] Clean up key/identity verification Activites.

1) Get ride of the crazy button situation.
2) Actionbar-ify and abstract out the common actions.
3) Switch to full activities from dialog themes.
---
 AndroidManifest.xml                           |  35 +++-
 res/drawable-hdpi/ic_menu_barcode.png         | Bin 0 -> 1727 bytes
 res/drawable-mdpi/ic_menu_barcode.png         | Bin 0 -> 1010 bytes
 res/drawable-xhdpi/ic_menu_barcode.png        | Bin 0 -> 2487 bytes
 res/layout/change_passphrase_activity.xml     |  73 ++++----
 res/layout/save_identity_activity.xml         |  86 ++++-----
 res/layout/verify_identity_activity.xml       |  97 ++++------
 res/layout/verify_keys_activity.xml           | 141 +++++---------
 res/layout/view_identity_activity.xml         |  63 ++++---
 res/menu/conversation_secure_verified.xml     |   2 +-
 res/menu/key_scanning.xml                     |  19 ++
 res/menu/verify_keys.xml                      |   7 +
 .../securesms/KeyScanningActivity.java        |  72 ++++----
 .../securesms/KeyVerifyingActivity.java       |  40 ++++
 .../securesms/VerifyIdentityActivity.java     | 172 ++++++------------
 .../securesms/VerifyKeysActivity.java         | 127 +++++--------
 16 files changed, 426 insertions(+), 508 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_menu_barcode.png
 create mode 100644 res/drawable-mdpi/ic_menu_barcode.png
 create mode 100644 res/drawable-xhdpi/ic_menu_barcode.png
 create mode 100644 res/menu/key_scanning.xml
 create mode 100644 res/menu/verify_keys.xml
 create mode 100644 src/org/thoughtcrime/securesms/KeyVerifyingActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e41c4179b8..653129bd3b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,18 +43,41 @@
               android:label="Select Contacts"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
 
+    <activity android:name=".AutoInitiateActivity"
+              android:theme="@style/Theme.Sherlock.Dialog"
+              android:label="TextSecure Messaging Detected"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
+
+    <activity android:name=".ViewIdentityActivity"
+              android:theme="@style/Theme.Sherlock.Dialog"
+              android:label="Public Identity Key"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
+
+    <activity android:name=".PassphraseChangeActivity"
+              android:theme="@style/Theme.Sherlock.Dialog"
+              android:label="Change Passphrase"
+              android:launchMode="singleInstance"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
+
+    <activity android:name=".VerifyKeysActivity"
+              android:label="Verify Session"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
+
+    <activity android:name=".VerifyIdentityActivity"
+              android:label="Verify Identity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
+
+    <activity android:name=".SaveIdentityActivity"
+              android:theme="@style/Theme.Sherlock.Dialog"
+              android:label="Save Identity"
+              android:windowSoftInputMode="stateVisible"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
 
-    <activity android:name=".AutoInitiateActivity" android:theme="@android:style/Theme.Dialog" android:label="TextSecure Messaging Detected" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".ApplicationPreferencesActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".PassphraseCreateActivity" android:theme="@android:style/Theme.Dialog" android:label="Create Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
-    <activity android:name=".PassphraseChangeActivity" android:theme="@android:style/Theme.Dialog" android:label="Change Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".SendKeyActivity" android:theme="@android:style/Theme.Dialog" android:label="Initiate Key Exchange" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".ReceiveKeyActivity" android:theme="@android:style/Theme.Dialog" android:label="Complete Key Exchange" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
-    <activity android:name=".VerifyKeysActivity" android:theme="@android:style/Theme.Dialog" android:label="Verify Session" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
-    <activity android:name=".VerifyIdentityActivity" android:theme="@android:style/Theme.Dialog" android:label="Verify Identity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".VerifyImportedIdentityActivity" android:theme="@android:style/Theme.Dialog" android:label="Verify Imported Identity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
-    <activity android:name=".ViewIdentityActivity" android:theme="@android:style/Theme.Dialog" android:label="Public Identity Key" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
-    <activity android:name=".SaveIdentityActivity" android:theme="@android:style/Theme.Dialog" android:label="Save Identity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".ReviewIdentitiesActivity" android:theme="@android:style/Theme.Dialog" android:label="Manage Identity Keys (Long click)" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
 
     <service android:enabled="true" android:name=".service.KeyCachingService"></service>
diff --git a/res/drawable-hdpi/ic_menu_barcode.png b/res/drawable-hdpi/ic_menu_barcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..6478e5c6ea9b96cd7591035940aa815a830195ac
GIT binary patch
literal 1727
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
V-CwV^%0&PG002ovPDHLkV1iNYDqH{n

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_barcode.png b/res/drawable-mdpi/ic_menu_barcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..5580874167842d593cc71d73ce1f024dbe99ace4
GIT binary patch
literal 1010
zcmV<O0}cF%P)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX2Nwno2hywoT>t<Bgh@m}R7l6&
z)y<D(RTTyB-?{gFRCUo+U0rso2pBtobV5`*0S6|8$V5$GLJu?={{$yabV?WyVx0BA
zz}S&-;6xKb{74i?j1ZC{fY?ac1!Z+rz4z`pXFGVO9<K+CoN@2u+>^c5*?aA^&*k&+
zO#cs5Vrr3Mw6T*?pL#_|lHSD3Se7IdRT4(##&H_?NS?+VbT2%8Cl2GkaW_umG|plk
zix^^vAxf0Uv4};?V;-|OiIX^vPvTA-#Pd(<7?CzdH)<)}?@UzRckC}7@s=x|@Oz<n
zzy}`mwl8|rZ}sM$G^*np=}&Po!sPCj6zQk--1VII{ld?^;5)wMMcK>`{o0TG%Cmmy
zXSUq&S1H}yGI7!oUG0-3>GZUkJKajIw0f8O%T@Hz(Jh5c2vq?^$SSI;ww?1;ZInT>
zc8n@i5TXSZMOM@m`FT`osBXQpML}vA6cmG^%0dxqIk}hMywl6H%PNDcDEI6vzvEtl
zXxyRDLf1=(Rzg{+agJdGgHsuSg;|3yS_aiZF{rY<6wjF~uL$yoXRpU#+otem@7eS(
zTV`I<OTvNPzim18M;C3{_J&b>cqWs$cJ1N6Ul~XLo=$bm!Uy*J#|2-pk7~!U9f$67
z)xJ*gRjC{dZ$G-f-|_Cz=B*u<of*trb;;m@ndD1NgQ;S}!pK!KgPF^=ZQOeIh>nuJ
ze)?G2F*jJ)b<y0^9D4?Xg|WfZTxZw9!os%4(l<`axsm3cF_C52hN*015H_3kN!A%8
z7YwSw)HBXLZDUn@&!8A=8q0cFxS$veI#nkNQ$;rTZtKCy2i0W<t=@^EGYA{9sz{1n
z#)d(5V7E2B5iCdP$RHc*<!0xp(n?rbh>@Z=5~7)SjevvmL2Zsp&4HmxY6E?=GXJ@e
zBHGvBP$$XFgQ*QsU0J$wxSE4VqFGspE^e8~CNBDc`~AeW6E}tG3m&rPl3imj8CmF7
z!!SbGzdi1IHxU+IaYOQD@XdDGL#q2#kDExSx_<w*vMgoObvM%2Vw4cEclpwTwW-mP
zZB>8r{++{=2r0)q{^m_*3CXUjF6tU)xc=05XAR$2hNCzCVC=l_$3F70CSTIE8?_zy
z?H~8C&Jap^_2o73m$y$?1J&l`tlTW8w<p*8=u>-jef`Z7NB=0RnAN3}KI_kS#RF-h
gt!Mrj2cHr5KYQBiB!5yltN;K207*qoM6N<$f}(oxP5=M^

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_barcode.png b/res/drawable-xhdpi/ic_menu_barcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..c267e852a7ae6b31bc7ca3a3098109ed3ab145d0
GIT binary patch
literal 2487
zcmV;o2}t&dP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX2Nwnn6$&^b)&KwrNl8RORA}Dq
zna{5zRTalS=iXaY-S1_X83-W(28F-~XizuEMs^^Hi5tR-#GMO6)Ua{kg2au9OGEq%
z*l1WlG;Un7VL(Wb7(j85pTaP{;l1I#ey_Xg-s7T9-MZD&Zw&EAT+p5Fsj0qo?z!iD
z&-eUz@cHZW*XOVQ%a{D`q)u)&^@Ghqwxwnv|5+V60*&r)y)O0l%jIhPC1ge1UCrzM
ztG7ij8eK#rpm-9B;s8*p{7{GD2t*<R2%0zR*E$l|ibPQ5wp59azkTbj@cNR}KQJ6L
zoZkM)ec%0EBLX=3?|$Qci9-<+thOb#v4VXBA!cRN{_PJjtXt|+-~QRTPY!xb`=dEu
z?N@g{uFE5iSklpv=ujdpEgg{#CDEDKWOuNGXx=Q6Y{QP0mPAJ)66siS$RTNY=i`?v
zU-f(UE)bn{CsuP2Ma5B@UV>wRCsNS>a7croL?TcZ&WQ*PC9q(Q0ud$IbG=F}fQq#9
zc)~?iqXM4FZKt3ht?ctdY8-;6<CnBJUglRgI-cY)wy5|f4^r`S_DnQ9z+1e-ik2t%
zF-pr1IYYzu2}HByPid%7QgGWG;E96*&IQ+W6#`1j3p4}-&k8|+OT3KG;dp_QG~A8@
zUgP8J-+OqI*I2P6@)B^!K7!*9)O08vOIFl?NL%?vLn>V0qVIx=%3x4Pxa?QS_au9r
zj0VsGX5*C@I#RwX{YQ{Ch%Ygqh<L#nl1E&RVNxQUd@q>-nqy?#xQ_`fR!c^f_~9pu
z0t8glE;VBt#GEkTJQ>Q#_jK*_r9xvcYRM;JdK5&Iw^G|yvw_R4Mnxo>m%=4eS4hTx
z%GNAxvZerqzf)mQERcF;OKTYDtwIjAl$Do><8*?kt0<t^XvwsdLVW)n?QXKO^{0#z
zg*5Z0W}IxwFK&AJ(Man$kAf4Dl^H=uVR{P1%czjN$FUX|LS-6;Ao*0WumDE6qYV;@
zqr+W+pE7)}>Vh(f=)}9Oi1}o96ER<<9GFt5u9*$k=m@tCL7jMeopQ#j5s*`L6d`8C
z$TUPD?HCJOiFr5itq_Y%WsQi^1oKQVF`!1XGmmw_7=GnLW&Dpo8<a^VG)<^@^mr;h
z6fC(>0Vza~aW4}w>56b0SI0?c_Vq!y!a^G@pys!+pcwp@?5<=5BGH8PbwM8iU8d>5
zda=Nb+N!wbgu(&`?5VKg08hXn2%b+^;aMOEj(t1=9I?wb$!sRT$^ZxpJc{Fh%dGI0
z;=uDMkr_!3HYp(N@eg3h5j7qUI1(3Vaa<;#1U|&$5EgvIoRsqi?9-ac7jOuHOI)BK
zn972(!yy&I<suXVY_U-7SiP&)sL-)wn_!|V{zL>mqyZv-WQ&@>4zJRXs4_G!a!3UT
zZ!kj$yu*@;Exeh(<2*G1(RWo>bm$ffQ)PbN59U8Qb=`IlNiOk0q2U+IJr{8(w{aei
zaDr2K-m?-Ml+zrt1QNIK9!layY8-DDIp!uDK1E%0yE})!IQJxn;6U(l?y1#zx0q=|
z!_2_czvnc}sSJK|BbmUQnL)J2zR!tgW>Bn{<?CbxYD3Lj-C}kA+*96K0F;QYUwNWB
zQM-nkKxdgPk!YAx6D&$*hHS@-*#zIcrz4TZ@<mNUlS4DoQBhM<yKv%_Cw$#U(omM`
z!Sd|OJNHygWm^pO-yB7$j0NWwte$!HZExU^si?8Qt(aM2iWbxj0ce+JUp-hl<06ZK
zBth=>AIP5cZOMS#$jln74oAnFh$rExsVy(|AoQ6d=Ef&A4Z(6kZ_k=QBPZo1AEc8>
zG7>sg@+gs-s$jI<Zw=l$oEaUFXf9A&Iba~t5$SE%QPEIm;z}fHDk6{4N|#~oMjr4i
z<l#)m$sY1Je5PohS-xiqEeeu>d_9S1oDgye*K?`kVGbvqw=1c*;(BhS$@H2~0-nkc
z9<xA4z}t1Ns52LIhK-1)GVl&`-f%0|<0tvRO>?30EfmT5pcf-Jb4tkRsiMjWIT>Wd
zaGgvgM<}u*Bp%H0-k?A)dY^|_<&&*jpfZ1gFHSd9(LEl#Jv~~fw^7SO>{~P)QxB*G
z)E=j;bVvli<&u0bd+Fb?{_X!4tSIxgMl5gc*<|4=1xd7xE^&>SDH;R^Oa!xpBM^!j
zxvZ+3wc>)u7YbaO)QTHiAXb7U92W|P^JalmSO7cS&<_l>m54?>f<th*fV*Id>ClsH
zE=or{>=pfuOltq(oYT9K;Wl)aQmol6niW0X0%ghcX+O`%jfCb>HLbPYB_WS9p`i&;
zpyktJXLTDoBQ<wiEIOm<CS&iIibyEu0y>!;U9|dYQ)lF^Y)!`wc{lgWlD91#Qx=<L
zf1Gk-?}6P(C%w5ZQ2SCX8g)1_64EsbmA&sc(ij_eDV)0G$cBD-`eM8Ej~6wesHmzV
z$T#xxXxz8WEeIXT7isXEMp15NKljilxdBh4#c>NlWR6gAhe_&76sM@DsI2pVCQ@`N
z!i<?dU6}MkUcz%bcOt-&$IP4^M?6yav*T;F)gj*lge4tc=GT;UcRwSFPSZdh<^oYw
zY5UoUvMhS#Q=H)=>wyI+2C?M+Z#pk>mdqSyIK^_(jyeR}Nwt^}sm6JF=Gm@EqN=p^
z?r7;at3k&mGZvUHYsaxRP-|Sgp4HBz^lwEqN!L8{>^x~KXT=pKxxw9%ZvN68T+`KK
zxH?pmRDO25s?&Hi?#c<x14%@V{@O;TBB@9<Va4S?zv<pj?{a}X+Q9{h6$fdD>h0vV
zQzIldY?IV!;@Xc--|P)L>0gZI6KK*;-oJFgk;F;vx0B+Q>41xAhXYo<pus&e=A7ab
zTWsNT92O&vv-gKe+!Z{sak`<YYya}xCMiS~EZAk2Lyk%X91Sz8z<n`|&sloQ-}wlu
zW2Ox2bXvdh^dfGOLZoBGAxA8y763=E&*<i2Oe%86jn~~T$Z_K?3mX+>=ealkuDUj6
z9Y+P7eb(xM#A-6JoYpCbUfR9(OgJT#91FvQqHVi-=`}&+irk}{?B|d3<N90q3h{6C
z*L@Vtd^UMIMV)H3eD>P({ze)9_TR_u#a}o3j#pK;;kl$DQI38ScV7GqGQ(&4>(}!;
z4?MlcjC#XwEk~T>`TcwUyMH0P_i9fmy!aXA{Sz01NUa(9&mjN+002ovPDHLkV1gB&
Bs&xPW

literal 0
HcmV?d00001

diff --git a/res/layout/change_passphrase_activity.xml b/res/layout/change_passphrase_activity.xml
index 639b18da7d..a6e34a2d04 100644
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@@ -1,64 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent">
-<TableLayout 
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+<TableLayout
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:stretchColumns="1">
 
     <TableRow>
         <TextView
-        	android:textSize="12sp"
+            android:textSize="12sp"
             android:text="Old passphrase:"
             android:padding="3dip" />
-        <EditText android:id="@+id/old_passphrase" 
-			      android:layout_height="wrap_content" 
-	    		  android:layout_width="fill_parent" 
-			      android:password="true"/>
+
+        <EditText android:id="@+id/old_passphrase"
+                  android:layout_height="wrap_content"
+                  android:layout_width="fill_parent"
+                  android:password="true"/>
     </TableRow>
 
     <TableRow>
         <TextView
             android:text="New passphrase:"
-            android:textSize="12sp"            
+            android:textSize="12sp"
             android:padding="3dip" />
-            
-        <EditText android:id="@+id/new_passphrase" 
-			      android:layout_height="wrap_content" 
-	  			  android:layout_width="fill_parent" 
-			      android:password="true"
-	      />            
+
+        <EditText android:id="@+id/new_passphrase"
+                  android:layout_height="wrap_content"
+                  android:layout_width="fill_parent"
+                  android:password="true"
+          />
     </TableRow>
 
     <TableRow>
         <TextView
             android:text="Repeat new passphrase:"
-            android:textSize="12sp"            
+            android:textSize="12sp"
             android:padding="3dip" />
-            
-        <EditText android:id="@+id/repeat_passphrase" 
-			      android:layout_height="wrap_content" 
-	  			  android:layout_width="fill_parent" 
-			      android:password="true"
-	      />            
+
+        <EditText android:id="@+id/repeat_passphrase"
+                  android:layout_height="wrap_content"
+                  android:layout_width="fill_parent"
+                  android:password="true"
+          />
     </TableRow>
 
-    
+
     <TableRow>
-   		<Button android:id="@+id/ok_button"
-   				android:padding="10dip"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="Ok"/>
+           <Button android:id="@+id/cancel_button"
+                   android:padding="10dip"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:text="Cancel"/>
 
-   		<Button android:id="@+id/cancel_button"
-   				android:padding="10dip"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="Cancel"/>
-    
-    </TableRow>    
-    
-</TableLayout>
+           <Button android:id="@+id/ok_button"
+                   android:padding="10dip"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:text="Ok"/>
+    </TableRow>
+  </TableLayout>
 </ScrollView>
diff --git a/res/layout/save_identity_activity.xml b/res/layout/save_identity_activity.xml
index d260ed4075..5dab264475 100644
--- a/res/layout/save_identity_activity.xml
+++ b/res/layout/save_identity_activity.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="fill_parent"
-			  android:layout_height="fill_parent"
-			  android:padding="5dip">
-
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="fill_parent"
-						  android:layout_height="wrap_content"
-						  android:padding="5dip">
-						  
-				<TextView android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"
-						  android:padding="5dip"
-						  android:text="Identity Name:" />
-						  
-				<EditText android:layout_width="fill_parent"
-						  android:layout_height="wrap_content"
-						  android:padding="5dip"
-						  android:id="@+id/identity_name"
-						  android:text="" />			  
-			</LinearLayout>
-			
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="fill_parent"
-						  android:layout_height="wrap_content"
-						  android:padding="5dip">
-			
-				<Button android:layout_width="100dip"
-						android:layout_height="wrap_content"
-						android:visibility="visible"
-						android:padding="5dip"
-						android:gravity="center"
-						android:id="@+id/ok_button"
-						android:text="Ok"/>
-						
-				<Button android:layout_width="100dip"
-						android:layout_height="wrap_content"
-						android:visibility="visible"
-						android:padding="5dip"
-						android:gravity="center"
-						android:id="@+id/cancel_button"
-						android:text="Cancel"/>			  			  
-			</LinearLayout>
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:padding="16dip">
+
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:padding="5dip"
+                      android:text="Identity Name:" />
+
+            <EditText android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:padding="5dip"
+                      android:id="@+id/identity_name"
+                      android:text="" />
+
+            <LinearLayout android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:orientation="horizontal"
+                          android:layout_marginBottom="16dip"
+                          android:gravity="right">
+
+                <TableLayout android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:stretchColumns="*">
+                    <TableRow>
+
+                        <Button android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:visibility="visible"
+                                android:layout_marginRight="17dip"
+                                android:id="@+id/cancel_button"
+                                android:text="Cancel"/>
+
+                        <Button android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:visibility="visible"
+                                android:id="@+id/ok_button"
+                                android:text="Ok"/>
+
+                    </TableRow>
+                </TableLayout>
+            </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/verify_identity_activity.xml b/res/layout/verify_identity_activity.xml
index 3c048f7492..2af91d236c 100644
--- a/res/layout/verify_identity_activity.xml
+++ b/res/layout/verify_identity_activity.xml
@@ -1,70 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent">
-<TableLayout 
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:shrinkColumns="1">
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+    <LinearLayout android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginLeft="16dip"
+                  android:layout_marginRight="16dip"
+                  android:layout_gravity="center"
+                  android:orientation="vertical">
 
-    <TableRow>
-        <TextView
-        	android:textSize="12sp"
-            android:text="Their identity:\n(They read)"
-            android:padding="3dip" />
         <TextView
-           	android:textSize="20sp"
-           	android:typeface="monospace"        
-        	android:id="@+id/friend_reads"
-            android:text=""
-            android:padding="3dip" />
-    </TableRow>
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="Their identity (they read):"
+                android:padding="7dip" />
 
-    <TableRow>
         <TextView
-            android:text="Your identity:\n(You read)"
-            android:textSize="12sp"            
-            android:padding="3dip" />
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:typeface="monospace"
+                android:id="@+id/friend_reads"
+                android:text=""
+                android:padding="7dip" />
+
         <TextView
-        	android:id="@+id/you_read"
-        	android:textSize="20sp"
-           	android:typeface="monospace"                	
-            android:text=""
-            android:padding="3dip" />
-    </TableRow>
-    
-    <TableRow>
-    	<LinearLayout android:orientation="horizontal"
-    				  android:layout_width="fill_parent"
-    				  android:layout_height="wrap_content"
-    				  android:layout_gravity="center"
-    				  android:layout_span="2">
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="Your identity (you read):"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:padding="7dip" />
 
-	   		<Button android:id="@+id/verified_button"
-	   				android:padding="10dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Verified!"/>
-	
-	   		<Button android:id="@+id/abort_button"
-	   				android:padding="10dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Abort"/>
-					
-			<Button android:id="@+id/compare_button"
-	   				android:padding="10dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Compare"/>
-					
-			<Button android:id="@+id/cancel_button"
-					android:padding="10dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Cancel" />
-			
-		</LinearLayout>    
-    </TableRow>    
-</TableLayout>
+        <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/you_read"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:typeface="monospace"
+                android:text=""
+                android:padding="7dip" />
+    </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/verify_keys_activity.xml b/res/layout/verify_keys_activity.xml
index 5d9b5026ad..7a8abf134d 100644
--- a/res/layout/verify_keys_activity.xml
+++ b/res/layout/verify_keys_activity.xml
@@ -1,105 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent">
-<TableLayout 
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:shrinkColumns="1">
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
 
-    <TableRow>
-        <TextView
-        	android:textSize="12sp"
-            android:text="Your friend reads this:"
-            android:padding="3dip" />
-        <TextView
-           	android:textSize="20sp"
-           	android:typeface="monospace"        
-        	android:id="@+id/friend_reads"
-            android:text=""
-            android:padding="3dip" />
-    </TableRow>
+    <LinearLayout android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginLeft="16dip"
+                  android:layout_marginRight="16dip"
+                  android:layout_gravity="center"
+                  android:orientation="vertical">
 
-    <TableRow>
-        <TextView
-            android:text="You read this:"
-            android:textSize="12sp"            
-            android:padding="3dip" />
-        <TextView
-        	android:id="@+id/you_read"
-        	android:textSize="20sp"
-           	android:typeface="monospace"                	
-            android:text=""
-            android:padding="3dip" />
-    </TableRow>
-    
-    <TableRow>
-    	<LinearLayout android:orientation="horizontal"
-    				  android:layout_width="fill_parent"
-    				  android:layout_height="wrap_content"
-    				  android:layout_gravity="center"
-    				  android:layout_span="2">
+               <TextView
+                   android:layout_height="wrap_content"
+                   android:layout_width="fill_parent"
+                   android:textAppearance="?android:attr/textAppearanceLarge"
+                   android:text="They read this:"
+                   android:padding="7dip" />
+
+               <TextView
+                   android:layout_height="wrap_content"
+                   android:layout_width="fill_parent"
+                   android:textAppearance="?android:attr/textAppearanceLarge"
+                   android:typeface="monospace"
+                   android:id="@+id/friend_reads"
+                   android:text=""
+                   android:padding="7dip" />
+
+               <TextView
+                   android:layout_marginTop="10dip"
+                   android:layout_height="wrap_content"
+                   android:layout_width="fill_parent"
+                   android:textAppearance="?android:attr/textAppearanceLarge"
+                   android:text="You read this:"
+                   android:padding="7dip" />
+
+               <TextView
+                   android:layout_height="wrap_content"
+                   android:layout_width="fill_parent"
+                   android:id="@+id/you_read"
+                   android:textAppearance="?android:attr/textAppearanceLarge"
+                   android:typeface="monospace"
+                   android:text=""
+                   android:padding="7dip" />
+
+    </LinearLayout>
 
-	   		<Button android:id="@+id/verified_button"
-	   				android:padding="10dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Verified!"/>
-	
-	   		<Button android:id="@+id/abort_button"
-	   				android:padding="10dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Abort"/>
-					
-			<Button android:id="@+id/compare_button"
-	   				android:padding="10dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Compare"/>			
-					
-			<Button android:id="@+id/cancel_button"
-					android:padding="10dip"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="Cancel" />
-		</LinearLayout>
-    
-    </TableRow>    
-    
-</TableLayout>
 </ScrollView>
-<!---->
-<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
-<!--    android:layout_width="fill_parent"-->
-<!--    android:layout_height="wrap_content"-->
-<!--    android:orientation="vertical"-->
-<!--    android:padding="10px">-->
-<!--			  -->
-<!--	<TextView android:id="@+id/your_fingerprint"-->
-<!--			  android:layout_width="fill_parent"-->
-<!--			  android:layout_height="wrap_content" -->
-<!--			  android:layout_marginBottom="10px"/>-->
-<!---->
-<!--	<TextView android:id="@+id/their_fingerprint"-->
-<!--			  android:layout_width="fill_parent"-->
-<!--			  android:layout_height="wrap_content"-->
-<!--			  android:layout_marginBottom="20px" />-->
-<!--			  -->
-<!--	<LinearLayout android:layout_width="fill_parent"-->
-<!--				  android:layout_height="wrap_content"-->
-<!--				  android:orientation="horizontal">-->
-<!--				  -->
-<!--		<Button android:id="@+id/ok_button"-->
-<!--				android:paddingLeft="30px"-->
-<!--				android:paddingRight="30px"-->
-<!--				android:layout_width="wrap_content"-->
-<!--				android:layout_height="wrap_content"-->
-<!--				android:layout_marginRight="15px"-->
-<!--				android:text="Ok"-->
-<!--				android:gravity="right"/>-->
-<!--				-->
-<!--	</LinearLayout>-->
-<!--</LinearLayout>-->
-<!---->
-<!---->
diff --git a/res/layout/view_identity_activity.xml b/res/layout/view_identity_activity.xml
index dea27587eb..1599be0877 100644
--- a/res/layout/view_identity_activity.xml
+++ b/res/layout/view_identity_activity.xml
@@ -1,50 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent">
-<TableLayout 
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+<TableLayout
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:shrinkColumns="1">
 
     <TableRow>
         <TextView
-        	android:textSize="12sp"
+            android:textSize="12sp"
             android:text="Your identity:"
             android:padding="3dip" />
         <TextView
-           	android:textSize="20sp"
-           	android:typeface="monospace"        
-        	android:id="@+id/identity_fingerprint"
+               android:textSize="20sp"
+               android:typeface="monospace"
+            android:id="@+id/identity_fingerprint"
             android:text=""
             android:padding="3dip" />
     </TableRow>
-    
+
     <TableRow>
-    	<LinearLayout android:orientation="horizontal"
-    				  android:layout_width="fill_parent"
-    				  android:layout_height="wrap_content"
-    				  android:layout_gravity="center"
-    				  android:layout_span="2">
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center"
+                      android:layout_span="2">
+
+            <Button android:id="@+id/compare_button"
+                    android:layout_margin="10dip"
+                    android:padding="5dip"
+                    android:layout_width="100dip"
+                    android:layout_height="wrap_content"
+                    android:text="Compare" />
+
+            <Button android:id="@+id/ok_button"
+                    android:layout_margin="10dip"
+                    android:padding="5dip"
+                    android:layout_width="100dip"
+                    android:layout_height="wrap_content"
+                    android:text="Ok"/>
+
+        </LinearLayout>
+
+    </TableRow>
 
-	   		<Button android:id="@+id/ok_button"
-	   				android:layout_margin="10dip"
-	   				android:padding="5dip"
-					android:layout_width="100dip"
-					android:layout_height="wrap_content"
-					android:text="Ok"/>
-					
-			<Button android:id="@+id/compare_button"
-					android:layout_margin="10dip"
-					android:padding="5dip"
-					android:layout_width="100dip"
-					android:layout_height="wrap_content"
-					android:text="Compare" />
-					
-	
-		</LinearLayout>
-    
-    </TableRow>    
-    
 </TableLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/menu/conversation_secure_verified.xml b/res/menu/conversation_secure_verified.xml
index d231e10837..2b896a9b03 100644
--- a/res/menu/conversation_secure_verified.xml
+++ b/res/menu/conversation_secure_verified.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:title="Security"
           android:id="@+id/menu_security"
-          android:icon="@drawable/ic_menu_lock_unverified_holo_dark"
+          android:icon="@drawable/ic_menu_lock_verified_holo_dark"
           android:showAsAction="ifRoom">
           <menu>
               <item android:title="Verify Session"
diff --git a/res/menu/key_scanning.xml b/res/menu/key_scanning.xml
new file mode 100644
index 0000000000..675d63f217
--- /dev/null
+++ b/res/menu/key_scanning.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="Compare"
+          android:id="@+id/menu_barcode"
+          android:icon="@drawable/ic_menu_barcode"
+          android:showAsAction="ifRoom">
+
+        <menu>
+            <item android:title="Scan to compare"
+                  android:id="@+id/menu_scan"/>
+
+            <item android:title="Get scanned to compare"
+                  android:id="@+id/menu_get_scanned"/>
+
+        </menu>
+
+    </item>
+</menu>
\ No newline at end of file
diff --git a/res/menu/verify_keys.xml b/res/menu/verify_keys.xml
new file mode 100644
index 0000000000..75151e3852
--- /dev/null
+++ b/res/menu/verify_keys.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="Verified"
+          android:id="@+id/menu_session_verified"
+          android:icon="@drawable/ic_menu_done_holo_dark"
+          android:showAsAction="ifRoom" />
+</menu>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/KeyScanningActivity.java b/src/org/thoughtcrime/securesms/KeyScanningActivity.java
index 120b6b7045..23252a7c37 100644
--- a/src/org/thoughtcrime/securesms/KeyScanningActivity.java
+++ b/src/org/thoughtcrime/securesms/KeyScanningActivity.java
@@ -1,6 +1,6 @@
-/** 
+/**
  * Copyright (C) 2011 Whisper Systems
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -10,62 +10,68 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms;
 
-import org.thoughtcrime.securesms.crypto.SerializableKey;
-import org.thoughtcrime.securesms.util.Base64;
-import org.thoughtcrime.securesms.util.Dialogs;
-
-import android.app.Activity;
 import android.content.Intent;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
 import android.widget.Toast;
 
+import com.actionbarsherlock.app.SherlockActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 
+import org.thoughtcrime.securesms.crypto.SerializableKey;
+import org.thoughtcrime.securesms.util.Base64;
+import org.thoughtcrime.securesms.util.Dialogs;
+
 /**
  * Activity for initiating/receiving key QR code scans.
- * 
+ *
  * @author Moxie Marlinspike
  */
-public abstract class KeyScanningActivity extends Activity {
-
-  private static final int MENU_ITEM_SCAN        = 1;
-  private static final int MENU_ITEM_GET_SCANNED = 2;
+public abstract class KeyScanningActivity extends SherlockActivity {
 
   @Override
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-    menu.add(0, MENU_ITEM_SCAN, Menu.NONE, getScanString());
-    menu.add(0, MENU_ITEM_GET_SCANNED, Menu.NONE, getDisplayString());
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    super.onPrepareOptionsMenu(menu);
+
+    MenuInflater inflater = this.getSupportMenuInflater();
+    menu.clear();
+
+    inflater.inflate(R.menu.key_scanning, menu);
+
+    menu.findItem(R.id.menu_scan).setTitle(getScanString());
+    menu.findItem(R.id.menu_get_scanned).setTitle(getDisplayString());
+
+    return true;
   }
-    
+
   @Override
-  public boolean onContextItemSelected(MenuItem item) {
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
 
-    switch(item.getItemId()) {
-    case MENU_ITEM_SCAN:        initiateScan();    return true;
-    case MENU_ITEM_GET_SCANNED: initiateDisplay(); return true;
+    switch (item.getItemId()) {
+    case R.id.menu_scan:        initiateScan();    return true;
+    case R.id.menu_get_scanned: initiateDisplay(); return true;
+    case android.R.id.home:     finish();          return true;
     }
-		
+
     return false;
   }
 
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent intent) {
     IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
-		
+
     if ((scanResult != null) && (scanResult.getContents() != null)) {
       String data = scanResult.getContents();
-			
+
       if (data.equals(Base64.encodeBytes(getIdentityKeyToCompare().serialize()))) {
         Dialogs.displayAlert(this, getVerifiedTitle(), getVerifiedMessage(), android.R.drawable.ic_dialog_info);
       } else {
@@ -75,11 +81,11 @@ public abstract class KeyScanningActivity extends Activity {
       Toast.makeText(this, "No scanned key found!", Toast.LENGTH_LONG).show();
     }
   }
-	
+
   protected void initiateScan() {
     IntentIntegrator.initiateScan(this);
   }
-	
+
   protected void initiateDisplay() {
     IntentIntegrator.shareText(this, Base64.encodeBytes(getIdentityKeyToDisplay().serialize()));
   }
@@ -92,8 +98,8 @@ public abstract class KeyScanningActivity extends Activity {
 
   protected abstract SerializableKey getIdentityKeyToCompare();
   protected abstract SerializableKey getIdentityKeyToDisplay();
-	
+
   protected abstract String getVerifiedTitle();
   protected abstract String getVerifiedMessage();
-		
+
 }
diff --git a/src/org/thoughtcrime/securesms/KeyVerifyingActivity.java b/src/org/thoughtcrime/securesms/KeyVerifyingActivity.java
new file mode 100644
index 0000000000..fa323bc456
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/KeyVerifyingActivity.java
@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms;
+
+import android.os.Bundle;
+
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
+public abstract class KeyVerifyingActivity extends KeyScanningActivity {
+
+  @Override
+  protected void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+    this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+  }
+
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    super.onPrepareOptionsMenu(menu);
+
+    MenuInflater inflater = this.getSupportMenuInflater();
+    inflater.inflate(R.menu.verify_keys, menu);
+
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+
+    switch (item.getItemId()) {
+    case R.id.menu_session_verified: handleVerified(); return true;
+    }
+
+    return false;
+  }
+
+  protected abstract void handleVerified();
+
+}
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index f682279b1b..04e810746a 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -1,6 +1,6 @@
-/** 
+/**
  * Copyright (C) 2011 Whisper Systems
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -10,170 +10,116 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms;
 
-import org.thoughtcrime.securesms.crypto.IdentityKey;
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
-import org.thoughtcrime.securesms.crypto.KeyUtil;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.database.SessionRecord;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.MemoryCleaner;
-
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.thoughtcrime.securesms.crypto.IdentityKey;
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.SessionRecord;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.MemoryCleaner;
+
 /**
  * Activity for verifying identity keys.
- * 
+ *
  * @author Moxie Marlinspike
  */
-public class VerifyIdentityActivity extends KeyScanningActivity {
-	
+public class VerifyIdentityActivity extends KeyVerifyingActivity {
+
   private Recipient recipient;
   private MasterSecret masterSecret;
-	
+
   private TextView localIdentityFingerprint;
   private TextView remoteIdentityFingerprint;
-	
-  private Button verifiedButton;
-  private Button abortButton;
-  private Button cancelButton;
-  private Button compareButton;
-	
+
   @Override
   public void onCreate(Bundle state) {
     super.onCreate(state);
     setContentView(R.layout.verify_identity_activity);
-		
+
     initializeResources();
     initializeFingerprints();
-    initializeListeners();
   }
-  
+
   @Override
   protected void onDestroy() {
     MemoryCleaner.clean(masterSecret);
     super.onDestroy();
   }
-		
+
+  @Override
+  protected void handleVerified() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setIcon(android.R.drawable.ic_dialog_alert);
+    builder.setTitle("Mark Identity Verified?");
+    builder.setMessage("Are you sure you have validated the recipients' identity fingerprint " +
+                       "and would like to mark it as verified?");
+
+    builder.setPositiveButton("Mark Verified", new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        SessionRecord sessionRecord = new SessionRecord(VerifyIdentityActivity.this,
+                                                        masterSecret, recipient);
+        IdentityKey identityKey     = sessionRecord.getIdentityKey();
+        String recipientName        = recipient.getName();
+
+        Intent intent               = new Intent(VerifyIdentityActivity.this,
+                                                 SaveIdentityActivity.class);
+
+        intent.putExtra("name_suggestion", recipientName);
+        intent.putExtra("master_secret", masterSecret);
+        intent.putExtra("identity_key", identityKey);
+
+        startActivity(intent);
+        finish();
+      }
+    });
+
+    builder.setNegativeButton("Cancel", null);
+    builder.show();
+  }
+
   private void initializeLocalIdentityKey() {
     if (!IdentityKeyUtil.hasIdentityKey(this)) {
       localIdentityFingerprint.setText("You do not have an identity key.");
       return;
     }
-		
+
     localIdentityFingerprint.setText(IdentityKeyUtil.getFingerprint(this));
   }
 
   private void initializeRemoteIdentityKey() {
     SessionRecord sessionRecord = new SessionRecord(this, masterSecret, recipient);
     IdentityKey identityKey     = sessionRecord.getIdentityKey();
-		
+
     if (identityKey == null) {
       remoteIdentityFingerprint.setText("Recipient has no identity key.");
-      verifiedButton.setEnabled(false);
     } else {
       remoteIdentityFingerprint.setText(identityKey.getFingerprint());
     }
   }
-	
-  private void initializeListeners() {
-    verifiedButton.setOnClickListener(new VerifiedButtonListener());
-    cancelButton.setOnClickListener(new CancelButtonListener());
-    abortButton.setOnClickListener(new AbortButtonListener());
-    compareButton.setOnClickListener(new CompareButtonListener());
-  }
-	
+
   private void initializeFingerprints() {
     initializeLocalIdentityKey();
     initializeRemoteIdentityKey();
   }
-	
+
   private void initializeResources() {
     localIdentityFingerprint  = (TextView)findViewById(R.id.you_read);
     remoteIdentityFingerprint = (TextView)findViewById(R.id.friend_reads);
     recipient                 = (Recipient)this.getIntent().getParcelableExtra("recipient");
     masterSecret              = (MasterSecret)this.getIntent().getParcelableExtra("master_secret");
-    verifiedButton            = (Button)findViewById(R.id.verified_button);
-    abortButton               = (Button)findViewById(R.id.abort_button);
-    cancelButton              = (Button)findViewById(R.id.cancel_button);
-    compareButton             = (Button)findViewById(R.id.compare_button);
-  }
-	
-  private void abortSession() {
-    KeyUtil.abortSessionFor(this, recipient);
-  }
-	
-  private void saveRemoteIdentity() {
-    SessionRecord sessionRecord = new SessionRecord(this, masterSecret, recipient);
-    IdentityKey identityKey     = sessionRecord.getIdentityKey();
-    String recipientName        = recipient.getName();
-    Intent intent               = new Intent(this, SaveIdentityActivity.class);
-    intent.putExtra("name_suggestion", recipientName);
-    intent.putExtra("master_secret", masterSecret);
-    intent.putExtra("identity_key", identityKey);
-
-    startActivity(intent);		
-  }
-	
-  private class CancelButtonListener implements View.OnClickListener {
-    public void onClick(View v) {
-      finish();
-    }
-  }
-	
-  private class CompareButtonListener implements View.OnClickListener {
-    public void onClick(View v) {
-      registerForContextMenu(compareButton);
-      compareButton.showContextMenu();
-    }
-  }
-	
-  private class AbortButtonListener implements View.OnClickListener {
-    public void onClick(View v) {
-      AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(VerifyIdentityActivity.this);
-      dialogBuilder.setTitle("Abort Session?");
-      dialogBuilder.setIcon(android.R.drawable.ic_dialog_info);
-      dialogBuilder.setMessage("Are you sure that you would like to abort this secure session?");
-      dialogBuilder.setCancelable(true);
-      dialogBuilder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-        public void onClick(DialogInterface arg0, int arg1) {
-          abortSession();
-          finish();
-        }
-      });
-      dialogBuilder.setNegativeButton(R.string.no, null);
-      dialogBuilder.show();
-    }		
-  }
-	
-  private class VerifiedButtonListener implements View.OnClickListener {
-    public void onClick(View v) {
-      AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(VerifyIdentityActivity.this);
-      dialogBuilder.setTitle("Save Identity Key?");
-      dialogBuilder.setIcon(android.R.drawable.ic_dialog_info);
-      dialogBuilder.setMessage("Are you sure that you would like to mark this as a valid identity key for all future correspondence with this recipient?  You should only do this if you have actually verified the fingerprint.");
-      dialogBuilder.setCancelable(true);
-      dialogBuilder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-        public void onClick(DialogInterface arg0, int arg1) {
-          saveRemoteIdentity();
-          finish();
-        }
-      });
-      dialogBuilder.setNegativeButton(R.string.no, null);
-      dialogBuilder.show();
-    }
   }
 
   @Override
@@ -182,22 +128,22 @@ public class VerifyIdentityActivity extends KeyScanningActivity {
       Toast.makeText(this, "You don't have an identity key!", Toast.LENGTH_LONG).show();
       return;
     }
-		
+
     super.initiateDisplay();
   }
-	
+
   @Override
   protected void initiateScan() {
     SessionRecord sessionRecord = new SessionRecord(this, masterSecret, recipient);
     IdentityKey identityKey     = sessionRecord.getIdentityKey();
-		
+
     if (identityKey == null) {
       Toast.makeText(this, "Recipient has no identity key!", Toast.LENGTH_LONG);
     } else {
       super.initiateScan();
-    }		
+    }
   }
-	
+
   @Override
   protected String getScanString() {
     return "Scan their key to compare";
diff --git a/src/org/thoughtcrime/securesms/VerifyKeysActivity.java b/src/org/thoughtcrime/securesms/VerifyKeysActivity.java
index 6606dc6c25..cf71206aad 100644
--- a/src/org/thoughtcrime/securesms/VerifyKeysActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyKeysActivity.java
@@ -1,6 +1,6 @@
-/** 
+/**
  * Copyright (C) 2011 Whisper Systems
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -10,13 +10,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms;
 
-import org.thoughtcrime.securesms.crypto.KeyUtil;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.widget.TextView;
+
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.SerializableKey;
 import org.thoughtcrime.securesms.database.SessionRecord;
@@ -24,131 +28,88 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Hex;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
 /**
  * Activity for verifying session keys.
- * 
+ *
  * @author Moxie Marlinspike
  *
  */
-public class VerifyKeysActivity extends KeyScanningActivity {
+public class VerifyKeysActivity extends KeyVerifyingActivity {
 
   private byte[] yourFingerprintBytes;
   private byte[] theirFingerprintBytes;
-	
+
   private TextView yourFingerprint;
   private TextView theirFingerprint;
-  private Button verifiedButton;
-  private Button abortButton;
-  private Button cancelButton;
-  private Button compareButton;
+
   private Recipient recipient;
   private MasterSecret masterSecret;
-	
+
   @Override
   protected void onCreate(Bundle state) {
     super.onCreate(state);
     setContentView(R.layout.verify_keys_activity);
-		
+
     initializeResources();
     initializeFingerprints();
-    initializeCallbacks();
   }
-	
+
   @Override
   protected void onDestroy() {
     MemoryCleaner.clean(masterSecret);
     super.onDestroy();
   }
-  
-  private void initializeCallbacks() {
-    this.verifiedButton.setOnClickListener(new VerifiedListener());
-    this.abortButton.setOnClickListener(new AbortListener());
-    this.cancelButton.setOnClickListener(new CancelListener());
-    this.compareButton.setOnClickListener(new CompareListener());
+
+  @Override
+  protected void handleVerified() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setIcon(android.R.drawable.ic_dialog_alert);
+    builder.setTitle("Mark Session Verified?");
+    builder.setMessage("Are you sure that you have validated these fingerprints and " +
+                       "would like to mark this session as verified?");
+    builder.setPositiveButton("Mark Verified", new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        SessionRecord sessionRecord = new SessionRecord(VerifyKeysActivity.this, masterSecret,
+                                                        recipient);
+        sessionRecord.setVerifiedSessionKey(true);
+        sessionRecord.save();
+        VerifyKeysActivity.this.finish();
+      }
+    });
+
+    builder.setNegativeButton("Cancel", null);
+    builder.show();
   }
-	
+
   private void initializeResources() {
     this.recipient        = (Recipient)this.getIntent().getParcelableExtra("recipient");
     this.masterSecret     = (MasterSecret)this.getIntent().getParcelableExtra("master_secret");
     this.yourFingerprint  = (TextView)findViewById(R.id.you_read);
     this.theirFingerprint = (TextView)findViewById(R.id.friend_reads);
-    this.verifiedButton   = (Button)findViewById(R.id.verified_button);
-    this.abortButton      = (Button)findViewById(R.id.abort_button);
-    this.cancelButton     = (Button)findViewById(R.id.cancel_button);
-    this.compareButton    = (Button)findViewById(R.id.compare_button);
   }
-	
+
   private void initializeFingerprints() {
     SessionRecord session      = new SessionRecord(this, masterSecret, recipient);
     this.yourFingerprintBytes  = session.getLocalFingerprint();
     this.theirFingerprintBytes = session.getRemoteFingerprint();
-		
+
     this.yourFingerprint.setText(Hex.toString(yourFingerprintBytes));
     this.theirFingerprint.setText(Hex.toString(theirFingerprintBytes));
   }
-	
-  private class VerifiedListener implements OnClickListener {
-    public void onClick(View v) {
-      SessionRecord sessionRecord = new SessionRecord(VerifyKeysActivity.this, masterSecret, recipient);
-      sessionRecord.setVerifiedSessionKey(true);
-      sessionRecord.save();
-      VerifyKeysActivity.this.finish();
-    }
-  }
-	
-  private class CancelListener implements OnClickListener {
-    public void onClick(View v) {
-      VerifyKeysActivity.this.finish();
-    }
-  }
-	
-  private class CompareListener implements View.OnClickListener {
-    public void onClick(View v) {
-      registerForContextMenu(compareButton);
-      compareButton.showContextMenu();
-    }
-  }
-	
-  private class AbortListener implements OnClickListener {
-    public void onClick(View v) {
-      AlertDialog.Builder builder = new AlertDialog.Builder(VerifyKeysActivity.this);
-      builder.setTitle("Abort Secure Session Confirmation");
-      builder.setIcon(android.R.drawable.ic_dialog_alert);
-      builder.setCancelable(true);
-      builder.setMessage("Are you sure that you want to abort this secure session?");
-      builder.setPositiveButton(R.string.yes, new AbortConfirmListener());
-      builder.setNegativeButton(R.string.no, null);
-      builder.show();
-    }
-  }
-
-  private class AbortConfirmListener implements DialogInterface.OnClickListener {
-    public void onClick(DialogInterface dialog, int which) {
-      KeyUtil.abortSessionFor(VerifyKeysActivity.this, recipient);
-      VerifyKeysActivity.this.finish();
-    }
-  }
 
   @Override
   protected String getDisplayString() {
     return "Get my fingerprint scanned";
   }
-	
+
   @Override
   protected String getScanString() {
     return "Scan their fingerprint";
   }
 
   @Override
-    protected SerializableKey getIdentityKeyToCompare() {
+  protected SerializableKey getIdentityKeyToCompare() {
     return new FingerprintKey(theirFingerprintBytes);
   }
 
@@ -176,14 +137,14 @@ public class VerifyKeysActivity extends KeyScanningActivity {
   protected String getVerifiedTitle() {
     return "Verified!";
   }
-	
+
   private class FingerprintKey implements SerializableKey {
     private final byte[] fingerprint;
-		
+
     public FingerprintKey(byte[] fingerprint) {
       this.fingerprint = fingerprint;
     }
-		
+
     public byte[] serialize() {
       return fingerprint;
     }