-implementation of "--send-key"

-implementation of "--sign-key"
-partial implementation of exchanging/verifying keys via QR Code

3 files changed, 94 insertions, 0 deletions

diff --git a/res/layout/key_server_export_layout.xml b/res/layout/key_server_export_layout.xml
new file mode 100644
index 000000000..b2270417d
--- /dev/null
+++ b/res/layout/key_server_export_layout.xml
@@ -0,0 +1,42 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+	    <Spinner
+	        android:id="@+id/keyServer"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+        <Button
+            android:id="@+id/btn_export_to_server"
+            android:text="@string/btn_export_to_server"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/sign_key_layout.xml b/res/layout/sign_key_layout.xml
new file mode 100644
index 000000000..17be03b21
--- /dev/null
+++ b/res/layout/sign_key_layout.xml
@@ -0,0 +1,40 @@
+<?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">
+
+	<LinearLayout android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:orientation="horizontal">
+	</LinearLayout>
+	
+	<LinearLayout android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:orientation="horizontal">
+
+		<TextView android:id="@+id/textView1" android:layout_height="wrap_content"
+			android:text="@string/label_sendKey" android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_width="wrap_content"></TextView>
+		<CheckBox android:text="" android:id="@+id/sendKey"
+			android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:checked="true"></CheckBox>
+	</LinearLayout>
+
+	<LinearLayout android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:orientation="horizontal">
+
+		<Spinner android:id="@+id/keyServer" android:layout_width="wrap_content"
+			android:layout_height="wrap_content" android:layout_weight="1" />
+	</LinearLayout>
+
+	<Button android:layout_height="wrap_content"
+		android:layout_width="wrap_content" android:text="@string/btn_sign"
+		android:id="@+id/sign"></Button>
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5b29e4f12..d81ac3a3d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,7 +42,10 @@
     <string name="title_keyNotFound">Key Not Found</string>
     <string name="title_help">Getting Started</string>
     <string name="title_keyServerQuery">Query Key Server</string>
+    <string name="title_sendKey">Export to Key Server</string>
     <string name="title_unknownSignatureKey">Unknown Signature Key</string>
+    <string name="title_importFromQRCode">Import from QR Code</string>
+    <string name="title_signKey">Sign Key</string>
 
     <!-- section_lowerCase: capitalized words, no punctuation -->
     <string name="section_userIds">User IDs</string>
@@ -74,6 +77,7 @@
     <string name="btn_changePassPhrase">Change Pass Phrase</string>
     <string name="btn_setPassPhrase">Set Pass Phrase</string>
     <string name="btn_search">Search</string>
+    <string name="btn_export_to_server">Export To Server</string>
 
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">About</string>
@@ -92,6 +96,10 @@
     <string name="menu_help">Help</string>
     <string name="menu_keyServer">Key Server</string>
     <string name="menu_updateKey">Update</string>
+    <string name="menu_exportKeyToServer">Export To Server</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_scanQRCode">Scan QR Code</string>
+    <string name="menu_signKey">Sign Key</string>
 
     <!-- label_lowerCase: capitalized words, no punctuation -->
     <string name="label_sign">Sign</string>
@@ -124,6 +132,7 @@
     <string name="label_name">Name</string>
     <string name="label_comment">Comment</string>
     <string name="label_email">Email</string>
+    <string name="label_sendKey">Send Key to Server?</string>
 
     <string name="noKeysSelected">Select</string>
     <string name="oneKeySelected">1 Selected</string>
@@ -217,6 +226,9 @@
     <string name="keyEditingIsBeta">Key editing is still kind of beta.</string>
     <string name="badKeysEncountered">%s bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</string>
     <string name="lookupUnknownKey">Unknown key %s, do you want to try finding it on a keyserver?</string>
+    <string name="keySendSuccess">Successfully sent key to server</string>
+    <string name="keySignSuccess">Successfully signed key</string>
+    <string name="qrScanImportSuccess">Successfully validated and imported key</string>
 
     <!-- error_lowerCase: phrases, no punctuation, all lowercase,
          they will be put after "errorMessage", e.g. "Error: file not found" -->