From ab6d81ec8b8e92fa0088ef83f0551b71ca050dbd Mon Sep 17 00:00:00 2001
From: Sebastian Seedorf <mail@sebse.de>
Date: Sun, 20 Oct 2019 15:17:06 +0200
Subject: [PATCH] News Manager silent error fix

---
 .../fuplanner/services/news/NewsManager.java  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java b/app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java
index 3f900ab..ac5fa32 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java
@@ -53,10 +53,19 @@ public class NewsManager {
 
         for (int i = news.length() - 1; i >= 0; i--) {
             try {
-                String title = news.getJSONObject(i).getString("title_" + language);
-                //noinspection ConstantConditions
-                if (title == null)
+                String title;
+                if (news.getJSONObject(i).has("title_" + language)) {
+                    title = news.getJSONObject(i).getString("title_" + language);
+                } else {
                     title = news.getJSONObject(i).getString("title");
+                }
+                String text;
+                if (news.getJSONObject(i).has("text_" + language)) {
+                    text = news.getJSONObject(i).getString("text_" + language);
+                } else {
+                    text = news.getJSONObject(i).getString("text");
+                }
+
                 String categoryString = news.getJSONObject(i).getString("category");
                 int category;
                 if (categoryString.equals("CATEGORY_TRICKS"))
@@ -65,10 +74,6 @@ public class NewsManager {
                     category = News.CATEGORY_UPDATE;
                 String dateString = news.getJSONObject(i).getString("date");
                 long date = UtilsDate.stringToMillis(dateString, "dd.MM.yyyy");
-                String text = news.getJSONObject(i).getString("title_" + language);
-                //noinspection ConstantConditions
-                if (text == null)
-                    text = news.getJSONObject(i).getString("text");
                 News event = new News(title, category, date, text);
                 dates.add(event);
             } catch (JSONException e) {