From 9018eabd6d6477d8cf66d7cc9728c42607ff225c Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 15 Jul 2018 22:59:19 +0200 Subject: fall back to random subject langugae in case there is no english one --- src/main/java/de/pixart/messenger/xml/Element.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/xml/Element.java b/src/main/java/de/pixart/messenger/xml/Element.java index e9eaa1394..d7cace655 100644 --- a/src/main/java/de/pixart/messenger/xml/Element.java +++ b/src/main/java/de/pixart/messenger/xml/Element.java @@ -73,7 +73,7 @@ public class Element { return findInternationalizedChildContent(name, Locale.getDefault().getLanguage()); } - public String findInternationalizedChildContent(String name, @NonNull String language) { + private String findInternationalizedChildContent(String name, @NonNull String language) { HashMap contents = new HashMap<>(); for (Element child : this.children) { if (name.equals(child.getName())) { @@ -88,8 +88,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) { -- cgit v1.2.3