1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/generator/PresenceGenerator.java b/src/main/java/de/thedevstack/conversationsplus/generator/PresenceGenerator.java
index fbe7c911..bfede624 100644
--- a/src/main/java/de/thedevstack/conversationsplus/generator/PresenceGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/generator/PresenceGenerator.java
@@ -5,7 +5,9 @@ import de.thedevstack.conversationsplus.entities.Contact;
 import de.thedevstack.conversationsplus.entities.MucOptions;
 import de.thedevstack.conversationsplus.entities.Presence;
 import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.disco.FeatureRegistry;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+import de.thedevstack.conversationsplus.xmpp.openpgp.OpenPgpXep;
 import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket;
 
 public class PresenceGenerator extends AbstractGenerator {
@@ -54,9 +56,9 @@ public class PresenceGenerator extends AbstractGenerator {
 		packet.setFrom(account.getJid());
 		String sig = account.getPgpSignature();
 		if (sig != null) {
-			packet.addChild("x", "jabber:x:signed").setContent(sig);
+			packet.addChild(OpenPgpXep.SIGNED_ELEMENT, OpenPgpXep.SIGNED_NAMESPACE).setContent(sig);
 		}
-		String capHash = getCapHash();
+		String capHash = FeatureRegistry.getCapHash();
 		if (capHash != null) {
 			Element cap = packet.addChild("c",
 					"http://jabber.org/protocol/caps");
@@ -97,7 +99,7 @@ public class PresenceGenerator extends AbstractGenerator {
         }
         String sig = account.getPgpSignature();
         if (sig != null) {
-            packet.addChild("x", "jabber:x:signed").setContent(sig);
+            packet.addChild(OpenPgpXep.SIGNED_ELEMENT, OpenPgpXep.SIGNED_NAMESPACE).setContent(sig);
         }
 
         return packet;
@@ -109,7 +111,7 @@ public class PresenceGenerator extends AbstractGenerator {
         String sig = account.getPgpSignature();
         if (sig != null) {
             packet.addChild("status").setContent("online");
-            packet.addChild("x", "jabber:x:signed").setContent(sig);
+            packet.addChild(OpenPgpXep.SIGNED_ELEMENT, OpenPgpXep.SIGNED_NAMESPACE).setContent(sig);
         }
 
         return packet;