Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1799 from mfietz/issue/1796-update-feed

Browse Source 
Fix feed refresh issue
This commit is contained in:
Tom Hennen 2016-03-21 11:14:22 -04:00
commit a994cd4c08
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
View File

@ -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;
}
}

4
core/src/main/java/de/danoeh/antennapod/core/feed/FeedFile.java
View File

@ -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;

3
core/src/main/java/de/danoeh/antennapod/core/feed/FeedPreferences.java
View File

@ -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;
}