diff options
| author | orionlee <orionlee@yahoo.com> | 2018-04-30 15:49:18 -0700 |
|---|---|---|
| committer | orionlee <orionlee@yahoo.com> | 2018-04-30 15:49:18 -0700 |
| commit | ab0f4131850695537c22258633aecb4aca0aece5 (patch) | |
| tree | b8977d41ccfdba666f75951e9094814fbd7b895b /core/src/main | |
| parent | 345fcc17d0416f8db61a2506aa88c25b53718ebb (diff) | |
| download | AntennaPod-ab0f4131850695537c22258633aecb4aca0aece5.zip | |
Make FeedItemUtil.getLinkWithFallback(item) tolerates null item.
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java | 15 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java | 2 |
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) { |