cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Redesigned subkey creation dialog and changed default key type created to RSA, 3072 bit.

Browse Source 
Added code to prevent removal of master subkey when modifying a new key.
This commit is contained in:
Alex Fong
2016-03-21 21:37:19 +08:00
parent ce5e5f36c5
commit cb9bdb3cf7
14 changed files with 364 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_change_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 923 B

BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_change_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 623 B

BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_change_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_change_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/ic_change_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

161
OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
View File

@@ -13,147 +13,68 @@
android:paddingRight="24dp"
android:stretchColumns="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="4dp"
android:text="@string/key_creation_el_gamal_info" />
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_algorithm" />
android:paddingRight="10dp"
android:text="@string/label_key_type" />
<Spinner
android:id="@+id/add_subkey_algorithm"
<!-- custom spinner for fixing focus on first item in list at all times -->
<org.sufficientlysecure.keychain.ui.util.spinner.FocusFirstItemSpinner
android:id="@+id/add_subkey_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dp" />
</TableRow>
<TableRow android:id="@+id/add_subkey_row_size">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_key_size" />
<Spinner
android:id="@+id/add_subkey_size"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:dropDownWidth="wrap_content"
android:padding="4dp" />
</TableRow>
<TableRow
android:id="@+id/add_subkey_row_curve"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_ecc_curve"/>
<Spinner
android:id="@+id/add_subkey_curve"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:padding="4dp"/>
</TableRow>
<TextView
android:id="@+id/add_subkey_custom_key_size_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/key_size_custom_info"
android:visibility="gone" />
<EditText
android:id="@+id/add_subkey_custom_key_size_input"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="number"
android:visibility="gone" />
<TextView
android:id="@+id/add_subkey_custom_key_size_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<TableRow>
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
<TextView
android:id="@+id/label_usage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:layout_gravity="center_vertical|top"
android:paddingRight="10dp"
android:text="@string/label_usage" />
<RadioGroup
android:id="@+id/add_subkey_usage_group"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<CheckBox
android:id="@+id/add_subkey_flag_certify"
android:enabled="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/flag_certify" />
<RadioButton
android:id="@+id/add_subkey_usage_none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/usage_none" />
<RadioButton
android:id="@+id/add_subkey_usage_sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/usage_sign" />
<RadioButton
android:id="@+id/add_subkey_usage_encrypt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/usage_encrypt" />
<RadioButton
android:id="@+id/add_subkey_usage_sign_and_encrypt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/usage_sign_and_encrypt" />
</RadioGroup>
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip" />
<CheckBox
android:id="@+id/add_subkey_flag_sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/flag_sign" />
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip" />
<CheckBox
android:id="@+id/add_subkey_flag_encrypt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/flag_encrypt" />
</TableRow>
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip" />
<CheckBox
android:id="@+id/add_subkey_flag_authenticate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/flag_authenticate" />
</TableRow>
<TableRow
android:layout_marginTop="8dp"
@@ -164,7 +85,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:paddingRight="10dp"
android:text="@string/label_expiry" />
<CheckBox

32
OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:paddingRight="10dp"
android:paddingBottom="6dp"
android:background="?android:attr/selectableItemBackground">
<TextView android:id="@android:id/text1"
style="?android:attr/spinnerDropDownItemStyle"
android:textStyle="bold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp" />
<TextView android:id="@android:id/text2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="2dp" />
</LinearLayout>

29
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -13,6 +13,7 @@
<string name="title_encrypt_files">"Encrypt"</string>
<string name="title_decrypt">"Decrypt"</string>
<string name="title_add_subkey">"Add subkey"</string>
<string name="title_change_master_key">Change master key</string>
<string name="title_edit_key">"Edit Key"</string>
<string name="title_linked_create">"Create a Linked Identity"</string>
<string name="title_preferences">"Settings"</string>
@@ -165,6 +166,7 @@
<string name="label_keyservers">"Select OpenPGP keyservers"</string>
<string name="label_key_id">"Key ID"</string>
<string name="label_key_created">"Key created %s"</string>
<string name="label_key_type">"Type"</string>
<string name="label_creation">"Creation"</string>
<string name="label_expiry">"Expiry"</string>
<string name="label_usage">"Usage"</string>
@@ -281,23 +283,26 @@
<string name="choice_8hours">"8 hours"</string>
<string name="choice_forever">"forever"</string>
<string name="choice_select_cert">"Select a Key"</string>
<string name="dsa">"DSA"</string>
<string name="elgamal">"ElGamal"</string>
<string name="rsa">"RSA"</string>
<string name="ecdh">"ECDH"</string>
<string name="ecdsa">"ECDSA"</string>
<string name="filemanager_title_open">"Open…"</string>
<string name="rsa_2048">"RSA 2048"</string>
<string name="rsa_2048_description_html">"smaller filesize, considered secure until 2030"</string>
<string name="rsa_3072">"RSA 3072"</string>
<string name="rsa_3072_description_html">"recommended, considered secure until 2040"</string>
<string name="rsa_4096">"RSA 4096"</string>
<string name="rsa_4096_description_html">"larger file size, considered secure until 2040+"</string>
<string name="ecc_p256">"ECC P-256"</string>
<string name="ecc_p256_description_html">"very tiny filesize, considered secure until 2040 &lt;br/> &lt;u>experimental and not supported by all implementations&lt;/u>"</string>
<string name="ecc_p521">"ECC P-521"</string>
<string name="ecc_p521_description_html">"tiny filesize, considered secure until 2040+ &lt;br/> &lt;u>experimental and not supported by all implementations"&lt;/u></string>
<string name="usage_none">"None (subkey binding only)"</string>
<string name="usage_sign">"Sign"</string>
<string name="usage_encrypt">"Encrypt"</string>
<string name="usage_sign_and_encrypt">"Sign &amp; Encrypt"</string>
<string name="error">"Error"</string>
<string name="error_message">"Error: %s"</string>
<string name="theme_dark">"Dark"</string>
<string name="theme_light">"Light"</string>
<!-- key flags -->
<string name="flag_certify">"Certify"</string>
<string name="flag_sign">"Sign"</string>
<string name="flag_encrypt">"Encrypt"</string>
<string name="flag_authenticate">"Authenticate"</string>
<!-- sentences -->
<string name="wrong_passphrase">"Wrong password."</string>
<string name="no_filemanager_installed">"No compatible file manager installed."</string>
@@ -746,7 +751,7 @@
<item>"Move Subkey to Security Token"</item>
</string-array>
<string name="edit_key_new_subkey">"new subkey"</string>
<string name="edit_key_select_flag">"Please select at least one flag!"</string>
<string name="edit_key_select_usage">"Please select key usage!"</string>
<string name="edit_key_error_add_identity">"Add at least one identity!"</string>
<string name="edit_key_error_add_subkey">"Add at least one subkey!"</string>
<string name="edit_key_error_bad_security_token_algo">"Algorithm not supported by Security Token!"</string>