jenkins-bot has submitted this change and it was merged.
Change subject: Don't repeat news Feed card
......................................................................
Don't repeat news Feed card
Bug: T139480
Change-Id: Ia1a8ab61b898b08bfc2cd92d8ba360e295ea46c6
---
M
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
BearND: Looks good to me, but someone else must approve
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
index 6feb031..0443dce 100644
---
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
+++
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
@@ -6,13 +6,13 @@
import org.wikipedia.Site;
import org.wikipedia.dataclient.retrofit.RetrofitFactory;
-import org.wikipedia.feed.UtcDate;
import org.wikipedia.feed.FeedClient;
+import org.wikipedia.feed.UtcDate;
import org.wikipedia.feed.featured.FeaturedArticleCard;
+import org.wikipedia.feed.image.FeaturedImageCard;
import org.wikipedia.feed.model.Card;
import org.wikipedia.feed.mostread.MostReadListCard;
import org.wikipedia.feed.news.NewsListCard;
-import org.wikipedia.feed.image.FeaturedImageCard;
import org.wikipedia.settings.Prefs;
import org.wikipedia.util.DateUtil;
import org.wikipedia.util.log.L;
@@ -42,7 +42,7 @@
String.format(Locale.ROOT, Prefs.getRestbaseUriFormat(),
"http", site.authority()));
AggregatedFeedContentClient.Service service =
retrofit.create(Service.class);
call = service.get(DATE.year(), DATE.month(), DATE.date());
- call.enqueue(new CallbackAdapter(cb, site));
+ call.enqueue(new CallbackAdapter(cb, site, age));
}
@Override
@@ -73,10 +73,12 @@
private static class CallbackAdapter implements
retrofit2.Callback<AggregatedFeedContent> {
@NonNull private final Callback cb;
@NonNull private final Site site;
+ private final int age;
- CallbackAdapter(@NonNull Callback cb, @NonNull Site site) {
+ CallbackAdapter(@NonNull Callback cb, @NonNull Site site, int age) {
this.cb = cb;
this.site = site;
+ this.age = age;
}
@Override public void onResponse(Call<AggregatedFeedContent> call,
@@ -87,7 +89,8 @@
if (content.tfa() != null) {
cards.add(new FeaturedArticleCard(content.tfa(), DATE,
site));
}
- if (content.news() != null) {
+ // todo: remove age check when news endpoint provides dated
content, T139481.
+ if (age == 0 && content.news() != null) {
cards.add(new NewsListCard(content.news(), DATE, site));
}
if (content.mostRead() != null) {
--
To view, visit https://gerrit.wikimedia.org/r/298014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1a8ab61b898b08bfc2cd92d8ba360e295ea46c6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
