From 00ce1941095cd50a513a468ca9198247b8b1bc46 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Fri, 19 Oct 2018 09:16:42 +0200
Subject: [PATCH] Use Enum.toString() instead of Enum.name() in
 XmlStringBuilder.optElement()

---
 .../java/org/jivesoftware/smack/util/XmlStringBuilder.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
index a9b931c51..2fa649540 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
@@ -481,7 +481,9 @@ public class XmlStringBuilder implements Appendable, CharSequence, Element {
     }
 
     public XmlStringBuilder emptyElement(Enum<?> element) {
-        return emptyElement(element.name());
+        // Use Enum.toString() instead Enum.name() here, since some enums override toString() in order to replace
+        // underscores ('_') with dash ('-') for example (name() is declared final in Enum).
+        return emptyElement(element.toString());
     }
 
     public XmlStringBuilder emptyElement(String element) {