Make FeedItemUtil.getLinkWithFallback(item) tolerates null item.

2 files changed, 10 insertions, 7 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java b/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java
index 129c1923e..516c57d55 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java
@@ -81,13 +81,16 @@ public class FeedItemUtil {
      * use the feed's link if the named feed item has no link.
      */
     public static String getLinkWithFallback(FeedItem item) {
-	    String link = item.getLink();
-	    if (link == null) {
-	        Feed feed = item.getFeed();
-	        if (feed != null) {
-	            link = feed.getLink();
+	    String link = null;
+	    if (item != null) {
+            link = item.getLink();
+            if (link == null) {
+                Feed feed = item.getFeed();
+                if (feed != null) {
+                    link = feed.getLink();
+                }
             }
-        }
+        } // else null item, can only return null
         return link;
     }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java
index 0fbca2437..5ae00460e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java
@@ -51,7 +51,7 @@ public class ShareUtils {
 	}
 
     public static boolean hasLinkToShare(FeedItem item) {
-	    return ( item != null && FeedItemUtil.getLinkWithFallback(item) != null );
+	    return FeedItemUtil.getLinkWithFallback(item) != null;
     }
 
 	public static void shareFeedItemLink(Context context, FeedItem item, boolean withPosition) {