Merge remote-tracking branch 'origin/upstream-master' into masterHEADstudio-3.4.0studio-3.2.1studio-3.1.2studio-3.0studio-2.3gradle_3.4.0gradle_3.1.2gradle_3.0.0gradle_2.3.0studio-master-devmirror-goog-studio-master-devmastermain

Change-Id: I63f5e16d09297c48432192761b840310935eb903

1 files changed, 36 insertions, 0 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/models/ReaderUrlList.java b/WordPress/src/main/java/org/wordpress/android/models/ReaderUrlList.java
new file mode 100644
index 000000000..17c97f1eb
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/models/ReaderUrlList.java
@@ -0,0 +1,36 @@
+package org.wordpress.android.models;
+
+import org.wordpress.android.util.UrlUtils;
+
+import java.util.HashSet;
+
+/**
+ * URLs are normalized before being added and during comparison to ensure better comparison
+ * of URLs that may be different strings but point to the same URL
+ */
+public class ReaderUrlList extends HashSet<String> {
+    @Override
+    public boolean add(String url) {
+        return super.add(UrlUtils.normalizeUrl(url));
+    }
+
+    @Override
+    public boolean remove(Object object) {
+        if (object instanceof String) {
+            return super.remove(UrlUtils.normalizeUrl((String) object));
+        } else {
+            return super.remove(object);
+        }
+    }
+
+    @Override
+    public boolean contains(Object object) {
+        if (object instanceof String) {
+            return super.contains(UrlUtils.normalizeUrl((String) object));
+        } else {
+            return super.contains(object);
+        }
+    }
+
+
+}