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

Handle dublicate or missing pub keys corresponding to user ids, handle navigating back from service activity properly

Browse Source
This commit is contained in:
Dominik Schürmann
2013-09-09 19:38:13 +02:00
parent 0a52e1ecc9
commit 8a8d7c7738
4 changed files with 115 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenPGP-Keychain/res/layout/api_app_select_pub_keys_activity.xml
View File

@@ -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"

4
OpenPGP-Keychain/res/values/strings.xml
View File

@@ -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>