diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-16 05:28:51 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-16 05:28:51 +0200 |
| commit | bbe986743c9e6c2a22df95e0fbde0de2340bf467 (patch) | |
| tree | adbdfe155668f5fd6253d0c499987822b30d5e28 /OpenKeychain/src/main/res | |
| parent | 443170b876751739df7249f0c497fdec6f6f892f (diff) | |
| download | open-keychain-bbe986743c9e6c2a22df95e0fbde0de2340bf467.tar.gz open-keychain-bbe986743c9e6c2a22df95e0fbde0de2340bf467.tar.bz2 open-keychain-bbe986743c9e6c2a22df95e0fbde0de2340bf467.zip | |
API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml | 10 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml index a10592607..bf4d0a70d 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml @@ -4,13 +4,13 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <org.sufficientlysecure.htmltextview.HtmlTextView + <TextView android:id="@+id/api_select_pub_keys_text" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="0dip" - android:text="Set in-code!" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceSmall" /> <FrameLayout diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 0da651b03..6f77be78f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -395,9 +395,10 @@ <string name="api_register_allow">Allow access</string> <string name="api_register_disallow">Disallow access</string> <string name="api_register_error_select_key">Please select a key!</string> - <string name="api_select_pub_keys_missing_text">No public keys were found for these identities:</string> - <string name="api_select_pub_keys_dublicates_text">More than one public key exist for these identities:</string> + <string name="api_select_pub_keys_missing_text">No keys were found for these identities:</string> + <string name="api_select_pub_keys_dublicates_text">More than one key exist for these identities:</string> <string name="api_select_pub_keys_text">Please review the list of recipients!</string> + <string name="api_select_pub_keys_text_no_user_ids">Please select the recipients!</string> <string name="api_error_wrong_signature">Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app\'s registration in OpenKeychain and then register the app again.</string> <!-- Share --> |