Error handling ArticleActivity

1 files changed, 27 insertions, 10 deletions

diff --git a/app/src/main/java/org/rssin/android/ArticleActivity.java b/app/src/main/java/org/rssin/android/ArticleActivity.java
index 2e5460c..7d9fa2b 100755
--- a/app/src/main/java/org/rssin/android/ArticleActivity.java
+++ b/app/src/main/java/org/rssin/android/ArticleActivity.java
@@ -24,18 +24,35 @@ public class ArticleActivity extends ActionBarActivity {
         Intent intent = getIntent();
         Bundle arguments = intent.getExtras();
         container = (SortedFeedItemContainer) arguments.getSerializable("item");
-        FeedItem item = container.getFeeditem();
+        try {
+            FeedItem item = container.getFeeditem();
 
-        TextView title = (TextView) findViewById(R.id.article_title);
-        title.setText(item.getTitle());
-        TextView description = (TextView) findViewById(R.id.article_description);
-        description.setText(Html.fromHtml(item.getDescription()));
-        TextView author = (TextView) findViewById(R.id.article_author);
-        author.setText("Written by: " + item.getAuthor());
-        TextView date = (TextView) findViewById(R.id.article_date);
-        date.setText("Published on: " + item.getPubDate().toString());
+            TextView title = (TextView) findViewById(R.id.article_title);
+            title.setText(item.getTitle());
+            setTitle(item.getTitle());
 
-        new Thread(new FeedSorterTrainer(container.getSorter())).start();
+            TextView description = (TextView) findViewById(R.id.article_description);
+            description.setText(Html.fromHtml(item.getDescription()));
+
+            TextView author = (TextView) findViewById(R.id.article_author);
+            if (item.getAuthor() != null) {
+                author.setText(getResources().getString(R.string.article_author) + " " + item.getAuthor());
+            } else {
+                author.setText(R.string.article_author_unknown);
+            }
+
+            TextView date = (TextView) findViewById(R.id.article_date);
+            if (item.getPubDate() != null) {
+                date.setText(getResources().getString(R.string.article_published_on) + " " + item.getPubDate().toString());
+            } else {
+                date.setText(R.string.article_published_on_unknown);
+            }
+
+            new Thread(new FeedSorterTrainer(container.getSorter())).start();
+        } catch (NullPointerException e) {
+            Frontend.error(this, R.string.error_load_article, e);
+            finish();
+        }
     }
 
     @Override