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

---
 AndroidManifest.xml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'AndroidManifest.xml')

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>
 
-- 
cgit v1.2.3