mirror of
https://github.com/moparisthebest/open-keychain
synced 2025-01-31 23:20:20 -05:00
import-log: clean up progress messages
This commit is contained in:
parent
9058291c05
commit
02fbaaf858
@ -367,13 +367,13 @@ public class UncachedKeyRing {
|
||||
} else if (selfCert.getCreationTime().before(cert.getCreationTime())) {
|
||||
modified = PGPPublicKey.removeCertification(modified, userId, selfCert);
|
||||
redundantCerts += 1;
|
||||
log.add(LogLevel.INFO, LogType.MSG_KC_UID_DUP,
|
||||
log.add(LogLevel.DEBUG, LogType.MSG_KC_UID_DUP,
|
||||
new String[] { userId }, indent);
|
||||
selfCert = zert;
|
||||
} else {
|
||||
modified = PGPPublicKey.removeCertification(modified, userId, zert);
|
||||
redundantCerts += 1;
|
||||
log.add(LogLevel.INFO, LogType.MSG_KC_UID_DUP,
|
||||
log.add(LogLevel.DEBUG, LogType.MSG_KC_UID_DUP,
|
||||
new String[] { userId }, indent);
|
||||
}
|
||||
// If there is a revocation certificate, and it's older than this, drop it
|
||||
@ -382,7 +382,7 @@ public class UncachedKeyRing {
|
||||
modified = PGPPublicKey.removeCertification(modified, userId, revocation);
|
||||
revocation = null;
|
||||
redundantCerts += 1;
|
||||
log.add(LogLevel.INFO, LogType.MSG_KC_UID_REVOKE_OLD,
|
||||
log.add(LogLevel.DEBUG, LogType.MSG_KC_UID_REVOKE_OLD,
|
||||
new String[] { userId }, indent);
|
||||
}
|
||||
break;
|
||||
@ -392,7 +392,7 @@ public class UncachedKeyRing {
|
||||
if (selfCert != null && selfCert.getCreationTime().after(zert.getCreationTime())) {
|
||||
modified = PGPPublicKey.removeCertification(modified, userId, zert);
|
||||
redundantCerts += 1;
|
||||
log.add(LogLevel.INFO, LogType.MSG_KC_UID_REVOKE_OLD,
|
||||
log.add(LogLevel.DEBUG, LogType.MSG_KC_UID_REVOKE_OLD,
|
||||
new String[] { userId }, indent);
|
||||
continue;
|
||||
}
|
||||
@ -403,13 +403,13 @@ public class UncachedKeyRing {
|
||||
} else if (revocation.getCreationTime().before(cert.getCreationTime())) {
|
||||
modified = PGPPublicKey.removeCertification(modified, userId, revocation);
|
||||
redundantCerts += 1;
|
||||
log.add(LogLevel.INFO, LogType.MSG_KC_UID_REVOKE_DUP,
|
||||
log.add(LogLevel.DEBUG, LogType.MSG_KC_UID_REVOKE_DUP,
|
||||
new String[] { userId }, indent);
|
||||
revocation = zert;
|
||||
} else {
|
||||
modified = PGPPublicKey.removeCertification(modified, userId, zert);
|
||||
redundantCerts += 1;
|
||||
log.add(LogLevel.INFO, LogType.MSG_KC_UID_REVOKE_DUP,
|
||||
log.add(LogLevel.DEBUG, LogType.MSG_KC_UID_REVOKE_DUP,
|
||||
new String[] { userId }, indent);
|
||||
}
|
||||
break;
|
||||
|
@ -434,7 +434,6 @@ public class ProviderHelper {
|
||||
log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, new String[]{
|
||||
Integer.toString(trustedKeys.size())
|
||||
});
|
||||
progress.setProgress(LogType.MSG_IP_UID_CLASSIFYING.getMsgId(), 60, 100);
|
||||
mIndent += 1;
|
||||
List<UserIdItem> uids = new ArrayList<UserIdItem>();
|
||||
for (String userId : new IterableIterator<String>(
|
||||
|
Loading…
Reference in New Issue
Block a user