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

Merge pull request #383 from sreeram-boyapati/master

Browse Source 
Fix to passphrase dialog and Issue #207
This commit is contained in:
Dominik Schürmann
2014-03-10 23:20:07 +01:00
parent 8fa62161df a41ee31b6c
commit 612ad9e6b3
5 changed files with 109 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml
View File

@@ -6,7 +6,9 @@
android:paddingRight="16dp"
android:stretchColumns="1" >
<TableRow>
<TableRow
android:layout_marginBottom="5dip"
>
<TextView
android:id="@+id/passphrase_label_passphrase"
@@ -24,7 +26,9 @@
android:padding="4dp" />
</TableRow>
<TableRow>
<TableRow
android:layout_marginBottom="10dip"
>
<TextView
android:id="@+id/passphrase_label_passphrase_again"

23
OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml
View File

@@ -3,7 +3,7 @@
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
android:orientation="vertical" >
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/select_secret_key_select_key_button"
@@ -28,28 +28,41 @@
android:paddingLeft="16dp" >
<!-- Has been made focusable to display error messages with setError -->
<TextView
android:id="@+id/select_secret_key_master_key_hex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/api_settings_no_key"
/>
<TextView
android:id="@+id/select_secret_key_user_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="left"
android:ellipsize="end"
android:focusable="true"
android:focusableInTouchMode="true"
android:singleLine="true"
android:text="@string/api_settings_no_key"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:visibility="gone"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/select_secret_key_user_id_rest"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="left"
android:ellipsize="end"
android:singleLine="true"
android:text=""
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</LinearLayout>

2
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@@ -147,6 +147,7 @@
<string name="user_id_no_name">&lt;no name&gt;</string>
<string name="none">&lt;none&gt;</string>
<string name="no_key">&lt;no key&gt;</string>
<string name="no_email">&lt;No Email&gt;</string>
<string name="unknown_status"></string>
<string name="can_encrypt">can encrypt</string>
<string name="can_sign">can sign</string>
@@ -273,6 +274,7 @@
<string name="error_master_key_must_not_be_el_gamal">the master key cannot be an ElGamal key</string>
<string name="error_unknown_algorithm_choice">unknown algorithm choice</string>
<string name="error_user_id_needs_a_name">you need to specify a name</string>
<string name="error_user_id_no_email">no email found</string>
<string name="error_user_id_needs_an_email_address">you need to specify an email address</string>
<string name="error_key_needs_a_user_id">need at least one user id</string>
<string name="error_main_user_id_must_not_be_empty">main user id must not be empty</string>