From cd5daa6fd71fb4cf26761055d185c809cc49d6f7 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 9 May 2018 16:50:19 +0200 Subject: [PATCH] Do net set a default language when parsing Message stanzas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the fallback is (usually) not needed, as most XMPP XML streams have a default xml:lang set (See RFC 6120 ยง 4.7.4.). --- .../jivesoftware/smack/util/PacketParserUtils.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java index 2d63cdc77..8e87aebd9 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java @@ -231,16 +231,7 @@ public class PacketParserUtils { message.setType(Message.Type.fromString(typeString)); } String language = getLanguageAttribute(parser); - - // determine message's default language - String defaultLanguage; - if (language != null && !"".equals(language.trim())) { - message.setLanguage(language); - defaultLanguage = language; - } - else { - defaultLanguage = Stanza.getDefaultLanguage(); - } + message.setLanguage(language); // Parse sub-elements. We include extra logic to make sure the values // are only read once. This is because it's possible for the names to appear