From 19cab919afd26c14d4df214f51ae05c49432e1d1 Mon Sep 17 00:00:00 2001
From: gogowitczak <gogowitczak@gmail.com>
Date: Tue, 8 Apr 2014 23:59:41 +0200
Subject: Modified Spinner values for CreateKeyDialog. Added info for user
 about custom key length restrictions.

---
 OpenKeychain/src/main/res/layout/create_key_dialog.xml |  7 +++++++
 OpenKeychain/src/main/res/values/arrays.xml            | 17 ++++++++++++++---
 OpenKeychain/src/main/res/values/strings.xml           |  7 ++++++-
 3 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/create_key_dialog.xml b/OpenKeychain/src/main/res/layout/create_key_dialog.xml
index da884ceb5..16eef08c4 100644
--- a/OpenKeychain/src/main/res/layout/create_key_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_dialog.xml
@@ -74,6 +74,13 @@
                 android:inputType="number"
                 android:visibility="gone"/>
 
+        <TextView
+                android:id="@+id/custom_key_size_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:padding="4dp" />
+
     </TableLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml
index b16973f90..4173d49e4 100644
--- a/OpenKeychain/src/main/res/values/arrays.xml
+++ b/OpenKeychain/src/main/res/values/arrays.xml
@@ -29,12 +29,23 @@
         <item>28800</item>
         <item>-1</item>
     </string-array>
-    <string-array name="key_size_spinner_values" translatable="false">
-        <item>@string/key_size_512</item>
-        <item>@string/key_size_1024</item>
+    <string-array name="rsa_key_size_spinner_values" translatable="false">
+        <item>@string/key_size_2048</item>
+        <item>@string/key_size_4096</item>
+        <item>@string/key_size_8192</item>
+        <item>@string/key_size_custom</item>
+    </string-array>
+    <string-array name="elgamal_key_size_spinner_values" translatable="false">
+        <item>@string/key_size_1536</item>
         <item>@string/key_size_2048</item>
+        <item>@string/key_size_3072</item>
         <item>@string/key_size_4096</item>
         <item>@string/key_size_8192</item>
+    </string-array>
+    <string-array name="dsa_key_size_spinner_values" translatable="false">
+        <item>@string/key_size_512</item>
+        <item>@string/key_size_768</item>
+        <item>@string/key_size_1024</item>
         <item>@string/key_size_custom</item>
     </string-array>
     <string-array name="import_action_list" translatable="false">
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index c1d62fd52..d0959f255 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -249,7 +249,7 @@
     <string name="key_exported">Successfully exported 1 key.</string>
     <string name="keys_exported">Successfully exported %d keys.</string>
     <string name="no_keys_exported">No keys exported.</string>
-    <string name="key_creation_el_gamal_info">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string>
+    <string name="key_creation_el_gamal_info">Note: only subkeys support ElGamal.</string>
     <string name="key_creation_weak_rsa_info">Note: generating RSA key with length 1024-bit and less is considered unsafe and it\'s disabled for generating new keys.</string>
     <string name="key_not_found">Couldn\'t find key %08X.</string>
 
@@ -375,12 +375,17 @@
 
     <!-- key bit length selections -->
     <string name="key_size_512">512</string>
+    <string name="key_size_768">768</string>
     <string name="key_size_1024">1024</string>
+    <string name="key_size_1536">1536</string>
     <string name="key_size_2048">2048</string>
+    <string name="key_size_3072">3072</string>
     <string name="key_size_4096">4096</string>
     <string name="key_size_8192">8192</string>
     <string name="key_size_custom">Custom key size</string>
     <string name="key_size_custom_info">Type custom key length (in bits):</string>
+    <string name="key_size_custom_info_rsa">RSA key length must be greater than 1024 and at most 8192. Also it must be multiplicity of 8.</string>
+    <string name="key_size_custom_info_dsa">DSA key length must be at least 512 and at most 1024. Also it must be multiplicity of 64.</string>
 
     <!-- compression -->
     <string name="compression_fast">fast</string>
-- 
cgit v1.2.3