Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

Make <subject/> (XML) language optional

Browse source
This commit is contained in:
Florian Schmaus 2018-05-09 16:48:53 +02:00
parent 4b8f7ca6b6
commit b4b75a3cca
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
View file

@ -544,9 +544,6 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
private final String language; private final String language;
private Subject(String language, String subject) { private Subject(String language, String subject) {
if (language == null) {
throw new NullPointerException("Language cannot be null.");
}
if (subject == null) { if (subject == null) {
throw new NullPointerException("Subject cannot be null."); throw new NullPointerException("Subject cannot be null.");
} }
@ -577,7 +574,9 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;
int result = 1; int result = 1;
result = prime * result + this.language.hashCode(); if (language != null) {
result = prime * result + this.language.hashCode();
}
result = prime * result + this.subject.hashCode(); result = prime * result + this.subject.hashCode();
return result; return result;
} }
@ -611,7 +610,7 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
@Override @Override
public XmlStringBuilder toXML(String enclosingNamespace) { public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(); XmlStringBuilder xml = new XmlStringBuilder();
xml.halfOpenElement(getElementName()).xmllangAttribute(getLanguage()).rightAngleBracket(); xml.halfOpenElement(getElementName()).optXmlLangAttribute(getLanguage()).rightAngleBracket();
xml.escape(subject); xml.escape(subject);
xml.closeElement(getElementName()); xml.closeElement(getElementName());
return xml; return xml;