jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395609 )
Change subject: On This Day endpoint follow-up.
......................................................................
On This Day endpoint follow-up.
Change-Id: If90c272c70001d192fdbe91b82676107254663be
---
M app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
M
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
3 files changed, 6 insertions(+), 23 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
Sharvaniharan: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
index 0a17056..21978ef 100644
--- a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
+++ b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
@@ -19,12 +19,10 @@
@SuppressWarnings("unused") @Nullable private FeaturedImage image;
@SuppressWarnings("unused") @Nullable private List<OnThisDay.Event>
onthisday;
-
@Nullable
public List<OnThisDay.Event> onthisday() {
return onthisday;
}
-
@Nullable
RbPageSummary tfa() {
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 a15db7a..d80c534 100644
---
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
+++
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
@@ -13,7 +13,6 @@
import org.wikipedia.feed.model.UtcDate;
import org.wikipedia.feed.mostread.MostReadListCard;
import org.wikipedia.feed.news.NewsListCard;
-import org.wikipedia.feed.onthisday.OnThisDay;
import org.wikipedia.feed.onthisday.OnThisDayCard;
import org.wikipedia.settings.Prefs;
import org.wikipedia.util.DateUtil;
@@ -45,12 +44,8 @@
@Override
void getCardFromResponse(@NonNull AggregatedFeedContent content,
@NonNull WikiSite wiki,
int age, @NonNull List<Card> outCards) {
- if (content.onthisday() != null) {
- List<OnThisDay.Event> selectedEvents = content.onthisday();
- OnThisDay onThisDay = new OnThisDay();
- onThisDay.setSelected(selectedEvents);
- OnThisDayCard card = new OnThisDayCard(onThisDay, wiki, age);
- outCards.add(card);
+ if (content.onthisday() != null && !content.onthisday().isEmpty())
{
+ outCards.add(new OnThisDayCard(content.onthisday(), wiki,
age));
}
}
}
diff --git a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
index 5b1c11b..d08ea6b 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
@@ -19,25 +19,19 @@
public class OnThisDayCard extends Card {
private int nextYear;
private Calendar date;
- private OnThisDay onThisDay;
private FeedAdapter.Callback callback;
private WikiSite wiki;
private OnThisDay.Event eventShownOnCard;
private int age;
- public OnThisDayCard(@NonNull OnThisDay onThisDay, @NonNull WikiSite wiki,
int age) {
+ public OnThisDayCard(@NonNull List<OnThisDay.Event> events, @NonNull
WikiSite wiki, int age) {
super();
- this.onThisDay = onThisDay;
- int randomIndex = new
Random().nextInt(onThisDay.selectedEvents().size() - 1);
- eventShownOnCard = onThisDay.selectedEvents().get(randomIndex);
this.date = DateUtil.getDefaultDateFor(age);
- this.nextYear = onThisDay.selectedEvents().get(randomIndex + 1).year();
this.wiki = wiki;
this.age = age;
- }
-
- @NonNull public OnThisDay onthisday() {
- return onThisDay;
+ int randomIndex = new Random().nextInt(events.size() - 1);
+ eventShownOnCard = events.get(randomIndex);
+ this.nextYear = randomIndex + 1 < events.size() ?
events.get(randomIndex + 1).year() : eventShownOnCard.year();
}
public FeedAdapter.Callback getCallback() {
@@ -46,10 +40,6 @@
public void setCallback(FeedAdapter.Callback callback) {
this.callback = callback;
- }
-
- @NonNull public List<OnThisDay.Event> events() {
- return onThisDay.selectedEvents();
}
@Override @NonNull public CardType type() {
--
To view, visit https://gerrit.wikimedia.org/r/395609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If90c272c70001d192fdbe91b82676107254663be
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
