Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class AggregatedFeedContentClient {

private fun requestAggregated() {
aggregatedClient.clientJob?.cancel()
val date = DateUtil.getUtcRequestDateFor(age)
val (year, month, day) = DateUtil.getYearMonthAndDayForAge(age)
aggregatedClient.clientJob = coroutineScope.launch(
CoroutineExceptionHandler { _, caught ->
L.v(caught)
Expand All @@ -146,7 +146,7 @@ class AggregatedFeedContentClient {
val deferredResponses = WikipediaApp.instance.languageState.appLanguageCodes.map { langCode ->
async {
val wikiSite = WikiSite.forLanguageCode(langCode)
val feedContentResponse = ServiceFactory.getRest(wikiSite).getFeedFeatured(date.year, date.month, date.day, langCode)
val feedContentResponse = ServiceFactory.getRest(wikiSite).getFeedFeatured(year, month, day, langCode)

feedContentResponse.randomOnThisDayEvent = feedContentResponse.onthisday?.random()

Expand Down
18 changes: 0 additions & 18 deletions app/src/main/java/org/wikipedia/feed/model/UtcDate.kt

This file was deleted.

9 changes: 2 additions & 7 deletions app/src/main/java/org/wikipedia/feed/news/NewsCard.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ package org.wikipedia.feed.news
import org.wikipedia.R
import org.wikipedia.dataclient.WikiSite
import org.wikipedia.feed.model.CardType
import org.wikipedia.feed.model.UtcDate
import org.wikipedia.feed.model.WikiSiteCard
import org.wikipedia.util.DateUtil
import org.wikipedia.util.L10nUtil
import java.util.concurrent.TimeUnit

class NewsCard(private val news: List<NewsItem>,
private val age: Int,
Expand All @@ -21,11 +20,7 @@ class NewsCard(private val news: List<NewsItem>,
}

override fun dismissHashCode(): Int {
return TimeUnit.MILLISECONDS.toDays(date().baseCalendar.time.time).toInt() + wikiSite().hashCode()
}

fun date(): UtcDate {
return UtcDate(age)
return DateUtil.getRequestDateForAge(age).toEpochDay().toInt() + wikiSite().hashCode()
}

fun news(): List<NewsItem> {
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/org/wikipedia/util/DateUtil.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import org.wikipedia.R
import org.wikipedia.WikipediaApp
import org.wikipedia.extensions.getResources
import org.wikipedia.extensions.getString
import org.wikipedia.feed.model.UtcDate
import java.text.SimpleDateFormat
import java.time.Instant
import java.time.LocalDate
Expand Down Expand Up @@ -48,7 +47,7 @@ object DateUtil {
}

fun getFeedCardDateString(age: Int): String {
return getShortDateString(UtcDate(age).baseCalendar.time)
return getShortDateString(getRequestDateForAge(age))
}

fun getFeedCardShortDateString(date: Calendar): String {
Expand Down Expand Up @@ -157,8 +156,12 @@ object DateUtil {
return DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(localDate)
}

fun getUtcRequestDateFor(age: Int): UtcDate {
return UtcDate(age)
fun getRequestDateForAge(age: Int): LocalDate {
return LocalDate.now().minusDays(age.toLong())
}

fun getYearMonthAndDayForAge(age: Int): List<String> {
return getRequestDateForAge(age).toString().split("-")
}

fun getDefaultDateFor(age: Int): Calendar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ class WidgetFeaturedPageWorker(
return try {
val app = WikipediaApp.instance
val mainPageTitle = PageTitle(MainPageNameData.valueFor(app.appOrSystemLanguageCode), app.wikiSite)
val date = DateUtil.getUtcRequestDateFor(0)
val (year, month, day) = DateUtil.getYearMonthAndDayForAge(0)

val result = ServiceFactory.getRest(app.wikiSite)
.getFeedFeatured(date.year, date.month, date.day, app.wikiSite.languageCode)
.getFeedFeatured(year, month, day, app.wikiSite.languageCode)

// TODO: don't use PageSummary.
val summary = if (result.tfa != null) {
Expand Down
Loading