BearND has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356976 )
Change subject: Only request aggregated feed content for WP hosts
......................................................................
Only request aggregated feed content for WP hosts
The aggregated feed content is highly specific to Wikipedia. It would
make sense to also check for the wiki site being a Wikipedia site
(in addition to RESTBase being enabled).
Bug: T166920
Change-Id: I6c347b53b0835dfba85172cd9f71eefad4375acd
---
M app/src/main/java/org/wikipedia/dataclient/WikiSite.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
M app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
3 files changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/76/356976/1
diff --git a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
index 909d1d5..5f2a064 100644
--- a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
+++ b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
@@ -137,6 +137,13 @@
return authorityToMobile(authority());
}
+ /**
+ * @return true if this WikiSite is pointing to a wikipedia.org domain.
+ */
+ public boolean isWikipedia() {
+ return uri.getHost().endsWith(".wikipedia.org");
+ }
+
@NonNull
public String host() {
return uri.getHost();
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 11346b1..26ba340 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -21,7 +21,7 @@
@Override
protected void buildScript(int age, WikiSite wiki) {
- boolean restBaseEnabled = RbSwitch.INSTANCE.isRestBaseEnabled(wiki);
+ boolean restBaseEnabled = RbSwitch.INSTANCE.isRestBaseEnabled(wiki) &&
wiki.isWikipedia();
if (age == 0) {
addPendingClient(new SearchClient());
diff --git a/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
b/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
index a664032..cd6ecd2 100644
--- a/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
+++ b/app/src/test/java/org/wikipedia/dataclient/WikiSiteTest.java
@@ -151,6 +151,16 @@
assertThat(subject.dbName(), is("nowiki"));
}
+ @Test public void testIsWikipediaTrue() {
+ WikiSite subject = WikiSite.forLanguageCode("test");
+ assertThat(subject.isWikipedia(), is(true));
+ }
+
+ @Test public void testIsWikipediaFalse() {
+ WikiSite subject = new WikiSite("bogus.org");
+ assertThat(subject.isWikipedia(), is(false));
+ }
+
@Test public void testHost() {
WikiSite subject = WikiSite.forLanguageCode("test");
assertThat(subject.host(), is("test.wikipedia.org"));
--
To view, visit https://gerrit.wikimedia.org/r/356976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c347b53b0835dfba85172cd9f71eefad4375acd
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
