From 5e73b696d1ff7d39df933a6de5f89b46f8ace22a Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sun, 9 May 2010 19:51:21 +0000
Subject: [PATCH] new EncryptActivity to handle message and file encryption all
 in one

---
 AndroidManifest.xml                           |  14 +-
 res/anim/push_left_in.xml                     |  20 +
 res/anim/push_left_out.xml                    |  20 +
 res/anim/push_right_in.xml                    |  20 +
 res/anim/push_right_out.xml                   |  20 +
 res/drawable-hdpi/ic_next.png                 | Bin 0 -> 1722 bytes
 res/drawable-hdpi/ic_previous.png             | Bin 0 -> 1712 bytes
 res/drawable-ldpi/ic_next.png                 | Bin 0 -> 916 bytes
 res/drawable-ldpi/ic_previous.png             | Bin 0 -> 922 bytes
 res/drawable-mdpi/ic_next.png                 | Bin 0 -> 1360 bytes
 res/drawable-mdpi/ic_previous.png             | Bin 0 -> 1352 bytes
 res/layout/encrypt.xml                        | 359 ++++++++
 res/layout/encrypt_file.xml                   |   4 +-
 res/values/strings.xml                        |   7 +-
 .../android/apg/DecryptMessageActivity.java   |   2 +-
 .../android/apg/EncryptActivity.java          | 783 ++++++++++++++++++
 .../android/apg/EncryptFileActivity.java      | 520 ------------
 .../android/apg/EncryptMessageActivity.java   | 379 ---------
 src/org/thialfihar/android/apg/Id.java        |   1 +
 .../thialfihar/android/apg/MainActivity.java  |  14 +-
 20 files changed, 1239 insertions(+), 924 deletions(-)
 create mode 100644 res/anim/push_left_in.xml
 create mode 100644 res/anim/push_left_out.xml
 create mode 100644 res/anim/push_right_in.xml
 create mode 100644 res/anim/push_right_out.xml
 create mode 100644 res/drawable-hdpi/ic_next.png
 create mode 100644 res/drawable-hdpi/ic_previous.png
 create mode 100644 res/drawable-ldpi/ic_next.png
 create mode 100644 res/drawable-ldpi/ic_previous.png
 create mode 100644 res/drawable-mdpi/ic_next.png
 create mode 100644 res/drawable-mdpi/ic_previous.png
 create mode 100644 res/layout/encrypt.xml
 create mode 100644 src/org/thialfihar/android/apg/EncryptActivity.java
 delete mode 100644 src/org/thialfihar/android/apg/EncryptFileActivity.java
 delete mode 100644 src/org/thialfihar/android/apg/EncryptMessageActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aad122eb3..99d095a37 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,22 +61,12 @@
             android:configChanges="keyboardHidden|orientation|keyboard"/>
 
         <activity
-            android:name=".EncryptMessageActivity"
-            android:label="@string/title_encryptMessage"
+            android:name=".EncryptActivity"
+            android:label="@string/title_encrypt"
             android:configChanges="keyboardHidden|orientation|keyboard">
 
             <intent-filter>
                 <action android:name="org.thialfihar.android.apg.intent.ENCRYPT" />
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name=".EncryptFileActivity"
-            android:label="@string/title_encryptFile"
-            android:configChanges="keyboardHidden|orientation|keyboard">
-
-            <intent-filter>
                 <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_FILE" />
             </intent-filter>
 
diff --git a/res/anim/push_left_in.xml b/res/anim/push_left_in.xml
new file mode 100644
index 000000000..b7d2d0da0
--- /dev/null
+++ b/res/anim/push_left_in.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>
diff --git a/res/anim/push_left_out.xml b/res/anim/push_left_out.xml
new file mode 100644
index 000000000..6bdc0ce47
--- /dev/null
+++ b/res/anim/push_left_out.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/res/anim/push_right_in.xml b/res/anim/push_right_in.xml
new file mode 100644
index 000000000..89daae972
--- /dev/null
+++ b/res/anim/push_right_in.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>
diff --git a/res/anim/push_right_out.xml b/res/anim/push_right_out.xml
new file mode 100644
index 000000000..b4b796b52
--- /dev/null
+++ b/res/anim/push_right_out.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/res/drawable-hdpi/ic_next.png b/res/drawable-hdpi/ic_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7105805525b5dc0263859b6ebadc6ea6f4c5019
GIT binary patch
literal 1722
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
KK@}bk$ovnlpX#ar

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_previous.png b/res/drawable-hdpi/ic_previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..d610e46675e466f7013348895691245dedf57113
GIT binary patch
literal 1712
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
DL#*VC

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/ic_next.png b/res/drawable-ldpi/ic_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..474ed8faaebe8629f285aa8aa9bcbb5cb8c4d82c
GIT binary patch
literal 916
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE
z?e4<Bu&P(t2*~3s@Q4H&&n*nXj105pfGp-LD{xE)(qKn0RQN1i2GmyJ>Eak-aeC|I
zv)&<r636PF-}|`A*vissnaV7A(X?qvPEM)O%~4x4qD6FH#jn_V!Cr8Sn5*haos6*7
zgrvra@ys(HDRfqy?JrDwxAXbE%ZENPUoP95{(ay1V!3(WpEmxFeI{t@*f&vrL(K(u
zUj8de(?8{1-5$SkmxPYvk~c?=96z6*_GXKPn{UaL((<F~(=WfSa?XEIx_3^W|96}B
z7N;lj6t2x&QLedpS#Iv@(7mgGr0L!#dtUFq*i?9;`C0AX&FijNFMIls`9b>p#A$O^
zulixRamSu!6NW57bve7toxTTLC#t#i@Nl&ra%G>DZ&&5BBrX2o_Kf`M4_j7*JY-JZ
zlOWQaWg=%M*Cweo`>&PV_T>&6zGf{6dZbjy5$M(+cW;v0#>={^GIslA%nzto75K!;
zLxt~ZNs*AF{(8?e`-58h9d6uGZdtRU-R04vNz3|nw=~wZ1$wB+g>fcwvM@A0ouwD|
zZ3ENvc$JGT8V6jNr7|ZqJFu6PWvG|4KQKPTz!&)Laz{6VNw(*nSpHdOzBqaP(y*yn
zCZXWkQf)Hfp!37YMUOcz{a&{H*s^EgH8vt$HC&w+PX5%nb69<&mDNeHs_&PojMXc4
zZ9HdCTcc!BFjGoJs+UdXYu1m;3dJj8oBE?RbZKXM`#L`sTqZCxwxRL)akX8)=Lpux
z2RK;G)RgTDn;y}2;J9-_Lc*gJ{Fn9FuP2{*EXOk;$$Ilo+tltyO&g}BKjGwFxO7(R
z>%W)Gw+JS;y*<n*Bod%L%X^m8xhvD%n>xOR)MS1-{>t3;+?&3K`-R-~0<~7Ec-b|H
zm~jfNQTTqi%EFteTR~CBVN%j>g&*;%7HTKz8Kj@cKRBs&_%tv<s+PD$l%yn<q*^5x
zr2;7iBLhPNT?12H1IrLY3o8>#D`PWl10yQ~gHSo2RVW&A^HVa@DsgL2asDC()WG2B
L>gTe~DWM4f78`Ec

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/ic_previous.png b/res/drawable-ldpi/ic_previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fd885e6b5bc6f7a934acd11d5c6769e12244368
GIT binary patch
literal 922
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE
z?e4<Bu&P(t2*~3s@Q4H&&n*nXj105pfGp-LD{xE)(qKn0RQN1i2GmyP>Eak-aeC`y
zZ~x#xk=Fgix8oMJdg(TGseCe6lwfjfK_|bAQQ-^aWA=%UPR#7IKisH%g+o#0goEsl
zF1EQ1UX3ig{Vof(1hCw?SAA~hZAOucQx?8H^X-&X_4>JcAJi*{EL+y$qE*PcL}n+m
z)22^Z(bs<->&p;2nV!CXpRC-RA3-@cmd<`<_v^{QCl$LUOb(5lI%f&@<Ye3LyQBa8
z+s3l|^_hV8P1|)MPkOl-O`5t!=d{zupO?FrpYpKs=i@o^dW%lpUe(A+u8~u={JHXX
z@7!EfYsCh&qR#4az57K<(;6BW=3oEwK%tA_>6PtaGl~zNz31gQAvj#`&c5B|nH(Ef
zGTJJRXz<D$N-A`^xNGHkWn%_DhK--6XGztV*tIb=+bH_j8rqnx?mV_xyo0Ib;L(2h
zjN@M!K2#oLNPM;9px~ahXII;{TdhcAKJ>u(j&BstgAeoKl#c9l<8FQXw52e+bE;dA
z%by9y5-x;HbcjfwXCv0@mVDubfZnPn2lduV>xlWXo3DH(ZoB93@g&X-8Jk|S)cc65
zJ^y5NAVIUJ>9xv<%kEta-HHnD`_Bitn6VzZ_2EWL+T<-FmgjhdLV`OFCUDM(`!y%&
z?fI=<=hkLfU3_D~*p#qhd9NQ|lE8t>wfS~D2ECe`OmBQD?mv9CYl0BVhARTjiwib<
zdwSz>+<Rrql-<np!hHnS+ip5vD#FDfAmdc=?C6if|E`9gSy0Y)Vnble@30e=ovU_4
zKMc_jSDp8BUhSWkHy^yxR=fGb+@UKg>dMPo!Ee_d=ey!Eaq6EVPFY&kTFN!)d#CK1
zTfVN~roVEpN~e;@34`M@l6zv6cBys=9%ZdDJMnnBciGN0t3Msd|GPs!+-#XmB`{g4
zmbgZgq$HN4S|t~y0x1R~149E{15;fC%Me2gD-%mALqlx?BP#=gOLIyiQ8eV{r(~v8
W;?}VE;Mu1@4Gf;HelF{r5}E)GAbq_6

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_next.png b/res/drawable-mdpi/ic_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..8271c13807f0fb8b6bd65832bdb17eacfae6e3cb
GIT binary patch
literal 1360
zcmV-W1+V&vP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy0%A)?L;wJ)jUzGu000SaNLh0L01FcU01FcV0GgZ_00009c5p#w
z0000a0000a0C)!*j{pD!G)Y83R7l6=mD_JrRTPK6eQtB<Wu`-?Ev3NFV$gtCYtTZ(
z3xSXrAB-<vQJ;JyG4Wmh4Py-t7)?wtyom+_4M`D<(jasc8ahyF3$%2mGo8-NIeTv(
z&N(yFQt^`b<X*{1&fYuUTI;vgSqJ{-OZ@9ATgf3DlC%rwxuhY^=5>uF^17Pg=0EZk
z-@Rks?iYvpcf~vHsKBi*&*vu2{&ep0<zFeI{~pL0-m(9{tFL69jKodb2sRbctCe%(
zCr^%^IX^+|uaj-rbKu06x9%<KMZKu+H<`b4d*SP^o<2z1+7Qe&nAV*yd~|f*OR;u^
zUe}yh@4)s=6AO1{S4XuP6y5pk$4B=bvLf<NFdBtnZOlB<GckAPHtzZ$YiQ`hqx%op
zt1t@c&(MU?)7zJrnwpzMJqR+a4Ts-&?e$ojBuvZY44)wAL#&C*w9*@=7A{{=^$IpX
zcJDJEyuW3;LZR`WV~jA(B|7LspaSzx?MSlaY<B4uGKizz28qW9`yZ3Icz8%WJhGT{
zBN*X(Do8wJaN^>Td34VZ9bxrCkU{V8ZYS<vl>zD?85FH3j&X(>DsbZ8u%mki*%am!
zf^53B4rtS@`}6SV<sCL7X+iQCr&&hUPhGUxH$WHmT2OmiS_>H<d@Iw<n`}YRg60^f
zC==e0Xj)UTB$3r1C*EpC8w!P5EYrhVr0|FXC%A@cQVBcRPQ+Kq3ZyorC52!3=A~I?
zh5{0UC>=zQLF))4Qg~*lkrh_0s>(IB2Bgu9^94nsD7tx@3~unH3ltTv;Gq%dMrs=O
zPTtcx=n{oQq8R6M3OGno9AP`PpxZSX$wHx43q6M*Nhv$)ss=`(nBaJT>Eb=Mu^ixi
ztI6NyDB<}iBaDan3pexSW{f0DIlvrY8>RZbLZT^F$8yZ$HiN)rF_#;kR$A44YMv*9
zq?32qMyVc&k5T&S?Q2skgcG3YTXUmJ>A}sd(Z(cdXBSakW(&(`bbSJV$wKMVu^Z=@
zq~Mp)tcxvhmRgeC18K_)hlWcV!$c@GRnbqQ>VBI&JzBZM?^OKFMnoEF=A@lS_NQz^
z0|J3dfof3h&@80<?)tIO!Ue9gh_^O1g@hGxRkyYFCnJUq+AcKz&A_JWothjO%U@uE
zSt{#INQsN8%B&|Mow0;t2m^r;fDBAb4Cad8OdkIse~~NPq`2OM1dT_PYNdLmlwEPm
zloK}{;fM$h7N*v!P&q#{GJg7E@n^0wMLtXm9{jJ_B-qRVnb<&j<5N9Pbf#j7h!BO!
z{mL)%KhE8oE#Dx=B-7-ZNB??1NQ)NI^s$L9(j;)O5x7)Y;vRRIVTQYunxk1C1O^Um
zq}V_Q?ZmJEj}?k6GS7XA)Ee464CHHP5hYFxCjix0VTBdk2O$pwh1E7N5Ktcqn*VzJ
z0kC^e-+H;3YybcNC3HntbYx+4WjbSWWnpw>05UK!FfA}OEigG$F*rIjIXW{oD=;!T
zFfdgfOsW6?03~!qSaf7zbY(hiZ)9m^c>ppnF)%GKH7zhXR53U@G&wpmHY+ePIxsLK
SL-ZB^0000<MNUMnLSTY_5>D0t

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_previous.png b/res/drawable-mdpi/ic_previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef90db9721935c5705880e718383f4a89b9015ed
GIT binary patch
literal 1352
zcmZ{kYdjNr7{~uBQ)upuTo+jrcDAL2IoKv!LQI4X&HWO&47r6>lx%Y?Eh|EY)oRiq
zPB$$fEC=BfPPycA7IJA7<*f7Wyf`nO=ll6R&*%5~J+Geghg=+C@>=o$02qZ#a+h+)
zkJ>CF?M`xs)TEFJwRg4$ppLDuMuSQ<B;MVT0B(zPW~2fUNOpGyAO#6P<{1FKN=KQ~
z03=`lm^}u7RVe@(F=fqec<Ew8fRiH$03Op2CslGWWbb$Y6r>RfY7oFF)BG_^jIj@u
z^4}xC$xYg9X}&3iWbZ+4n=I)(;c-}}%~oQ`Zs?=ocB}gYXYZAz)SNShsBYZzjHx}w
zfXW6>iUioXmB)yHgZa-$8)F0Wlx`V>%Lw~=ef(Uit6LlBA+KFR=N?Y!Xh{CJ?7lVd
zXtFD=V@=d_EiL2m{CpC6?T-Ejf1TF^IkWwo;t+kZQ^KQLI=tc%>aj8XO!LBTZ~Vlz
z3j|uK??A5ca7xtNXnRk|J8g^SwKm4>qra!GzpWsi<tFxGRuCwa=t|G#luz~gkG{p~
zOwCh245crKcNQ%vMA)0vI68N-*Y>8qAJ4iJ=DT{mPPQl|dSPTd)sK}#?r%1^D4sJ(
zWOjACH1Z;#zpW@eN=lQI(=OPypmt<8)ec?J<#M=Bef5KEY!^hntFkcPh6m(j?TS2S
zn-Q*><VI*d`!s#G<VArnXFRHK;2u7EA7r`Q0V{lwFv49=CfzO{V2Ha{M^DxNipoa?
z3DnWVvbT`Hi5a;7)$=7}BN5wk-f)Ai+hvO_;$6p=Vm>Y?Z^p|ch+<WlOwBx~wVocD
z!GAe7L<t?TODPVJjB-7P9Y5z7DH7ApRq0Z)PD7A*+D^%Gz2%NlT1AIsd6y7s2hoC|
zW8|5NGEl$J_=(1!2)i4W3)>cp6zuCr%{G<FD7%Vx3wy3z-xR?T)P>{B?Sws6aaDqv
zI}G!H8TE@f+CJ@OB0#|}KG?6(`S-zM71xGA@j(BUm&%;^(rZWan5KvVk5YpbO%f4d
zP75fncp4B{lj|iR^g+>3R)LU+YonkImEEXkZoW64@EI%~@A4w`G|8VO>N|EI1hp}o
z$aZ8Y;azP`@UUR}3PO!t{c)S)tq4_9>V)POu%c4g;?mEHJI<*d$o9D31-k^-mRHe*
zo4QSeW%97_)^v}i#8^htA!;e7bB*tR!sS4<PedK5z@ps%C9u`f%_8w4B~C_gLZ#4~
zdL;TTXJmzrgR@NS`HOgBu2;v~{noNdH}$u;mQCp$UYEsi*6wM%v0n16zoFu%^?f`)
z&?47Iy)XQ}KP!ES8_(Tz%6hL!VNXw6H@(>+aQ1tCSXLv9cd{h|rskTKu-Y#vxiDOz
z15Z6%K(gbynZ5En*hb$f_sXCuo8=%}9TRmZOgiP^bZ5gKZik}pqMui(bRwx(T^q*q
zw5I0tY|GeGqpOnFsWGIQDL;w$b)^3Z-y#~l?#{ll&AQ?Zhu<o|Vv7qWOB9Oc{cV!M
zzsMUFqb&aVGxBjHJpAf)HX$xDy3cNqbsRam&5PH2@?Ko}++vq_`Nb~>h9`e6341yS
z&7xQ*H_sqlS?X9*b+qEvkS|<g<mKQd@9wXNp1K(X@gj_#|3n7wS#$RZo_*w*H^19I
zE3MRlAtNUS69NL$$}jA5QP$?+Pkcj;Vr#~?HOTsyU98^Kged6~F`_#hp$F0E!B&BB
z!BPMm28%Jn>@mYwdSLfinOj<6u_hRt6$aB=mf-y#L)3|&@Q~#HH&nKCPf87d;^0EM
IO*qE*2iYP`PXGV_

literal 0
HcmV?d00001

diff --git a/res/layout/encrypt.xml b/res/layout/encrypt.xml
new file mode 100644
index 000000000..333b38941
--- /dev/null
+++ b/res/layout/encrypt.xml
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:paddingTop="5dip">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="5dip">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/source_previous"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/source_label"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/source_next"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/source"
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1">
+
+                <LinearLayout
+                    android:id="@+id/source_message"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <EditText
+                        android:id="@+id/message"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:gravity="top"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/source_file"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <EditText
+                            android:id="@+id/filename"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"/>
+
+                        <ImageButton
+                            android:id="@+id/btn_browse"
+                            android:src="@drawable/ic_launcher_folder_small"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_delete_after_encryption"
+                            android:text="@string/label_delete_after_encryption"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/delete_after_encryption"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_ascii_armour"
+                            android:text="@string/label_ascii_armour"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/ascii_armour"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </ViewFlipper>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_marginBottom="5dip"/>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/mode_previous"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/mode_label"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_asymmetric"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/mode_next"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/mode"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:id="@+id/mode_asymmetric"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_sign"
+                            android:text="@string/label_sign"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="5dip">
+
+                            <TextView
+                                android:id="@+id/main_user_id"
+                                android:text="Main User Id"
+                                android:textAppearance="?android:attr/textAppearanceMedium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="right"/>
+
+                            <TextView
+                                android:id="@+id/main_user_id_rest"
+                                android:text="Main User Id Rest"
+                                android:textAppearance="?android:attr/textAppearanceSmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="right"/>
+
+                        </LinearLayout>
+
+                        <CheckBox
+                            android:id="@+id/sign"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="3dip"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_select_public_keys"
+                            android:text="@string/label_select_public_keys"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"
+                            android:layout_gravity="center_vertical"/>
+
+                        <Button
+                            android:text="@string/btn_selectEncryptKeys"
+                            android:id="@+id/btn_selectEncryptKeys"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <TableLayout
+                    android:id="@+id/mode_symmetric"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"
+                    android:stretchColumns="1">
+
+                    <TableRow>
+
+                        <TextView
+                            android:id="@+id/label_pass_phrase"
+                            android:text="@string/label_pass_phrase"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"/>
+
+                        <EditText
+                            android:id="@+id/pass_phrase"
+                            android:layout_height="wrap_content"
+                            android:layout_width="fill_parent"
+                            android:inputType="textPassword"/>
+
+                    </TableRow>
+
+                    <TableRow>
+
+                        <TextView
+                            android:id="@+id/label_pass_phrase_again"
+                            android:text="@string/label_pass_phrase_again"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"/>
+
+                        <EditText
+                            android:id="@+id/pass_phrase_again"
+                            android:layout_height="wrap_content"
+                            android:layout_width="fill_parent"
+                            android:inputType="textPassword"/>
+
+                    </TableRow>
+
+                </TableLayout>
+
+            </ViewFlipper>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_marginBottom="5dip"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button
+            android:id="@+id/btn_encrypt_to_clipboard"
+            android:text="@string/btn_encrypt_to_clipboard"
+            android:layout_weight="1"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"/>
+
+        <Button
+            android:id="@+id/btn_encrypt"
+            android:text="@string/btn_encrypt"
+            android:layout_weight="1"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/encrypt_file.xml b/res/layout/encrypt_file.xml
index 259a7deba..f495bb4c0 100644
--- a/res/layout/encrypt_file.xml
+++ b/res/layout/encrypt_file.xml
@@ -149,7 +149,7 @@
 
                 <RadioButton
                     android:id="@+id/use_asymmetric"
-                    android:text="@string/use_asymmetric"
+                    android:text="@string/label_asymmetric"
                     android:layout_height="wrap_content"
                     android:layout_width="0dip"
                     android:layout_weight="1"
@@ -157,7 +157,7 @@
 
                 <RadioButton
                     android:id="@+id/use_symmetric"
-                    android:text="@string/use_symmetric"
+                    android:text="@string/label_symmetric"
                     android:layout_height="wrap_content"
                     android:layout_width="0dip"
                     android:layout_weight="1"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d8365f2e6..2da6b8c3b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,7 @@
     <string name="title_manageSecretKeys">Manage Secret Keys</string>
     <string name="title_selectRecipients">Select Recipients</string>
     <string name="title_selectSignature">Select Signature</string>
-    <string name="title_encryptMessage">Encrypt Message</string>
+    <string name="title_encrypt">Encrypt</string>
     <string name="title_decryptMessage">Decrypt Message</string>
     <string name="title_encryptFile">Encrypt File</string>
     <string name="title_decryptFile">Decrypt File</string>
@@ -60,6 +60,7 @@
     <string name="none">&lt;none&gt;</string>
 
     <string name="label_sign">Sign</string>
+    <string name="label_message">Message</string>
     <string name="label_file">File</string>
     <string name="label_pass_phrase">Pass Phrase</string>
     <string name="label_pass_phrase_again">Again</string>
@@ -71,8 +72,8 @@
     <string name="label_encryption_algorithm">Encryption Algorithm</string>
     <string name="label_hash_algorithm">Hash Algorithm</string>
 
-    <string name="use_asymmetric">Public Key</string>
-    <string name="use_symmetric">Pass Phrase</string>
+    <string name="label_asymmetric">Public Key</string>
+    <string name="label_symmetric">Pass Phrase</string>
 
     <string name="section_defaults">Defaults</string>
 
diff --git a/src/org/thialfihar/android/apg/DecryptMessageActivity.java b/src/org/thialfihar/android/apg/DecryptMessageActivity.java
index ea9e960e4..b2eaf589d 100644
--- a/src/org/thialfihar/android/apg/DecryptMessageActivity.java
+++ b/src/org/thialfihar/android/apg/DecryptMessageActivity.java
@@ -167,7 +167,7 @@ public class DecryptMessageActivity extends BaseActivity {
     }
 
     private void replyClicked() {
-        Intent intent = new Intent(this, EncryptMessageActivity.class);
+        Intent intent = new Intent(this, EncryptActivity.class);
         intent.setAction(Apg.Intent.ENCRYPT);
         String data = mMessage.getText().toString();
         data = data.replaceAll("(?m)^", "> ");
diff --git a/src/org/thialfihar/android/apg/EncryptActivity.java b/src/org/thialfihar/android/apg/EncryptActivity.java
new file mode 100644
index 000000000..e98a4c785
--- /dev/null
+++ b/src/org/thialfihar/android/apg/EncryptActivity.java
@@ -0,0 +1,783 @@
+/*
+ * Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.thialfihar.android.apg;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SignatureException;
+import java.util.Vector;
+
+import org.bouncycastle2.openpgp.PGPException;
+import org.bouncycastle2.openpgp.PGPPublicKey;
+import org.bouncycastle2.openpgp.PGPPublicKeyRing;
+import org.bouncycastle2.openpgp.PGPSecretKey;
+import org.bouncycastle2.openpgp.PGPSecretKeyRing;
+import org.bouncycastle2.util.Strings;
+import org.openintents.intents.FileManager;
+import org.thialfihar.android.apg.Apg.GeneralException;
+
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Message;
+import android.text.ClipboardManager;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.animation.AnimationUtils;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ViewFlipper;
+
+public class EncryptActivity extends BaseActivity {
+    private String mSubject = null;
+    private String mSendTo = null;
+
+    private long mEncryptionKeyIds[] = null;
+
+    private EditText mMessage = null;
+    private Button mSelectKeysButton = null;
+    private Button mEncryptButton = null;
+    private Button mEncryptToClipboardButton = null;
+    private CheckBox mSign = null;
+    private TextView mMainUserId = null;
+    private TextView mMainUserIdRest = null;
+
+    private ViewFlipper mSource = null;
+    private TextView mSourceLabel = null;
+    private ImageView mSourcePrevious = null;
+    private ImageView mSourceNext = null;
+
+    private ViewFlipper mMode = null;
+    private TextView mModeLabel = null;
+    private ImageView mModePrevious = null;
+    private ImageView mModeNext = null;
+
+    private int mEncryptTarget;
+
+    private EditText mPassPhrase = null;
+    private EditText mPassPhraseAgain = null;
+    private CheckBox mAsciiArmour = null;
+
+    private EditText mFilename = null;
+    private CheckBox mDeleteAfter = null;
+    private ImageButton mBrowse = null;
+
+    private String mInputFilename = null;
+    private String mOutputFilename = null;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.encrypt);
+
+        mSource = (ViewFlipper) findViewById(R.id.source);
+        mSourceLabel = (TextView) findViewById(R.id.source_label);
+        mSourcePrevious = (ImageView) findViewById(R.id.source_previous);
+        mSourceNext = (ImageView) findViewById(R.id.source_next);
+
+        mSourcePrevious.setClickable(true);
+        mSourcePrevious.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mSource.setInAnimation(AnimationUtils.loadAnimation(EncryptActivity.this,
+                                                                    R.anim.push_right_in));
+                mSource.setOutAnimation(AnimationUtils.loadAnimation(EncryptActivity.this,
+                                                                     R.anim.push_right_out));
+                mSource.showPrevious();
+                updateSource();
+            }
+        });
+
+        mSourceNext.setClickable(true);
+        OnClickListener nextSourceClickListener = new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mSource.setInAnimation(AnimationUtils.loadAnimation(EncryptActivity.this,
+                                                                    R.anim.push_left_in));
+                mSource.setOutAnimation(AnimationUtils.loadAnimation(EncryptActivity.this,
+                                                                     R.anim.push_left_out));
+                mSource.showNext();
+                updateSource();
+            }
+        };
+        mSourceNext.setOnClickListener(nextSourceClickListener);
+
+        mSourceLabel.setClickable(true);
+        mSourceLabel.setOnClickListener(nextSourceClickListener);
+
+        mMode = (ViewFlipper) findViewById(R.id.mode);
+        mModeLabel = (TextView) findViewById(R.id.mode_label);
+        mModePrevious = (ImageView) findViewById(R.id.mode_previous);
+        mModeNext = (ImageView) findViewById(R.id.mode_next);
+
+        mModePrevious.setClickable(true);
+        mModePrevious.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mMode.setInAnimation(AnimationUtils.loadAnimation(EncryptActivity.this,
+                                                                    R.anim.push_right_in));
+                mMode.setOutAnimation(AnimationUtils.loadAnimation(EncryptActivity.this,
+                                                                     R.anim.push_right_out));
+                mMode.showPrevious();
+                updateMode();
+            }
+        });
+
+        OnClickListener nextModeClickListener = new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mMode.setInAnimation(AnimationUtils.loadAnimation(EncryptActivity.this,
+                                                                    R.anim.push_left_in));
+                mMode.setOutAnimation(AnimationUtils.loadAnimation(EncryptActivity.this,
+                                                                     R.anim.push_left_out));
+                mMode.showNext();
+                updateMode();
+            }
+        };
+        mModeNext.setOnClickListener(nextModeClickListener);
+
+        mModeLabel.setClickable(true);
+        mModeLabel.setOnClickListener(nextModeClickListener);
+
+        mMessage = (EditText) findViewById(R.id.message);
+        mSelectKeysButton = (Button) findViewById(R.id.btn_selectEncryptKeys);
+        mEncryptButton = (Button) findViewById(R.id.btn_encrypt);
+        mEncryptToClipboardButton = (Button) findViewById(R.id.btn_encrypt_to_clipboard);
+        mSign = (CheckBox) findViewById(R.id.sign);
+        mMainUserId = (TextView) findViewById(R.id.main_user_id);
+        mMainUserIdRest = (TextView) findViewById(R.id.main_user_id_rest);
+
+        mPassPhrase = (EditText) findViewById(R.id.pass_phrase);
+        mPassPhraseAgain = (EditText) findViewById(R.id.pass_phrase_again);
+
+        // measure the height of the source_file view and set the message view's min height to that,
+        // so it fills mSource fully... bit of a hack.
+        View tmp = findViewById(R.id.source_file);
+        tmp.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+        int height = tmp.getMeasuredHeight();
+        mMessage.setMinimumHeight(height);
+
+        mFilename = (EditText) findViewById(R.id.filename);
+        mBrowse = (ImageButton) findViewById(R.id.btn_browse);
+        mBrowse.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openFile();
+            }
+        });
+
+        mDeleteAfter = (CheckBox) findViewById(R.id.delete_after_encryption);
+
+        mAsciiArmour = (CheckBox) findViewById(R.id.ascii_armour);
+        mAsciiArmour.setChecked(getDefaultAsciiArmour());
+        mAsciiArmour.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                guessOutputFilename();
+            }
+        });
+
+        mEncryptToClipboardButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                encryptToClipboardClicked();
+            }
+        });
+
+        mEncryptButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                encryptClicked();
+            }
+        });
+
+        mSelectKeysButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                selectPublicKeys();
+            }
+        });
+
+        mSign.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CheckBox checkBox = (CheckBox) v;
+                if (checkBox.isChecked()) {
+                    selectSecretKey();
+                } else {
+                    setSecretKeyId(0);
+                    Apg.setPassPhrase(null);
+                    updateView();
+                }
+            }
+        });
+
+        Intent intent = getIntent();
+        if (intent.getAction() != null &&
+            (intent.getAction().equals(Apg.Intent.ENCRYPT) ||
+             intent.getAction().equals(Apg.Intent.ENCRYPT_FILE))) {
+            Bundle extras = intent.getExtras();
+            if (extras == null) {
+                extras = new Bundle();
+            }
+            String data = extras.getString("data");
+            mSendTo = extras.getString("sendTo");
+            mSubject = extras.getString("subject");
+            long signatureKeyId = extras.getLong("signatureKeyId");
+            long encryptionKeyIds[] = extras.getLongArray("encryptionKeyIds");
+            if (signatureKeyId != 0) {
+                PGPSecretKeyRing keyRing = Apg.findSecretKeyRing(signatureKeyId);
+                PGPSecretKey masterKey = null;
+                if (keyRing != null) {
+                    masterKey = Apg.getMasterKey(keyRing);
+                    if (masterKey != null) {
+                        Vector<PGPSecretKey> signKeys = Apg.getUsableSigningKeys(keyRing);
+                        if (signKeys.size() > 0) {
+                            setSecretKeyId(masterKey.getKeyID());
+                        }
+                    }
+                }
+            }
+
+            if (encryptionKeyIds != null) {
+                Vector<Long> goodIds = new Vector<Long>();
+                for (int i = 0; i < encryptionKeyIds.length; ++i) {
+                    PGPPublicKeyRing keyRing = Apg.findPublicKeyRing(encryptionKeyIds[i]);
+                    PGPPublicKey masterKey = null;
+                    if (keyRing == null) {
+                        continue;
+                    }
+                    masterKey = Apg.getMasterKey(keyRing);
+                    if (masterKey == null) {
+                        continue;
+                    }
+                    Vector<PGPPublicKey> encryptKeys = Apg.getUsableEncryptKeys(keyRing);
+                    if (encryptKeys.size() == 0) {
+                        continue;
+                    }
+                    goodIds.add(masterKey.getKeyID());
+                }
+                if (goodIds.size() > 0) {
+                    mEncryptionKeyIds = new long[goodIds.size()];
+                    for (int i = 0; i < goodIds.size(); ++i) {
+                        mEncryptionKeyIds[i] = goodIds.get(i);
+                    }
+                }
+            }
+
+            if (intent.getAction().equals(Apg.Intent.ENCRYPT)) {
+                if (data != null) {
+                    mMessage.setText(data);
+                }
+                mSource.setInAnimation(null);
+                mSource.setOutAnimation(null);
+                while (mSource.getCurrentView().getId() != R.id.source_message) {
+                    mSource.showNext();
+                }
+            } else if (intent.getAction().equals(Apg.Intent.ENCRYPT_FILE)) {
+                mSource.setInAnimation(null);
+                mSource.setOutAnimation(null);
+                while (mSource.getCurrentView().getId() != R.id.source_file) {
+                    mSource.showNext();
+                }
+            }
+        }
+
+        updateView();
+        updateSource();
+        updateMode();
+    }
+
+    private void openFile() {
+        String filename = mFilename.getText().toString();
+
+        Intent intent = new Intent(FileManager.ACTION_PICK_FILE);
+
+        intent.setData(Uri.parse("file://" + filename));
+
+        intent.putExtra(FileManager.EXTRA_TITLE, "Select file to encrypt...");
+        intent.putExtra(FileManager.EXTRA_BUTTON_TEXT, "Open");
+
+        try {
+            startActivityForResult(intent, Id.request.filename);
+        } catch (ActivityNotFoundException e) {
+            // No compatible file manager was found.
+            Toast.makeText(this, R.string.no_filemanager_installed, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void guessOutputFilename() {
+        mInputFilename = mFilename.getText().toString();
+        File file = new File(mInputFilename);
+        String ending = (mAsciiArmour.isChecked() ? ".asc" : ".gpg");
+        mOutputFilename = Constants.path.app_dir + "/" + file.getName() + ending;
+    }
+
+    private void updateSource() {
+        switch (mSource.getCurrentView().getId()) {
+            case R.id.source_file: {
+                mSourceLabel.setText(R.string.label_file);
+                mEncryptButton.setText(R.string.btn_encrypt);
+                mEncryptToClipboardButton.setEnabled(false);
+                break;
+            }
+
+            case R.id.source_message: {
+                mSourceLabel.setText(R.string.label_message);
+                mEncryptButton.setText(R.string.btn_send);
+                mEncryptToClipboardButton.setEnabled(true);
+                break;
+            }
+
+            default: {
+                break;
+            }
+        }
+    }
+
+    private void updateMode() {
+        switch (mMode.getCurrentView().getId()) {
+            case R.id.mode_asymmetric: {
+                mModeLabel.setText(R.string.label_asymmetric);
+                break;
+            }
+
+            case R.id.mode_symmetric: {
+                mModeLabel.setText(R.string.label_symmetric);
+                break;
+            }
+
+            default: {
+                break;
+            }
+        }
+    }
+
+    private void encryptToClipboardClicked() {
+        mEncryptTarget = Id.target.clipboard;
+        initiateEncryption();
+    }
+
+    private void encryptClicked() {
+        if (mSource.getCurrentView().getId() == R.id.source_file) {
+            mEncryptTarget = Id.target.file;
+        } else {
+            mEncryptTarget = Id.target.email;
+        }
+        initiateEncryption();
+    }
+
+    private void initiateEncryption() {
+        if (mEncryptTarget == Id.target.file) {
+            String currentFilename = mFilename.getText().toString();
+            if (mInputFilename == null || !mInputFilename.equals(currentFilename)) {
+                guessOutputFilename();
+            }
+
+            if (mInputFilename.equals("")) {
+                Toast.makeText(this, "Select a file first.", Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            File file = new File(mInputFilename);
+            if (!file.exists() || !file.isFile()) {
+                Toast.makeText(this, "Error: file not found", Toast.LENGTH_SHORT).show();
+                return;
+            }
+        }
+
+        // symmetric encryption
+        if (mMode.getCurrentView().getId() == R.id.mode_symmetric) {
+            boolean gotPassPhrase = false;
+            String passPhrase = mPassPhrase.getText().toString();
+            String passPhraseAgain = mPassPhraseAgain.getText().toString();
+            if (!passPhrase.equals(passPhraseAgain)) {
+                Toast.makeText(this, "Pass phrases don't match.", Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            gotPassPhrase = (passPhrase.length() != 0);
+            if (!gotPassPhrase) {
+                Toast.makeText(this, "Enter a pass phrase.", Toast.LENGTH_SHORT).show();
+                return;
+            }
+        } else {
+            boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
+            // for now require at least one form of encryption for files
+            if (!encryptIt && mEncryptTarget == Id.target.file) {
+                Toast.makeText(this, "Select at least one encryption key.",
+                               Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            if (!encryptIt && getSecretKeyId() == 0) {
+                Toast.makeText(this, "Select at least one encryption key or a signature key.",
+                               Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            if (getSecretKeyId() != 0 && Apg.getPassPhrase() == null) {
+                showDialog(Id.dialog.pass_phrase);
+                return;
+            }
+        }
+
+        if (mEncryptTarget == Id.target.file) {
+            askForOutputFilename();
+        } else {
+            encryptStart();
+        }
+    }
+
+    private void askForOutputFilename() {
+        showDialog(Id.dialog.output_filename);
+    }
+
+    @Override
+    public void passPhraseCallback(String passPhrase) {
+        super.passPhraseCallback(passPhrase);
+        if (mEncryptTarget == Id.target.file) {
+            askForOutputFilename();
+        } else {
+            encryptStart();
+        }
+    }
+
+    private void encryptStart() {
+        showDialog(Id.dialog.encrypting);
+        startThread();
+    }
+
+    @Override
+    public void run() {
+        String error = null;
+        Bundle data = new Bundle();
+        Message msg = new Message();
+
+        try {
+            InputStream in;
+            OutputStream out;
+            long size;
+            boolean useAsciiArmour = true;
+            long encryptionKeyIds[] = null;
+            long signatureKeyId = 0;
+            boolean signOnly = false;
+
+            String passPhrase = null;
+            if (mMode.getCurrentView().getId() == R.id.mode_symmetric) {
+                passPhrase = mPassPhrase.getText().toString();
+                if (passPhrase.length() == 0) {
+                    passPhrase = null;
+                }
+            } else {
+                encryptionKeyIds = mEncryptionKeyIds;
+                signatureKeyId = getSecretKeyId();
+                signOnly = mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0;
+            }
+
+            if (mEncryptTarget == Id.target.file) {
+                if (mInputFilename.startsWith(Environment.getExternalStorageDirectory().getAbsolutePath()) ||
+                    mOutputFilename.startsWith(Environment.getExternalStorageDirectory().getAbsolutePath())) {
+                    if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+                        throw new GeneralException("external storage not ready");
+                    }
+                }
+
+                in = new FileInputStream(mInputFilename);
+                out = new FileOutputStream(mOutputFilename);
+
+                File file = new File(mInputFilename);
+                size = file.length();
+                useAsciiArmour = mAsciiArmour.isChecked();
+            } else {
+                String message = mMessage.getText().toString();
+
+                if (signOnly) {
+                    // fix the message a bit, trailing spaces and newlines break stuff,
+                    // because GMail sends as HTML and such things fuck up the signature,
+                    // TODO: things like "<" and ">" also fuck up the signature
+                    message = message.replaceAll(" +\n", "\n");
+                    message = message.replaceAll("\n\n+", "\n\n");
+                    message = message.replaceFirst("^\n+", "");
+                    // make sure there'll be exactly one newline at the end
+                    message = message.replaceFirst("\n*$", "\n");
+                }
+
+                byte[] byteData = Strings.toUTF8ByteArray(message);
+                in = new ByteArrayInputStream(byteData);
+                out = new ByteArrayOutputStream();
+
+                size = byteData.length;
+                useAsciiArmour = true;
+            }
+
+            if (signOnly) {
+                Apg.signText(in, out, getSecretKeyId(),
+                             Apg.getPassPhrase(), getDefaultHashAlgorithm(), this);
+            } else {
+                Apg.encrypt(in, out, size, useAsciiArmour,
+                            encryptionKeyIds, signatureKeyId,
+                            Apg.getPassPhrase(), this,
+                            getDefaultEncryptionAlgorithm(), getDefaultHashAlgorithm(),
+                            passPhrase);
+            }
+
+            out.close();
+            if (mEncryptTarget != Id.target.file) {
+                data.putString("message", new String(((ByteArrayOutputStream)out).toByteArray()));
+            }
+        } catch (IOException e) {
+            error = e.getMessage();
+        } catch (PGPException e) {
+            error = e.getMessage();
+        } catch (NoSuchProviderException e) {
+            error = e.getMessage();
+        } catch (NoSuchAlgorithmException e) {
+            error = e.getMessage();
+        } catch (SignatureException e) {
+            error = e.getMessage();
+        } catch (Apg.GeneralException e) {
+            error = e.getMessage();
+        }
+
+        data.putInt("type", Id.message.done);
+
+        if (error != null) {
+            data.putString("error", error);
+        }
+
+        msg.setData(data);
+        sendMessage(msg);
+    }
+
+    private void updateView() {
+        if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) {
+            mSelectKeysButton.setText(R.string.no_keys_selected);
+        } else if (mEncryptionKeyIds.length == 1) {
+            mSelectKeysButton.setText(R.string.one_key_selected);
+        } else {
+            mSelectKeysButton.setText("" + mEncryptionKeyIds.length + " " +
+                                      getResources().getString(R.string.n_keys_selected));
+        }
+
+        if (getSecretKeyId() == 0) {
+            mSign.setChecked(false);
+            mMainUserId.setText("");
+            mMainUserIdRest.setText("");
+        } else {
+            String uid = getResources().getString(R.string.unknown_user_id);
+            String uidExtra = "";
+            PGPSecretKeyRing keyRing = Apg.getSecretKeyRing(getSecretKeyId());
+            if (keyRing != null) {
+                PGPSecretKey key = Apg.getMasterKey(keyRing);
+                if (key != null) {
+                    String userId = Apg.getMainUserIdSafe(this, key);
+                    String chunks[] = userId.split(" <", 2);
+                    uid = chunks[0];
+                    if (chunks.length > 1) {
+                        uidExtra = "<" + chunks[1];
+                    }
+                }
+            }
+            mMainUserId.setText(uid);
+            mMainUserIdRest.setText(uidExtra);
+            mSign.setChecked(true);
+        }
+    }
+
+    private void selectPublicKeys() {
+        Intent intent = new Intent(this, SelectPublicKeyListActivity.class);
+        intent.putExtra("selection", mEncryptionKeyIds);
+        startActivityForResult(intent, Id.request.public_keys);
+    }
+
+    private void selectSecretKey() {
+        Intent intent = new Intent(this, SelectSecretKeyListActivity.class);
+        startActivityForResult(intent, Id.request.secret_keys);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case Id.request.filename: {
+                if (resultCode == RESULT_OK && data != null) {
+                    String filename = data.getDataString();
+                    if (filename != null) {
+                        // Get rid of URI prefix:
+                        if (filename.startsWith("file://")) {
+                            filename = filename.substring(7);
+                        }
+                        // replace %20 and so on
+                        filename = Uri.decode(filename);
+
+                        mFilename.setText(filename);
+                    }
+                }
+                return;
+            }
+
+            case Id.request.output_filename: {
+                if (resultCode == RESULT_OK && data != null) {
+                    String filename = data.getDataString();
+                    if (filename != null) {
+                        // Get rid of URI prefix:
+                        if (filename.startsWith("file://")) {
+                            filename = filename.substring(7);
+                        }
+                        // replace %20 and so on
+                        filename = Uri.decode(filename);
+
+                        FileDialog.setFilename(filename);
+                    }
+                }
+                return;
+            }
+
+            case Id.request.secret_keys: {
+                if (resultCode == RESULT_OK) {
+                    super.onActivityResult(requestCode, resultCode, data);
+                }
+                updateView();
+                break;
+            }
+
+            case Id.request.public_keys: {
+                if (resultCode == RESULT_OK) {
+                    Bundle bundle = data.getExtras();
+                    mEncryptionKeyIds = bundle.getLongArray("selection");
+                }
+                updateView();
+                break;
+            }
+
+            default: {
+                break;
+            }
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @Override
+    public void doneCallback(Message msg) {
+        super.doneCallback(msg);
+
+        removeDialog(Id.dialog.encrypting);
+
+        Bundle data = msg.getData();
+        String error = data.getString("error");
+        if (error != null) {
+            Toast.makeText(EncryptActivity.this,
+                           "Error: " + data.getString("error"),
+                           Toast.LENGTH_SHORT).show();
+            return;
+        } else {
+            String message = data.getString("message");
+            switch (mEncryptTarget) {
+                case Id.target.clipboard: {
+                    ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+                    clip.setText(message);
+                    Toast.makeText(this, "Successfully encrypted to clipboard.",
+                                   Toast.LENGTH_SHORT).show();
+                    break;
+                }
+
+                case Id.target.email: {
+                    Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND);
+                    emailIntent.setType("text/plain; charset=utf-8");
+                    emailIntent.putExtra(android.content.Intent.EXTRA_TEXT, message);
+                    if (mSubject != null) {
+                        emailIntent.putExtra(android.content.Intent.EXTRA_SUBJECT,
+                                             mSubject);
+                    }
+                    if (mSendTo != null) {
+                        emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL,
+                                             new String[] { mSendTo });
+                    }
+                    EncryptActivity.this.
+                            startActivity(Intent.createChooser(emailIntent, "Send mail..."));
+                }
+
+                case Id.target.file: {
+                    Toast.makeText(this, "Successfully encrypted.", Toast.LENGTH_SHORT).show();
+                    if (mDeleteAfter.isChecked()) {
+                        setDeleteFile(mInputFilename);
+                        showDialog(Id.dialog.delete_file);
+                    }
+                    break;
+                }
+
+                default: {
+                    // shouldn't happen
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id) {
+        switch (id) {
+            case Id.dialog.output_filename: {
+                return FileDialog.build(this, "Encrypt to file",
+                                        "Please specify which file to encrypt to.\n" +
+                                        "WARNING! File will be overwritten if it exists.",
+                                        mOutputFilename,
+                                        new FileDialog.OnClickListener() {
+
+                                            @Override
+                                            public void onOkClick(String filename) {
+                                                removeDialog(Id.dialog.output_filename);
+                                                mOutputFilename = filename;
+                                                encryptStart();
+                                            }
+
+                                            @Override
+                                            public void onCancelClick() {
+                                                removeDialog(Id.dialog.output_filename);
+                                            }
+                                        },
+                                        getString(R.string.filemanager_title_save),
+                                        getString(R.string.filemanager_btn_save),
+                                        Id.request.output_filename);
+            }
+
+            default: {
+                break;
+            }
+        }
+
+        return super.onCreateDialog(id);
+    }
+}
\ No newline at end of file
diff --git a/src/org/thialfihar/android/apg/EncryptFileActivity.java b/src/org/thialfihar/android/apg/EncryptFileActivity.java
deleted file mode 100644
index dee9a3e39..000000000
--- a/src/org/thialfihar/android/apg/EncryptFileActivity.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.thialfihar.android.apg;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.SignatureException;
-
-import org.bouncycastle2.openpgp.PGPEncryptedData;
-import org.bouncycastle2.openpgp.PGPException;
-import org.bouncycastle2.openpgp.PGPSecretKey;
-import org.bouncycastle2.openpgp.PGPSecretKeyRing;
-import org.openintents.intents.FileManager;
-import org.thialfihar.android.apg.Apg.GeneralException;
-import org.thialfihar.android.apg.utils.Choice;
-
-import android.app.Dialog;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Message;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.RadioGroup;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.RadioGroup.OnCheckedChangeListener;
-
-public class EncryptFileActivity extends BaseActivity {
-    private EditText mFilename = null;
-    private CheckBox mDeleteAfter = null;
-    private ImageButton mBrowse = null;
-    private CheckBox mSign = null;
-    private TextView mMainUserId = null;
-    private TextView mMainUserIdRest = null;
-    private Spinner mAlgorithm = null;
-    private EditText mPassPhrase = null;
-    private EditText mPassPhraseAgain = null;
-    private CheckBox mAsciiArmour = null;
-    private RadioGroup mEncryptionMode = null;
-    private ViewGroup mAsymmetricLayout = null;
-    private ViewGroup mSymmetricLayout = null;
-    private Button mEncryptButton = null;
-    private Button mSelectKeysButton = null;
-
-    private long mEncryptionKeyIds[] = null;
-    private String mInputFilename = null;
-    private String mOutputFilename = null;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.encrypt_file);
-
-        mAsciiArmour = (CheckBox) findViewById(R.id.ascii_armour);
-        mAsciiArmour.setChecked(getDefaultAsciiArmour());
-        mAsciiArmour.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                guessOutputFilename();
-            }
-        });
-
-        // asymmetric tab
-        mSelectKeysButton = (Button) findViewById(R.id.btn_selectEncryptKeys);
-        mSelectKeysButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                selectPublicKeys();
-            }
-        });
-
-        mFilename = (EditText) findViewById(R.id.filename);
-        mBrowse = (ImageButton) findViewById(R.id.btn_browse);
-        mBrowse.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                openFile();
-            }
-        });
-
-        mDeleteAfter = (CheckBox) findViewById(R.id.delete_after_encryption);
-
-        mEncryptButton = (Button) findViewById(R.id.btn_encrypt);
-        mSign = (CheckBox) findViewById(R.id.sign);
-        mMainUserId = (TextView) findViewById(R.id.main_user_id);
-        mMainUserIdRest = (TextView) findViewById(R.id.main_user_id_rest);
-
-        mSign.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CheckBox checkBox = (CheckBox) v;
-                if (checkBox.isChecked()) {
-                    selectSecretKey();
-                } else {
-                    setSecretKeyId(0);
-                    Apg.setPassPhrase(null);
-                    updateView();
-                }
-            }
-        });
-
-        // symmetric tab
-
-        mAlgorithm = (Spinner) findViewById(R.id.algorithm);
-        Choice choices[] = {
-                new Choice(PGPEncryptedData.AES_128, "AES 128"),
-                new Choice(PGPEncryptedData.AES_192, "AES 192"),
-                new Choice(PGPEncryptedData.AES_256, "AES 256"),
-                new Choice(PGPEncryptedData.BLOWFISH, "Blowfish"),
-                new Choice(PGPEncryptedData.TWOFISH, "Twofish"),
-                new Choice(PGPEncryptedData.CAST5, "CAST5"),
-                new Choice(PGPEncryptedData.DES, "DES"),
-                new Choice(PGPEncryptedData.TRIPLE_DES, "Triple DES"),
-                new Choice(PGPEncryptedData.IDEA, "IDEA"),
-        };
-        ArrayAdapter<Choice> adapter =
-                new ArrayAdapter<Choice>(this, android.R.layout.simple_spinner_item, choices);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mAlgorithm.setAdapter(adapter);
-        for (int i = 0; i < choices.length; ++i) {
-            if (choices[i].getId() == getDefaultEncryptionAlgorithm()) {
-                mAlgorithm.setSelection(i);
-                break;
-            }
-        }
-
-        mEncryptionMode = (RadioGroup) findViewById(R.id.encryption_mode);
-        mAsymmetricLayout = (ViewGroup) findViewById(R.id.layout_asymmetric);
-        mSymmetricLayout = (ViewGroup) findViewById(R.id.layout_symmetric);
-        mPassPhrase = (EditText) findViewById(R.id.pass_phrase);
-        mPassPhraseAgain = (EditText) findViewById(R.id.pass_phrase_again);
-
-        mEncryptionMode.check(R.id.use_asymmetric);
-        mEncryptionMode.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup group, int checkedId) {
-                if (checkedId == R.id.use_symmetric) {
-                    mAsymmetricLayout.setVisibility(ViewGroup.GONE);
-                    mSymmetricLayout.setVisibility(ViewGroup.VISIBLE);
-                    mEncryptionKeyIds = null;
-                    setSecretKeyId(0);
-                } else {
-                    mAsymmetricLayout.setVisibility(ViewGroup.VISIBLE);
-                    mSymmetricLayout.setVisibility(ViewGroup.GONE);
-                    mPassPhrase.setText("");
-                    mPassPhraseAgain.setText("");
-                }
-                updateView();
-            }
-        });
-        if (mEncryptionMode.getCheckedRadioButtonId() == R.id.use_symmetric) {
-            mAsymmetricLayout.setVisibility(ViewGroup.GONE);
-            mSymmetricLayout.setVisibility(ViewGroup.VISIBLE);
-        } else {
-            mAsymmetricLayout.setVisibility(ViewGroup.VISIBLE);
-            mSymmetricLayout.setVisibility(ViewGroup.GONE);
-        }
-
-        mEncryptButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                encryptClicked();
-            }
-        });
-
-        updateView();
-    }
-
-    private void updateView() {
-        if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) {
-            mSelectKeysButton.setText(R.string.no_keys_selected);
-        } else if (mEncryptionKeyIds.length == 1) {
-            mSelectKeysButton.setText(R.string.one_key_selected);
-        } else {
-            mSelectKeysButton.setText("" + mEncryptionKeyIds.length + " " +
-                                      getResources().getString(R.string.n_keys_selected));
-        }
-
-        if (getSecretKeyId() == 0) {
-            mSign.setChecked(false);
-            mMainUserId.setText("");
-            mMainUserIdRest.setText("");
-        } else {
-            String uid = getResources().getString(R.string.unknown_user_id);
-            String uidExtra = "";
-            PGPSecretKeyRing keyRing = Apg.getSecretKeyRing(getSecretKeyId());
-            if (keyRing != null) {
-                PGPSecretKey key = Apg.getMasterKey(keyRing);
-                if (key != null) {
-                    String userId = Apg.getMainUserIdSafe(this, key);
-                    String chunks[] = userId.split(" <", 2);
-                    uid = chunks[0];
-                    if (chunks.length > 1) {
-                        uidExtra = "<" + chunks[1];
-                    }
-                }
-            }
-            mMainUserId.setText(uid);
-            mMainUserIdRest.setText(uidExtra);
-            mSign.setChecked(true);
-        }
-    }
-
-    private void openFile() {
-        String filename = mFilename.getText().toString();
-
-        Intent intent = new Intent(FileManager.ACTION_PICK_FILE);
-
-        intent.setData(Uri.parse("file://" + filename));
-
-        intent.putExtra(FileManager.EXTRA_TITLE, "Select file to encrypt...");
-        intent.putExtra(FileManager.EXTRA_BUTTON_TEXT, "Open");
-
-        try {
-            startActivityForResult(intent, Id.request.filename);
-        } catch (ActivityNotFoundException e) {
-            // No compatible file manager was found.
-            Toast.makeText(this, R.string.no_filemanager_installed, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private void selectSecretKey() {
-        Intent intent = new Intent(this, SelectSecretKeyListActivity.class);
-        startActivityForResult(intent, Id.request.secret_keys);
-    }
-
-    private void selectPublicKeys() {
-        Intent intent = new Intent(this, SelectPublicKeyListActivity.class);
-        intent.putExtra("selection", mEncryptionKeyIds);
-        startActivityForResult(intent, Id.request.public_keys);
-    }
-
-    private void guessOutputFilename() {
-        mInputFilename = mFilename.getText().toString();
-        File file = new File(mInputFilename);
-        String ending = (mAsciiArmour.isChecked() ? ".asc" : ".gpg");
-        mOutputFilename = Constants.path.app_dir + "/" + file.getName() + ending;
-    }
-
-    private void encryptClicked() {
-        String currentFilename = mFilename.getText().toString();
-        if (mInputFilename == null || !mInputFilename.equals(currentFilename)) {
-            guessOutputFilename();
-        }
-
-        if (mInputFilename.equals("")) {
-            Toast.makeText(this, "Select a file first.", Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        File file = new File(mInputFilename);
-        if (!file.exists() || !file.isFile()) {
-            Toast.makeText(this, "Error: file not found", Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        // symmetric encryption
-        if (mEncryptionMode.getCheckedRadioButtonId() == R.id.use_symmetric) {
-            boolean gotPassPhrase = false;
-            String passPhrase = mPassPhrase.getText().toString();
-            String passPhraseAgain = mPassPhraseAgain.getText().toString();
-            if (!passPhrase.equals(passPhraseAgain)) {
-                Toast.makeText(this, "Pass phrases don't match.",
-                               Toast.LENGTH_SHORT).show();
-                return;
-            }
-
-            gotPassPhrase = (passPhrase.length() != 0);
-            if (!gotPassPhrase) {
-                Toast.makeText(this, "Enter a pass phrase.",
-                               Toast.LENGTH_SHORT).show();
-                return;
-            }
-        } else {
-            boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
-            // for now require at least one form of encryption
-            if (!encryptIt) {
-                Toast.makeText(this, "Select at least one encryption key.",
-                               Toast.LENGTH_SHORT).show();
-                return;
-            }
-
-            if (getSecretKeyId() != 0 && Apg.getPassPhrase() == null) {
-                showDialog(Id.dialog.pass_phrase);
-                return;
-            }
-        }
-
-        askForOutputFilename();
-    }
-
-    @Override
-    public void passPhraseCallback(String passPhrase) {
-        super.passPhraseCallback(passPhrase);
-        askForOutputFilename();
-    }
-
-    private void askForOutputFilename() {
-        showDialog(Id.dialog.output_filename);
-    }
-
-    private void encryptStart() {
-        showDialog(Id.dialog.encrypting);
-        startThread();
-    }
-
-    @Override
-    public void run() {
-        String error = null;
-        Bundle data = new Bundle();
-        Message msg = new Message();
-
-        try {
-            if (mInputFilename.startsWith(Environment.getExternalStorageDirectory().getAbsolutePath()) ||
-                mOutputFilename.startsWith(Environment.getExternalStorageDirectory().getAbsolutePath())) {
-                if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-                    throw new GeneralException("external storage not ready");
-                }
-            }
-
-            InputStream in = new FileInputStream(mInputFilename);
-            OutputStream out = new FileOutputStream(mOutputFilename);
-
-            String passPhrase = null;
-            if (mEncryptionMode.getCheckedRadioButtonId() == R.id.use_symmetric) {
-                passPhrase = mPassPhrase.getText().toString();
-                if (passPhrase.length() == 0) {
-                    passPhrase = null;
-                }
-            }
-
-            File file = new File(mInputFilename);
-            long fileSize = file.length();
-
-            Apg.encrypt(in, out, fileSize, mAsciiArmour.isChecked(),
-                        mEncryptionKeyIds, getSecretKeyId(),
-                        Apg.getPassPhrase(), this,
-                        ((Choice) mAlgorithm.getSelectedItem()).getId(),
-                        getDefaultHashAlgorithm(),
-                        passPhrase);
-
-            out.close();
-        } catch (FileNotFoundException e) {
-            error = "file not found: " + e.getMessage();
-        }
-        catch (IOException e) {
-            error = e.getMessage();
-        } catch (PGPException e) {
-            error = e.getMessage();
-        } catch (NoSuchProviderException e) {
-            error = e.getMessage();
-        } catch (NoSuchAlgorithmException e) {
-            error = e.getMessage();
-        } catch (SignatureException e) {
-            error = e.getMessage();
-        } catch (Apg.GeneralException e) {
-            error = e.getMessage();
-        }
-
-        data.putInt("type", Id.message.done);
-
-        if (error != null) {
-            data.putString("error", error);
-        }
-
-        msg.setData(data);
-        sendMessage(msg);
-    }
-
-    @Override
-    protected Dialog onCreateDialog(int id) {
-        switch (id) {
-            case Id.dialog.output_filename: {
-                return FileDialog.build(this, "Encrypt to file",
-                                        "Please specify which file to encrypt to.\n" +
-                                        "WARNING! File will be overwritten if it exists.",
-                                        mOutputFilename,
-                                        new FileDialog.OnClickListener() {
-
-                                            @Override
-                                            public void onOkClick(String filename) {
-                                                removeDialog(Id.dialog.output_filename);
-                                                mOutputFilename = filename;
-                                                encryptStart();
-                                            }
-
-                                            @Override
-                                            public void onCancelClick() {
-                                                removeDialog(Id.dialog.output_filename);
-                                            }
-                                        },
-                                        getString(R.string.filemanager_title_save),
-                                        getString(R.string.filemanager_btn_save),
-                                        Id.request.output_filename);
-            }
-
-            default: {
-                break;
-            }
-        }
-
-        return super.onCreateDialog(id);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case Id.request.filename: {
-                if (resultCode == RESULT_OK && data != null) {
-                    String filename = data.getDataString();
-                    if (filename != null) {
-                        // Get rid of URI prefix:
-                        if (filename.startsWith("file://")) {
-                            filename = filename.substring(7);
-                        }
-                        // replace %20 and so on
-                        filename = Uri.decode(filename);
-
-                        mFilename.setText(filename);
-                    }
-                }
-                return;
-            }
-
-            case Id.request.output_filename: {
-                if (resultCode == RESULT_OK && data != null) {
-                    String filename = data.getDataString();
-                    if (filename != null) {
-                        // Get rid of URI prefix:
-                        if (filename.startsWith("file://")) {
-                            filename = filename.substring(7);
-                        }
-                        // replace %20 and so on
-                        filename = Uri.decode(filename);
-
-                        FileDialog.setFilename(filename);
-                    }
-                }
-                return;
-            }
-
-            case Id.request.secret_keys: {
-                if (resultCode == RESULT_OK) {
-                    super.onActivityResult(requestCode, resultCode, data);
-                }
-                updateView();
-                break;
-            }
-
-            case Id.request.public_keys: {
-                if (resultCode == RESULT_OK) {
-                    Bundle bundle = data.getExtras();
-                    mEncryptionKeyIds = bundle.getLongArray("selection");
-                }
-                updateView();
-                break;
-            }
-
-            default: {
-                break;
-            }
-        }
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    @Override
-    public void doneCallback(Message msg) {
-        super.doneCallback(msg);
-        Bundle data = msg.getData();
-        removeDialog(Id.dialog.encrypting);
-
-        String error = data.getString("error");
-        if (error != null) {
-            Toast.makeText(EncryptFileActivity.this,
-                           "Error: " + data.getString("error"),
-                           Toast.LENGTH_SHORT).show();
-        } else {
-            Toast.makeText(EncryptFileActivity.this,
-                           "Successfully encrypted.",
-                           Toast.LENGTH_SHORT).show();
-            if (mDeleteAfter.isChecked()) {
-                setDeleteFile(mInputFilename);
-                showDialog(Id.dialog.delete_file);
-            }
-        }
-    }
-}
diff --git a/src/org/thialfihar/android/apg/EncryptMessageActivity.java b/src/org/thialfihar/android/apg/EncryptMessageActivity.java
deleted file mode 100644
index 3e49d7c50..000000000
--- a/src/org/thialfihar/android/apg/EncryptMessageActivity.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.thialfihar.android.apg;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.SignatureException;
-import java.util.Vector;
-
-import org.bouncycastle2.openpgp.PGPException;
-import org.bouncycastle2.openpgp.PGPPublicKey;
-import org.bouncycastle2.openpgp.PGPPublicKeyRing;
-import org.bouncycastle2.openpgp.PGPSecretKey;
-import org.bouncycastle2.openpgp.PGPSecretKeyRing;
-import org.bouncycastle2.util.Strings;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Message;
-import android.text.ClipboardManager;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class EncryptMessageActivity extends BaseActivity {
-    private String mSubject = null;
-    private String mSendTo = null;
-
-    private long mEncryptionKeyIds[] = null;
-
-    private EditText mMessage = null;
-    private Button mSelectKeysButton = null;
-    private Button mEncryptButton = null;
-    private Button mSendButton = null;
-    private CheckBox mSign = null;
-    private TextView mMainUserId = null;
-    private TextView mMainUserIdRest = null;
-
-    private int mEncryptTarget;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.encrypt_message);
-
-        mMessage = (EditText) findViewById(R.id.message);
-        mSelectKeysButton = (Button) findViewById(R.id.btn_selectEncryptKeys);
-        mEncryptButton = (Button) findViewById(R.id.btn_encrypt_to_clipboard);
-        mSendButton = (Button) findViewById(R.id.btn_send);
-        mSign = (CheckBox) findViewById(R.id.sign);
-        mMainUserId = (TextView) findViewById(R.id.main_user_id);
-        mMainUserIdRest = (TextView) findViewById(R.id.main_user_id_rest);
-
-        Intent intent = getIntent();
-        if (intent.getAction() != null &&
-            intent.getAction().equals(Apg.Intent.ENCRYPT)) {
-            String data = intent.getExtras().getString("data");
-            mSendTo = intent.getExtras().getString("sendTo");
-            mSubject = intent.getExtras().getString("subject");
-            long signatureKeyId = intent.getExtras().getLong("signatureKeyId");
-            long encryptionKeyIds[] = intent.getExtras().getLongArray("encryptionKeyIds");
-            if (signatureKeyId != 0) {
-                PGPSecretKeyRing keyRing = Apg.findSecretKeyRing(signatureKeyId);
-                PGPSecretKey masterKey = null;
-                if (keyRing != null) {
-                    masterKey = Apg.getMasterKey(keyRing);
-                    if (masterKey != null) {
-                        Vector<PGPSecretKey> signKeys = Apg.getUsableSigningKeys(keyRing);
-                        if (signKeys.size() > 0) {
-                            setSecretKeyId(masterKey.getKeyID());
-                        }
-                    }
-                }
-            }
-
-            if (encryptionKeyIds != null) {
-                Vector<Long> goodIds = new Vector<Long>();
-                for (int i = 0; i < encryptionKeyIds.length; ++i) {
-                    PGPPublicKeyRing keyRing = Apg.findPublicKeyRing(encryptionKeyIds[i]);
-                    PGPPublicKey masterKey = null;
-                    if (keyRing == null) {
-                        continue;
-                    }
-                    masterKey = Apg.getMasterKey(keyRing);
-                    if (masterKey == null) {
-                        continue;
-                    }
-                    Vector<PGPPublicKey> encryptKeys = Apg.getUsableEncryptKeys(keyRing);
-                    if (encryptKeys.size() == 0) {
-                        continue;
-                    }
-                    goodIds.add(masterKey.getKeyID());
-                }
-                if (goodIds.size() > 0) {
-                    mEncryptionKeyIds = new long[goodIds.size()];
-                    for (int i = 0; i < goodIds.size(); ++i) {
-                        mEncryptionKeyIds[i] = goodIds.get(i);
-                    }
-                }
-            }
-            if (data != null) {
-                mMessage.setText(data);
-            }
-        }
-
-        mEncryptButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                encryptClicked();
-            }
-        });
-
-        mSendButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                sendClicked();
-            }
-        });
-
-        mSelectKeysButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                selectPublicKeys();
-            }
-        });
-
-        mSign.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CheckBox checkBox = (CheckBox) v;
-                if (checkBox.isChecked()) {
-                    selectSecretKey();
-                } else {
-                    setSecretKeyId(0);
-                    Apg.setPassPhrase(null);
-                    updateView();
-                }
-            }
-        });
-
-        updateView();
-    }
-
-    private void encryptClicked() {
-        mEncryptTarget = Id.target.clipboard;
-        if (getSecretKeyId() != 0 && Apg.getPassPhrase() == null) {
-            showDialog(Id.dialog.pass_phrase);
-        } else {
-            encryptStart();
-        }
-    }
-
-    private void sendClicked() {
-        mEncryptTarget = Id.target.email;
-        if (getSecretKeyId() != 0 && Apg.getPassPhrase() == null) {
-            showDialog(Id.dialog.pass_phrase);
-        } else {
-            encryptStart();
-        }
-    }
-
-    @Override
-    public void passPhraseCallback(String passPhrase) {
-        super.passPhraseCallback(passPhrase);
-        encryptStart();
-    }
-
-    private void encryptStart() {
-        showDialog(Id.dialog.encrypting);
-        startThread();
-    }
-
-    @Override
-    public void run() {
-        String error = null;
-        Bundle data = new Bundle();
-        Message msg = new Message();
-
-        try {
-            boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
-            if (getSecretKeyId() == 0 && !encryptIt) {
-                throw new Apg.GeneralException("no signature key or encryption key selected");
-            }
-
-            String message = mMessage.getText().toString();
-            if (!encryptIt) {
-                // fix the message a bit, trailing spaces and newlines break stuff,
-                // because GMail sends as HTML and such things fuck up the signature,
-                // TODO: things like "<" and ">" also fuck up the signature
-                message = message.replaceAll(" +\n", "\n");
-                message = message.replaceAll("\n\n+", "\n\n");
-                message = message.replaceFirst("^\n+", "");
-                // make sure there'll be exactly one newline at the end
-                message = message.replaceFirst("\n*$", "\n");
-            }
-
-            byte[] byteData = Strings.toUTF8ByteArray(message);
-            ByteArrayInputStream in = new ByteArrayInputStream(byteData);
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-            if (encryptIt) {
-                Apg.encrypt(in, out, byteData.length, true, mEncryptionKeyIds, getSecretKeyId(),
-                            Apg.getPassPhrase(), this,
-                            getDefaultEncryptionAlgorithm(), getDefaultHashAlgorithm(),
-                            null);
-            } else {
-                Apg.signText(in, out, getSecretKeyId(),
-                             Apg.getPassPhrase(), getDefaultHashAlgorithm(), this);
-            }
-
-            out.close();
-            data.putString("message", new String(out.toByteArray()));
-        } catch (IOException e) {
-            error = e.getMessage();
-        } catch (PGPException e) {
-            error = e.getMessage();
-        } catch (NoSuchProviderException e) {
-            error = e.getMessage();
-        } catch (NoSuchAlgorithmException e) {
-            error = e.getMessage();
-        } catch (SignatureException e) {
-            error = e.getMessage();
-        } catch (Apg.GeneralException e) {
-            error = e.getMessage();
-        }
-
-        data.putInt("type", Id.message.done);
-
-        if (error != null) {
-            data.putString("error", error);
-        }
-
-        msg.setData(data);
-        sendMessage(msg);
-    }
-
-    private void updateView() {
-        if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) {
-            mSelectKeysButton.setText(R.string.no_keys_selected);
-        } else if (mEncryptionKeyIds.length == 1) {
-            mSelectKeysButton.setText(R.string.one_key_selected);
-        } else {
-            mSelectKeysButton.setText("" + mEncryptionKeyIds.length + " " +
-                                      getResources().getString(R.string.n_keys_selected));
-        }
-
-        if (getSecretKeyId() == 0) {
-            mSign.setChecked(false);
-            mMainUserId.setText("");
-            mMainUserIdRest.setText("");
-        } else {
-            String uid = getResources().getString(R.string.unknown_user_id);
-            String uidExtra = "";
-            PGPSecretKeyRing keyRing = Apg.getSecretKeyRing(getSecretKeyId());
-            if (keyRing != null) {
-                PGPSecretKey key = Apg.getMasterKey(keyRing);
-                if (key != null) {
-                    String userId = Apg.getMainUserIdSafe(this, key);
-                    String chunks[] = userId.split(" <", 2);
-                    uid = chunks[0];
-                    if (chunks.length > 1) {
-                        uidExtra = "<" + chunks[1];
-                    }
-                }
-            }
-            mMainUserId.setText(uid);
-            mMainUserIdRest.setText(uidExtra);
-            mSign.setChecked(true);
-        }
-    }
-
-    private void selectPublicKeys() {
-        Intent intent = new Intent(this, SelectPublicKeyListActivity.class);
-        intent.putExtra("selection", mEncryptionKeyIds);
-        startActivityForResult(intent, Id.request.public_keys);
-    }
-
-    private void selectSecretKey() {
-        Intent intent = new Intent(this, SelectSecretKeyListActivity.class);
-        startActivityForResult(intent, Id.request.secret_keys);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case Id.request.secret_keys: {
-                if (resultCode == RESULT_OK) {
-                    super.onActivityResult(requestCode, resultCode, data);
-                }
-                updateView();
-                break;
-            }
-
-            case Id.request.public_keys: {
-                if (resultCode == RESULT_OK) {
-                    Bundle bundle = data.getExtras();
-                    mEncryptionKeyIds = bundle.getLongArray("selection");
-                }
-                updateView();
-                break;
-            }
-
-            default: {
-                break;
-            }
-        }
-
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    @Override
-    public void doneCallback(Message msg) {
-        super.doneCallback(msg);
-
-        removeDialog(Id.dialog.encrypting);
-
-        Bundle data = msg.getData();
-        String error = data.getString("error");
-        if (error != null) {
-            Toast.makeText(EncryptMessageActivity.this,
-                           "Error: " + data.getString("error"),
-                           Toast.LENGTH_SHORT).show();
-            return;
-        } else {
-            String message = data.getString("message");
-            switch (mEncryptTarget) {
-                case Id.target.clipboard: {
-                    ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-                    clip.setText(message);
-                    Toast.makeText(this, "Successfully encrypted to clipboard.",
-                                   Toast.LENGTH_SHORT).show();
-                    break;
-                }
-
-                case Id.target.email: {
-                    Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND);
-                    emailIntent.setType("text/plain; charset=utf-8");
-                    emailIntent.putExtra(android.content.Intent.EXTRA_TEXT, message);
-                    if (mSubject != null) {
-                        emailIntent.putExtra(android.content.Intent.EXTRA_SUBJECT,
-                                             mSubject);
-                    }
-                    if (mSendTo != null) {
-                        emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL,
-                                             new String[] { mSendTo });
-                    }
-                    EncryptMessageActivity.this.
-                            startActivity(Intent.createChooser(emailIntent, "Send mail..."));
-                }
-
-                default: {
-                    // shouldn't happen
-                    break;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/org/thialfihar/android/apg/Id.java b/src/org/thialfihar/android/apg/Id.java
index 88a6b2988..601a0eef4 100644
--- a/src/org/thialfihar/android/apg/Id.java
+++ b/src/org/thialfihar/android/apg/Id.java
@@ -107,5 +107,6 @@ public final class Id {
     public static final class target {
         public static final int clipboard = 0x21070001;
         public static final int email = 0x21070002;
+        public static final int file = 0x21070003;
     }
 }
diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java
index 376b47e78..8a8d57a89 100644
--- a/src/org/thialfihar/android/apg/MainActivity.java
+++ b/src/org/thialfihar/android/apg/MainActivity.java
@@ -24,14 +24,10 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.ColorStateList;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -45,7 +41,6 @@ import android.widget.Button;
 import android.widget.CursorAdapter;
 import android.widget.EditText;
 import android.widget.ListView;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.OnItemClickListener;
@@ -67,7 +62,9 @@ public class MainActivity extends BaseActivity {
         encryptMessageButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MainActivity.this, EncryptMessageActivity.class));
+                Intent intent = new Intent(MainActivity.this, EncryptActivity.class);
+                intent.setAction(Apg.Intent.ENCRYPT);
+                startActivity(intent);
             }
         });
 
@@ -81,7 +78,9 @@ public class MainActivity extends BaseActivity {
         encryptFileButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MainActivity.this, EncryptFileActivity.class));
+                Intent intent = new Intent(MainActivity.this, EncryptActivity.class);
+                intent.setAction(Apg.Intent.ENCRYPT_FILE);
+                startActivity(intent);
             }
         });
 
@@ -212,6 +211,7 @@ public class MainActivity extends BaseActivity {
                 message.setText("Read the warnings!\n\n" +
                                 "Changes:\n" +
                                 "* encrypt to clipboard\n" +
+                                "* new encrypt GUI to handle everything\n" +
                                 "\n" +
                                 "WARNING: be careful editing your existing keys, as they " +
                                 "WILL be stripped of certificates right now.\n" +