diff options
Diffstat (limited to 'org.fox.ttrss/src')
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java | 7 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java | 14 |
2 files changed, 16 insertions, 5 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java index 141b9680..f21e7a6b 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java @@ -98,9 +98,12 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle m_feed = feed; loadInBackground(); - } else if (!m_isLoading.getValue() && (feed != m_feed || m_lazyLoadEnabled)) { + } else if (!m_isLoading.getValue() && m_lazyLoadEnabled) { m_append = true; - m_feed = feed; + + if (m_feed != feed) { + throw new IllegalArgumentException("Attempted append request for a feed not maching original request: " + m_feed + " vs " + feed); + } loadInBackground(); } else { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java index c1ec027a..4d659c2d 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Feed.java @@ -3,6 +3,8 @@ package org.fox.ttrss.types; import android.os.Parcel; import android.os.Parcelable; +import androidx.annotation.NonNull; + import org.fox.ttrss.R; public class Feed implements Comparable<Feed>, Parcelable { @@ -103,7 +105,7 @@ public class Feed implements Comparable<Feed>, Parcelable { public Feed() { } - + public boolean equals(Feed feed) { if (feed == this) return true; @@ -111,10 +113,16 @@ public class Feed implements Comparable<Feed>, Parcelable { if (feed == null) return false; - return feed.id == this.id && (this.title == null || this.title.equals(feed.title)) && this.is_cat == feed.is_cat; + return feed.id == this.id && this.is_cat == feed.is_cat; } - + + @NonNull @Override + public String toString() { + return "{" + this.id + "," + this.is_cat + "}"; + } + + @Override public int compareTo(Feed feed) { if (feed.unread != this.unread) return feed.unread - this.unread; |