1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-12-23 11:27:57 +01:00

Rename method to getValidAndExpiredUserIds()

This commit is contained in:
Paul Schaub 2021-12-22 12:42:31 +01:00
parent 56e60e88f4
commit 6c9c683c85
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 2 additions and 2 deletions

View file

@ -340,7 +340,7 @@ public class KeyRingInfo {
* *
* @return bound user-ids * @return bound user-ids
*/ */
public List<String> getBoundButPossiblyExpiredUserIds() { public List<String> getValidAndExpiredUserIds() {
List<String> probablyExpired = new ArrayList<>(); List<String> probablyExpired = new ArrayList<>();
List<String> userIds = getUserIds(); List<String> userIds = getUserIds();

View file

@ -171,7 +171,7 @@ public class SecretKeyRingEditor implements SecretKeyRingEditorInterface {
// unmark previous primary user-ids to be non-primary // unmark previous primary user-ids to be non-primary
info = PGPainless.inspectKeyRing(secretKeyRing); info = PGPainless.inspectKeyRing(secretKeyRing);
for (String otherUserId : info.getBoundButPossiblyExpiredUserIds()) { for (String otherUserId : info.getValidAndExpiredUserIds()) {
if (userId.toString().equals(otherUserId)) { if (userId.toString().equals(otherUserId)) {
continue; continue;
} }