Cleanup

1 files changed, 5 insertions, 3 deletions

diff --git a/app/src/main/java/org/rssin/rssin/Feed.java b/app/src/main/java/org/rssin/rssin/Feed.java
index 36e5672..c1aab89 100755
--- a/app/src/main/java/org/rssin/rssin/Feed.java
+++ b/app/src/main/java/org/rssin/rssin/Feed.java
@@ -66,7 +66,7 @@ public class Feed implements Storable, Comparable<Feed>, Jsonable {
      */
     public Feed(URL url, Context context, FeedStorageProvider storage, Fetcher fetcher, FallibleListener<String, Object> titleHasChanged) {
         this.url = url;
-        setTitleFromURL(context, storage, fetcher, titleHasChanged);
+        setTitleFromURL(storage, fetcher, titleHasChanged);
     }
 
     /**
@@ -127,7 +127,7 @@ public class Feed implements Storable, Comparable<Feed>, Jsonable {
      * Cleverly make up a title based on the URL
      * @todo make it really really clever
      */
-    public void setTitleFromURL(Context context, final FeedStorageProvider storageProvider, Fetcher fetcher, final FallibleListener<String, Object> titlehasChanged) {
+    public void setTitleFromURL(final FeedStorageProvider storageProvider, Fetcher fetcher, final FallibleListener<String, Object> titlehasChanged) {
         String newTitle = url.getHost();
         String strUrl = url.toString();
         if (strUrl.lastIndexOf('/') < strUrl.lastIndexOf('.') && strUrl.lastIndexOf('/') != -1) {
@@ -151,12 +151,14 @@ public class Feed implements Storable, Comparable<Feed>, Jsonable {
             @Override
             public void onReceive(Object data) {
                 title = loader.getFeed().getTitle();
-                titlehasChanged.onReceive(title);
                 try {
                     store(storageProvider);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                if (titlehasChanged != null) {
+                    titlehasChanged.onReceive(title);
+                }
             }
         });
     }