fix equals() methods and use equals() instead of !=, duh

3 files changed, 23 insertions, 10 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 f21e7a6b..39dbda57 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
@@ -101,7 +101,7 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
         } else if (!m_isLoading.getValue() && m_lazyLoadEnabled) {
             m_append = true;
 
-            if (m_feed != feed) {
+            if (!m_feed.equals(feed)) {
                 throw new IllegalArgumentException("Attempted append request for a feed not maching original request: " + m_feed + " vs " + feed);
             }
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
index 2fdb72c1..92d003e1 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
@@ -324,14 +324,21 @@ public class Article implements Parcelable {
 		if (comments_link == null) comments_link = "";
 	}
 
-	public boolean equals(Article article) {
-		if (article == this)
+	/** compares by id only */
+	@Override
+	public boolean equals(Object other) {
+		if (other == null)
+			return false;
+
+		if (other == this)
 			return true;
 
-		if (article == null)
+		if (this.getClass() != other.getClass())
 			return false;
 
-		return article.id == id;
+		Article article = (Article) other;
+
+		return article.id == this.id;
 	}
 
 	@NonNull
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 b9bb8de8..ab1e8c8e 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
@@ -106,13 +106,19 @@ public class Feed implements Comparable<Feed>, Parcelable {
 		
 	}
 
-	public boolean equals(Feed feed) {
-		if (feed == this) 
+	@Override
+	public boolean equals(Object other) {
+		if (other == null)
+			return false;
+
+		if (other == this)
 			return true;
-		
-		if (feed == null)
+
+		if (this.getClass() != other.getClass())
 			return false;
-		
+
+		Feed feed = (Feed) other;
+
 		return feed.id == this.id && this.is_cat == feed.is_cat;
 	}