PGPainless/cert-d-pgpainless
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/cert-d-pgpainless.git synced 2025-09-09 18:29:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor MergeCallbacks

Browse source
This commit is contained in:
Paul Schaub 2022-08-25 12:56:56 +02:00
parent 6995879e05
commit 80600c86ce
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
5 changed files with 145 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java
View file

@ -32,7 +32,7 @@ public class Import implements Runnable {
for (PGPPublicKeyRing cert : certificates) {
ByteArrayInputStream certIn = new ByteArrayInputStream(cert.getEncoded());
Certificate certificate = PGPCertDCli.getCertificateDirectory()
.insert(certIn, MergeCallbacks.mergeCertificates());
.insert(certIn, MergeCallbacks.mergeWithExisting());
}
} catch (IOException e) {
LOGGER.error("IO-Error.", e);

2
pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java
View file

@ -24,7 +24,7 @@ public class Insert implements Runnable {
public void run() {
try {
Certificate certificate = PGPCertDCli.getCertificateDirectory()
.insert(System.in, MergeCallbacks.mergeCertificates());
.insert(System.in, MergeCallbacks.mergeWithExisting());
} catch (IOException e) {
LOGGER.error("IO-Error.", e);
System.exit(-1);

2
pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java
View file

@ -61,7 +61,7 @@ public class Setup implements Runnable {
try {
InputStream inputStream = new ByteArrayInputStream(trustRoot.getEncoded());
PGPCertDCli.getCertificateDirectory().insertTrustRoot(inputStream, MergeCallbacks.overrideKey());
PGPCertDCli.getCertificateDirectory().insertTrustRoot(inputStream, MergeCallbacks.overrideExisting());
} catch (BadDataException e) {
throw new RuntimeException(e);