From 138ea0d5720ef8543c3c8a829bd178920b971122 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 3 Feb 2021 16:31:45 +0100
Subject: [PATCH] Add convenience method to delete userIds from the primary key

---
 .../key/modification/secretkeyring/SecretKeyRingEditor.java | 6 ++++++
 .../secretkeyring/SecretKeyRingEditorInterface.java         | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java
index e8439e00..aaa7abb2 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java
@@ -147,6 +147,12 @@ public class SecretKeyRingEditor implements SecretKeyRingEditorInterface {
         return deleteUserId(publicKey.getKeyID(), userId, protector);
     }
 
+    @Override
+    public SecretKeyRingEditorInterface deleteUserIds(UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
+        PGPPublicKey publicKey = secretKeyRing.getPublicKey();
+        return deleteUserIds(publicKey.getKeyID(), selectionStrategy, secretKeyRingProtector);
+    }
+
     @Override
     public SecretKeyRingEditorInterface deleteUserIds(long keyId, UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
         List<PGPPublicKey> publicKeys = new ArrayList<>();
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java
index e8c1e280..b31cafc8 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java
@@ -80,6 +80,12 @@ public interface SecretKeyRingEditorInterface {
         return deleteUserIds(keyId, UserIdSelectionStrategy.exactMatch(userId), secretKeyRingProtector);
     }
 
+    SecretKeyRingEditorInterface deleteUserIds(UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector);
+
+    default SecretKeyRingEditorInterface deleteUserIds(OpenPgpV4Fingerprint fingerprint, UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
+        return deleteUserIds(fingerprint.getKeyId(), selectionStrategy, secretKeyRingProtector);
+    }
+
     SecretKeyRingEditorInterface deleteUserIds(long keyId, UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector);
 
     /**