moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -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-09-13 22:02:11 +02:00
commit bcbf96e61b
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@ -438,6 +438,10 @@ public class UncachedKeyRing {
badCerts += 1;
continue;
}
// warn user if the signature was made with bad encoding
if (!cert.verifySignature(masterKey, userId)) {
log.add(LogLevel.WARN, LogType.MSG_KC_UID_WARN_ENCODING, indent);
}
} catch (PgpGeneralException e) {
log.add(LogLevel.WARN, LogType.MSG_KC_UID_BAD_ERR,
indent, userId);

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

@ -339,6 +339,7 @@ public class OperationResultParcel implements Parcelable {
MSG_KC_UID_REVOKE_DUP (R.string.msg_kc_uid_revoke_dup),
MSG_KC_UID_REVOKE_OLD (R.string.msg_kc_uid_revoke_old),
MSG_KC_UID_REMOVE (R.string.msg_kc_uid_remove),
MSG_KC_UID_WARN_ENCODING (R.string.msg_kc_uid_warn_encoding),
// keyring consolidation

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

@ -661,6 +661,7 @@
<string name="msg_kc_uid_no_cert">"No valid self-certificate found for user id '%s', removing from ring"</string>
<string name="msg_kc_uid_remove">"Removing invalid user id '%s'"</string>
<string name="msg_kc_uid_dup">"Removing duplicate user id '%s'. The secret key contained two of them. This may result in missing certificates!"</string>
<string name="msg_kc_uid_warn_encoding">"User id does not verify as UTF-8!"</string>
<!-- Keyring merging log entries -->
<string name="msg_mg_error_secret_dummy">"New public subkey found, but secret subkey dummy generation is not supported!"</string>