Merge branch 'master' of https://github.com/camilstaps/RSSin

3 files changed, 37 insertions, 27 deletions

diff --git a/app/src/main/java/org/rssin/android/FeedSorterProvider.java b/app/src/main/java/org/rssin/android/FeedSorterProvider.java
index 3e8dec5..0f0748d 100755
--- a/app/src/main/java/org/rssin/android/FeedSorterProvider.java
+++ b/app/src/main/java/org/rssin/android/FeedSorterProvider.java
@@ -22,12 +22,12 @@ public class FeedSorterProvider {
         storageProvider = InternalStorageProvider.getInstance(context);

     }

 

-    public static FeedSorterProvider getInstance()

+    public synchronized static FeedSorterProvider getInstance()

     {

         return instance;

     }

 

-    public static FeedSorterProvider getInstance(Context context)

+    public synchronized static FeedSorterProvider getInstance(Context context)

     {

         if(instance == null)

         {

@@ -37,7 +37,7 @@ public class FeedSorterProvider {
         return instance;

     }

 

-    public FeedSorter getFeedSorter()

+    public synchronized FeedSorter getFeedSorter()

     {

         if(sorter == null)

         {

diff --git a/app/src/main/java/org/rssin/rss/FeedLoader.java b/app/src/main/java/org/rssin/rss/FeedLoader.java
index 3220826..4cdf80f 100644..100755
--- a/app/src/main/java/org/rssin/rss/FeedLoader.java
+++ b/app/src/main/java/org/rssin/rss/FeedLoader.java
@@ -1,6 +1,9 @@
 package org.rssin.rss;
 
+import android.util.Log;
+
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.net.URL;
 import java.util.Date;
 import java.util.LinkedList;
@@ -186,30 +189,37 @@ public class FeedLoader {
         int event;
         boolean imageloop = true;
         event = myParser.getEventType();
-        while (imageloop) {
-            String name = myParser.getName();
-            switch (event) {
-                case XmlPullParser.START_TAG:
-                    break;
-                case XmlPullParser.TEXT:
-                    text = myParser.getText();
-                    break;
-                case XmlPullParser.END_TAG:
-                    switch (name) {
-                        case "url":
-                            getFeed().setImageurl(text);
-                            break;
-                        case "title":
-                            getFeed().setImagetitle(text);
-                            break;
-                        case "link":
-                            getFeed().setImagelink(text);
-                            break;
-                        case "image":
-                            imageloop = false;
-                            break;
-                    }
+        try {
+            while (imageloop) {
+                String name = myParser.getName();
+                switch (event) {
+                    case XmlPullParser.START_TAG:
+                        break;
+                    case XmlPullParser.TEXT:
+                        text = myParser.getText();
+                        break;
+                    case XmlPullParser.END_TAG:
+                        switch (name) {
+                            case "url":
+                                getFeed().setImageurl(text);
+                                break;
+                            case "title":
+                                getFeed().setImagetitle(text);
+                                break;
+                            case "link":
+                                getFeed().setImagelink(text);
+                                break;
+                            case "image":
+                                imageloop = false;
+                                break;
+                        }
+                }
+
+                event = myParser.next();
             }
+        }catch(IOException e)
+        {
+            e.printStackTrace();
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 550bc2a..1a279c7 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,7 +50,7 @@
 
     <string name="article_action_dislike">Dislike</string>
     <string name="article_action_like">Like</string>
-    <string name="title_activity_home_screen">HomeScreenActivity</string>
+    <string name="title_activity_home_screen">RSSin</string>
 
     <string name="title_section1">Section 1</string>
     <string name="title_section2">Section 2</string>