diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2016-03-21 11:14:22 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2016-03-21 11:14:22 -0400 |
| commit | a994cd4c0877770ce7ff1828dc40386c9db9ff2b (patch) | |
| tree | 46c041bf4d69be2ceb266e3841c4adfa749940ae /core/src/main/java/de/danoeh/antennapod | |
| parent | d2ddfa397383f1526e2f335295db6a97f4268e50 (diff) | |
| parent | abaa7a28b265657e1aaa113d31f3e023a78501c7 (diff) | |
| download | AntennaPod-a994cd4c0877770ce7ff1828dc40386c9db9ff2b.zip | |
Merge pull request #1799 from mfietz/issue/1796-update-feed
Fix feed refresh issue
Diffstat (limited to 'core/src/main/java/de/danoeh/antennapod')
3 files changed, 7 insertions, 5 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java index d2d7cbc73..dfcc71658 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java @@ -324,12 +324,11 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource { if (super.compareWithOther(other)) { return true; } - if (!title.equals(other.title)) { + if (!TextUtils.equals(title, other.title)) { return true; } if (other.feedIdentifier != null) { - if (feedIdentifier == null - || !feedIdentifier.equals(other.feedIdentifier)) { + if (feedIdentifier == null || !feedIdentifier.equals(other.feedIdentifier)) { return true; } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedFile.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedFile.java index 3dc58654b..ca9af058b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedFile.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedFile.java @@ -1,5 +1,7 @@ package de.danoeh.antennapod.core.feed; +import android.text.TextUtils; + import java.io.File; /** @@ -54,7 +56,7 @@ public abstract class FeedFile extends FeedComponent { if (super.compareWithOther(other)) { return true; } - if (!download_url.equals(other.download_url)) { + if (!TextUtils.equals(download_url, other.download_url)) { return true; } return false; diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java index faf23a37a..019001da7 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java @@ -95,8 +95,9 @@ public class FeedPreferences { * @return True if the two objects are different. */ public boolean compareWithOther(FeedPreferences other) { - if (other == null) + if (other == null) { return true; + } if (!TextUtils.equals(username, other.username)) { return true; } |