aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorgogowitczak <gogowitczak@gmail.com>2014-04-07 16:31:38 +0200
committergogowitczak <gogowitczak@gmail.com>2014-04-07 16:31:38 +0200
commitfc0c084a621eb67e07cc4c4d65ecc9f841b78cc9 (patch)
tree351a3dc20db5417367a758bc2328350b98b2e3ed /OpenKeychain/src/main/res
parent3c8be8bf8535aede2f663f1e273001dfe1f2ee77 (diff)
downloadopen-keychain-fc0c084a621eb67e07cc4c4d65ecc9f841b78cc9.tar.gz
open-keychain-fc0c084a621eb67e07cc4c4d65ecc9f841b78cc9.tar.bz2
open-keychain-fc0c084a621eb67e07cc4c4d65ecc9f841b78cc9.zip
Added possibility to enter custom key length. Added key length limitations, according to issue #102 and SpongyCastle specification.
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_dialog.xml18
-rw-r--r--OpenKeychain/src/main/res/values/arrays.xml2
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml3
3 files changed, 23 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_dialog.xml b/OpenKeychain/src/main/res/layout/create_key_dialog.xml
index 57a1b865f..da884ceb5 100644
--- a/OpenKeychain/src/main/res/layout/create_key_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_dialog.xml
@@ -56,6 +56,24 @@
android:gravity="right"
android:padding="4dp" />
</TableRow>
+
+ <TextView
+ android:id="@+id/custom_key_size_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:padding="4dp"
+ android:text="@string/key_size_custom_info"
+ android:visibility="gone"/>
+
+ <EditText
+ android:id="@+id/custom_key_size_input"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:inputType="number"
+ android:visibility="gone"/>
+
</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 c84c2648d..b16973f90 100644
--- a/OpenKeychain/src/main/res/values/arrays.xml
+++ b/OpenKeychain/src/main/res/values/arrays.xml
@@ -34,6 +34,8 @@
<item>@string/key_size_1024</item>
<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="import_action_list" translatable="false">
<item>@string/menu_import_from_key_server</item>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6c6d05103..c1d62fd52 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -378,6 +378,9 @@
<string name="key_size_1024">1024</string>
<string name="key_size_2048">2048</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>
<!-- compression -->
<string name="compression_fast">fast</string>