From 6c9c683c8599ecac9a909dc1181b3937d2045681 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 22 Dec 2021 12:42:31 +0100
Subject: [PATCH] Rename method to getValidAndExpiredUserIds()

---
 .../src/main/java/org/pgpainless/key/info/KeyRingInfo.java      | 2 +-
 .../key/modification/secretkeyring/SecretKeyRingEditor.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
index f30c36da..76046aef 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
@@ -340,7 +340,7 @@ public class KeyRingInfo {
      *
      * @return bound user-ids
      */
-    public List<String> getBoundButPossiblyExpiredUserIds() {
+    public List<String> getValidAndExpiredUserIds() {
         List<String> probablyExpired = new ArrayList<>();
         List<String> userIds = getUserIds();
 
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 51ca0a3a..eab2d8c5 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
@@ -171,7 +171,7 @@ public class SecretKeyRingEditor implements SecretKeyRingEditorInterface {
 
         // unmark previous primary user-ids to be non-primary
         info = PGPainless.inspectKeyRing(secretKeyRing);
-        for (String otherUserId : info.getBoundButPossiblyExpiredUserIds()) {
+        for (String otherUserId : info.getValidAndExpiredUserIds()) {
             if (userId.toString().equals(otherUserId)) {
                 continue;
             }