aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-12 01:37:49 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-12 01:37:49 +0200
commit47368f1d24cb3b4112133a6dddd2793e6787dfdd (patch)
tree8b069dac60f3ac7001c032bb76d62d2acdf5f85f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain
parent8d75d3e00e02527c4bc717cbcd937b1457eb4bda (diff)
downloadopen-keychain-47368f1d24cb3b4112133a6dddd2793e6787dfdd.tar.gz
open-keychain-47368f1d24cb3b4112133a6dddd2793e6787dfdd.tar.bz2
open-keychain-47368f1d24cb3b4112133a6dddd2793e6787dfdd.zip
import-log: better way to check self trust, and fix log level filtering
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java18
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java4
2 files changed, 6 insertions, 16 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 f83ea24df..8d95da8b0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -399,21 +399,12 @@ public class ProviderHelper {
}
mIndent -= 1;
- log(LogLevel.DEBUG, LogType.MSG_IP_TRUST_RETRIEVE);
// get a list of owned secret keys, for verification filtering
LongSparseArray<UncachedPublicKey> trustedKeys =
getUncachedMasterKeys(KeyRingData.buildSecretKeyRingUri());
- // special case: available secret keys verify themselves!
- if (secretRing != null) {
- trustedKeys.put(secretRing.getMasterKeyId(), secretRing.getPublicKey());
- log(LogLevel.INFO, LogType.MSG_IP_TRUST_USING_SEC, new String[]{
- Integer.toString(trustedKeys.size())
- });
- } else {
- log(LogLevel.INFO, LogType.MSG_IP_TRUST_USING, new String[] {
- Integer.toString(trustedKeys.size())
- });
- }
+ log(LogLevel.INFO, LogType.MSG_IP_TRUST_USING, new String[] {
+ Integer.toString(trustedKeys.size())
+ });
// classify and order user ids. primary are moved to the front, revoked to the back,
// otherwise the order in the keyfile is preserved.
@@ -513,7 +504,8 @@ public class ProviderHelper {
// no self cert is bad, but allowed by the rfc...
if (item.selfCert != null) {
operations.add(buildCertOperations(
- masterKeyId, userIdRank, item.selfCert, Certs.VERIFIED_SELF));
+ masterKeyId, userIdRank, item.selfCert,
+ secretRing != null ? Certs.VERIFIED_SECRET : Certs.VERIFIED_SELF));
}
// don't bother with trusted certs if the uid is revoked, anyways
if (item.isRevoked) {
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 4c288502c..473cf8244 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -133,7 +133,6 @@ public class OperationResultParcel implements Parcelable {
MSG_IP_SUCCESS (R.string.msg_ip_success),
MSG_IP_TRUST_RETRIEVE (R.string.msg_ip_trust_retrieve),
MSG_IP_TRUST_USING (R.string.msg_ip_trust_using),
- MSG_IP_TRUST_USING_SEC (R.string.msg_ip_trust_using_sec),
MSG_IP_UID_CERT_BAD (R.string.msg_ip_uid_cert_bad),
MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error),
MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good),
@@ -210,9 +209,8 @@ public class OperationResultParcel implements Parcelable {
}
public boolean containsWarnings() {
- int warn = LogLevel.WARN.ordinal();
for(LogEntryParcel entry : new IterableIterator<LogEntryParcel>(iterator())) {
- if (entry.mLevel.ordinal() >= warn) {
+ if (entry.mLevel == LogLevel.WARN || entry.mLevel == LogLevel.ERROR) {
return true;
}
}