sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fall back to random subject langugae in case there is no english one

This commit is contained in:
Daniel Gultsch 2018-07-11 13:20:06 +02:00
parent 9bdebb81ba
commit f9c5cdee6e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/xml/Element.java
View File

@ -75,7 +75,7 @@ public class Element {
return findInternationalizedChildContent(name, Locale.getDefault().getLanguage()); return findInternationalizedChildContent(name, Locale.getDefault().getLanguage());
} }
public String findInternationalizedChildContent(String name,@NonNull String language) { private String findInternationalizedChildContent(String name, @NonNull String language) {
HashMap<String,String> contents = new HashMap<>(); HashMap<String,String> contents = new HashMap<>();
for(Element child : this.children) { for(Element child : this.children) {
if (name.equals(child.getName())) { if (name.equals(child.getName())) {
@ -91,7 +91,11 @@ public class Element {
} }
} }
return contents.get(null); String value = contents.get(null);
if (value != null) {
return value;
}
return contents.size() > 0 ? contents.values().iterator().next() : null;
} }
public Element findChild(String name, String xmlns) { public Element findChild(String name, String xmlns) {