diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 01:37:49 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 01:37:49 +0200 |
commit | 47368f1d24cb3b4112133a6dddd2793e6787dfdd (patch) | |
tree | 8b069dac60f3ac7001c032bb76d62d2acdf5f85f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | 8d75d3e00e02527c4bc717cbcd937b1457eb4bda (diff) | |
download | open-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/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | 4 |
1 files changed, 1 insertions, 3 deletions
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; } } |