diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-09 19:38:13 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-09 19:38:13 +0200 |
| commit | 8a8d7c7738f62eb66e41f7598a5e23a50b2f0821 (patch) | |
| tree | 38a5686e7bf36e1606771a5f8faf5a4ec34df50f /OpenPGP-Keychain/res | |
| parent | 0a52e1ecc94d26cbc9ced522f3365ae56bbb942c (diff) | |
| download | open-keychain-8a8d7c7738f62eb66e41f7598a5e23a50b2f0821.tar.gz open-keychain-8a8d7c7738f62eb66e41f7598a5e23a50b2f0821.tar.bz2 open-keychain-8a8d7c7738f62eb66e41f7598a5e23a50b2f0821.zip | |
Handle dublicate or missing pub keys corresponding to user ids, handle navigating back from service activity properly
Diffstat (limited to 'OpenPGP-Keychain/res')
| -rw-r--r-- | OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml | 8 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/values/strings.xml | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml b/OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml index fe9332a92..877b4e74e 100644 --- a/OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml +++ b/OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml @@ -5,14 +5,14 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <TextView + <org.sufficientlysecure.htmltextview.HtmlTextView android:id="@+id/api_select_pub_keys_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:paddingBottom="3dip" - android:text="@string/api_select_pub_keys_text" - android:textAppearance="?android:attr/textAppearanceLarge" /> + android:paddingBottom="0dip" + android:text="Set in-code!" + android:textAppearance="?android:attr/textAppearanceSmall" /> <FrameLayout android:id="@+id/api_select_pub_keys_fragment_container" diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index b65e1f259..f81f47fe9 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -370,6 +370,8 @@ <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_text">You have selected recipients (e.g. by selecting email addresses), which public keys could not be found. Please verify your selection!</string> + <string name="api_select_pub_keys_missing_text">No public keys were found for these user ids:</string> + <string name="api_select_pub_keys_dublicates_text">More than one public key exist for these user ids:</string> + <string name="api_select_pub_keys_text">Please review the list of recipients!</string> </resources>
\ No newline at end of file |