From db15a3e9620e67f385b5ba8ed595abbf1d947fbf Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sun, 12 Jan 2020 19:56:16 +0100
Subject: [PATCH] Fix XMPP key selection strategy by auto appending xmpp: if
 missing

---
 .../pgpainless/key/selection/keyring/impl/XMPP.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/XMPP.java b/pgpainless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/XMPP.java
index 34397c4c..e6b31d97 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/XMPP.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/selection/keyring/impl/XMPP.java
@@ -24,7 +24,10 @@ public class XMPP {
 
         @Override
         public boolean accept(String jid, PGPPublicKeyRing keyRing) {
-            return super.accept("xmpp:" + jid, keyRing);
+            if (!jid.matches("^xmpp:.+$")) {
+                jid = "xmpp:" + jid;
+            }
+            return super.accept(jid, keyRing);
         }
     }
 
@@ -32,7 +35,10 @@ public class XMPP {
 
         @Override
         public boolean accept(String jid, PGPSecretKeyRing keyRing) {
-            return super.accept("xmpp:" + jid, keyRing);
+            if (!jid.matches("^xmpp:.+$")) {
+                jid = "xmpp:" + jid;
+            }
+            return super.accept(jid, keyRing);
         }
     }
 }