Skip to content

Commit 366e833

Browse files
Fix compile errors
1 parent 6e22e7c commit 366e833

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ class MwQueryPage {
109109

110110
var diffSize = 0
111111

112-
val localDateTime by lazy { DateUtil.iso8601LocalDateTimeParse(timeStamp) }
112+
val localDateTime by lazy {
113+
if (timeStamp.isNotBlank()) DateUtil.iso8601LocalDateTimeParse(timeStamp) else null
114+
}
113115

114116
fun getContentFromSlot(slot: String): String {
115117
return slots?.get(slot)?.content.orEmpty()

app/src/main/java/org/wikipedia/views/EditHistoryStatsView.kt

+11-14
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import org.wikipedia.util.DateUtil
1616
import org.wikipedia.util.DimenUtil
1717
import org.wikipedia.util.FeedbackUtil
1818
import org.wikipedia.util.StringUtil
19-
import java.time.LocalDateTime
19+
import java.time.LocalDate
2020

2121
class EditHistoryStatsView constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) {
2222

@@ -31,19 +31,16 @@ class EditHistoryStatsView constructor(context: Context, attrs: AttributeSet? =
3131
fun setup(pageTitle: PageTitle, editHistoryStats: EditHistoryListViewModel.EditHistoryStats?) {
3232
binding.articleTitleView.text = StringUtil.fromHtml(context.getString(R.string.page_edit_history_activity_title,
3333
"<a href=\"#\">${pageTitle.displayText}</a>"))
34-
editHistoryStats?.let { stats ->
35-
val timestamp = stats.revision.timeStamp
36-
if (timestamp.isNotBlank()) {
37-
val createdYear = DateUtil.getYearOnlyDateString(DateUtil.iso8601DateParse(timestamp))
38-
val localDateTime = LocalDateTime.now()
39-
val today = DateUtil.getShortDateString(localDateTime.toLocalDate())
40-
val lastYear = DateUtil.getShortDateString(localDateTime.minusYears(1).toLocalDate())
41-
binding.editCountsView.text = context.resources.getQuantityString(R.plurals.page_edit_history_article_edits_since_year,
42-
stats.allEdits.count, stats.allEdits.count, createdYear)
43-
binding.statsGraphView.setData(stats.metrics.map { it.edits.toFloat() })
44-
binding.statsGraphView.contentDescription = context.getString(R.string.page_edit_history_metrics_content_description, lastYear, today)
45-
FeedbackUtil.setButtonTooltip(binding.statsGraphView)
46-
}
34+
editHistoryStats?.revision?.localDateTime?.let { dateTime ->
35+
val createdYear = dateTime.year.toString()
36+
val localDate = LocalDate.now()
37+
val today = DateUtil.getShortDateString(localDate)
38+
val lastYear = DateUtil.getShortDateString(localDate.minusYears(1))
39+
binding.editCountsView.text = context.resources.getQuantityString(R.plurals.page_edit_history_article_edits_since_year,
40+
editHistoryStats.allEdits.count, editHistoryStats.allEdits.count, createdYear)
41+
binding.statsGraphView.setData(editHistoryStats.metrics.map { it.edits.toFloat() })
42+
binding.statsGraphView.contentDescription = context.getString(R.string.page_edit_history_metrics_content_description, lastYear, today)
43+
FeedbackUtil.setButtonTooltip(binding.statsGraphView)
4744
}
4845
binding.articleTitleView.movementMethod = LinkMovementMethodExt { _ ->
4946
context.startActivity(PageActivity.newIntentForNewTab(context, HistoryEntry(pageTitle, HistoryEntry.SOURCE_EDIT_HISTORY), pageTitle))

0 commit comments

Comments
 (0)