diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-02 15:11:13 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-02 15:11:13 +0200 |
| commit | a66c6b5b7ab55d7da2bdebdc4526b4293b507d40 (patch) | |
| tree | 9622cff1cbd8a1e45e03e9ced1fcfb6099073fd4 | |
| parent | bb39caa28d5138adaf936fbfe18d8db05f5de31c (diff) | |
| parent | 144a10a3d043686755651852419c5a8bc6619f2a (diff) | |
| download | open-keychain-a66c6b5b7ab55d7da2bdebdc4526b4293b507d40.tar.gz open-keychain-a66c6b5b7ab55d7da2bdebdc4526b4293b507d40.tar.bz2 open-keychain-a66c6b5b7ab55d7da2bdebdc4526b4293b507d40.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
3 files changed, 7 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 28495d51d..b5609a327 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -405,7 +405,11 @@ public class ProviderHelper { // classify and order user ids. primary are moved to the front, revoked to the back, // otherwise the order in the keyfile is preserved. - log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, trustedKeys.size()); + if (trustedKeys.size() == 0) { + log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING_ZERO); + } else { + log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, trustedKeys.size()); + } mIndent += 1; List<UserIdItem> uids = new ArrayList<UserIdItem>(); for (String userId : new IterableIterator<String>( diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java index 7f91ab490..575180505 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -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_GOOD (R.string.msg_ip_uid_cert_good), 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_REORDER(R.string.msg_ip_uid_reorder), MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing), diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 39b105664..54ce523ce 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -546,8 +546,8 @@ <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> </plurals> + <string name="msg_ip_uid_classifying_zero">Classifying user ids (no trusted keys available)</string> <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="other">Classifying user ids (using %s trusted keys)</item> </plurals> |