From 81e3502f1ceb336e6f75ac7daccc0f0b1724dde7 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 3 Jun 2015 12:33:19 +0200
Subject: Error handling ArticleActivity

---
 .../java/org/rssin/android/ArticleActivity.java    | 37 ++++++++++++++++------
 app/src/main/res/values/strings.xml                | 14 ++++++--
 2 files changed, 38 insertions(+), 13 deletions(-)

(limited to 'app/src')

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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 77a55f0..5b051c8 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,8 @@
     <string name="title_activity_filters">Filters</string>
     <string name="title_activity_filter_settings">Filter</string>
     <string name="title_activity_filter">Filter</string>
+    <string name="title_activity_article">Article</string>
+    <string name="title_activity_feeds">Feeds</string>
 
     <string name="filters_action_add">Add</string>
 
@@ -39,11 +41,17 @@
     <string name="error_net_load">Internet problem</string>
 
     <string name="error_save_feedsorter">Couldn\'t store personal preferences</string>
-    <string name="title_activity_feeds">Feeds</string>
 
-    <string name="hello_world">Hello world!</string>
-    <string name="title_activity_article">ArticleActivity</string>
+    <string name="error_load_article">Couldn\'t load article</string>
+
     <string name="feeds">feeds</string>
+
     <string name="article_action_dislike">Dislike</string>
     <string name="article_action_like">Like</string>
+
+    <string name="article_author">Written by:</string>
+    <string name="article_author_unknown">Unknown author</string>
+    <string name="article_published_on">Published on:</string>
+    <string name="article_published_on_unknown"/>
+
 </resources>
-- 
cgit v1.2.3