new EncryptActivity to handle message and file encryption all in one

13 files changed, 445 insertions, 5 deletions

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 000000000..d71058055
--- /dev/null
+++ b/res/drawable-hdpi/ic_next.png
diff --git a/res/drawable-hdpi/ic_previous.png b/res/drawable-hdpi/ic_previous.png
new file mode 100644
index 000000000..d610e4667
--- /dev/null
+++ b/res/drawable-hdpi/ic_previous.png
diff --git a/res/drawable-ldpi/ic_next.png b/res/drawable-ldpi/ic_next.png
new file mode 100644
index 000000000..474ed8faa
--- /dev/null
+++ b/res/drawable-ldpi/ic_next.png
diff --git a/res/drawable-ldpi/ic_previous.png b/res/drawable-ldpi/ic_previous.png
new file mode 100644
index 000000000..6fd885e6b
--- /dev/null
+++ b/res/drawable-ldpi/ic_previous.png
diff --git a/res/drawable-mdpi/ic_next.png b/res/drawable-mdpi/ic_next.png
new file mode 100644
index 000000000..8271c1380
--- /dev/null
+++ b/res/drawable-mdpi/ic_next.png
diff --git a/res/drawable-mdpi/ic_previous.png b/res/drawable-mdpi/ic_previous.png
new file mode 100644
index 000000000..ef90db972
--- /dev/null
+++ b/res/drawable-mdpi/ic_previous.png
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>