moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Dominik Schürmann 2014-07-02 15:11:13 +02:00
commit a66c6b5b7a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@ -405,7 +405,11 @@ public class ProviderHelper {
// classify and order user ids. primary are moved to the front, revoked to the back, // classify and order user ids. primary are moved to the front, revoked to the back,
// otherwise the order in the keyfile is preserved. // otherwise the order in the keyfile is preserved.
if (trustedKeys.size() == 0) {
log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING_ZERO);
} else {
log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, trustedKeys.size()); log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, trustedKeys.size());
}
mIndent += 1; mIndent += 1;
List<UserIdItem> uids = new ArrayList<UserIdItem>(); List<UserIdItem> uids = new ArrayList<UserIdItem>();
for (String userId : new IterableIterator<String>( for (String userId : new IterableIterator<String>(

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
View File

@ -165,6 +165,7 @@ public class OperationResultParcel implements Parcelable {
MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error), MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error),
MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good), MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good),
MSG_IP_UID_CERTS_UNKNOWN (R.plurals.msg_ip_uid_certs_unknown), MSG_IP_UID_CERTS_UNKNOWN (R.plurals.msg_ip_uid_certs_unknown),
MSG_IP_UID_CLASSIFYING_ZERO (R.string.msg_ip_uid_classifying_zero),
MSG_IP_UID_CLASSIFYING (R.plurals.msg_ip_uid_classifying), MSG_IP_UID_CLASSIFYING (R.plurals.msg_ip_uid_classifying),
MSG_IP_UID_REORDER(R.string.msg_ip_uid_reorder), MSG_IP_UID_REORDER(R.string.msg_ip_uid_reorder),
MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing), MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing),

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

@ -546,8 +546,8 @@
<item quantity="one">Ignoring one certificate issued by an unknown public key</item> <item quantity="one">Ignoring one certificate issued by an unknown public key</item>
<item quantity="other">Ignoring %s certificates issued by unknown public keys</item> <item quantity="other">Ignoring %s certificates issued by unknown public keys</item>
</plurals> </plurals>
<string name="msg_ip_uid_classifying_zero">Classifying user ids (no trusted keys available)</string>
<plurals name="msg_ip_uid_classifying"> <plurals name="msg_ip_uid_classifying">
<item quantity="zero">Classifying user ids (no trusted keys available)</item>
<item quantity="one">Classifying user ids (using one trusted key)</item> <item quantity="one">Classifying user ids (using one trusted key)</item>
<item quantity="other">Classifying user ids (using %s trusted keys)</item> <item quantity="other">Classifying user ids (using %s trusted keys)</item>
</plurals> </plurals>