From c03eca380440bc205708d86f106479884a094c37 Mon Sep 17 00:00:00 2001 From: Kacper Ziubryniewicz Date: Thu, 17 Oct 2019 14:35:10 +0200 Subject: [PATCH] [APIv2/Librus] Use apply in getting lucky numbers --- .../v2/librus/data/api/LibrusApiLuckyNumber.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiLuckyNumber.kt index 596fe4a7..14d0cc84 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiLuckyNumber.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiLuckyNumber.kt @@ -25,19 +25,19 @@ class LibrusApiLuckyNumber(override val data: DataLibrus, if (json.isJsonNull) { profile?.luckyNumberEnabled = false } else { - profile?.also { profile -> - profile.luckyNumber = -1 - profile.luckyNumberDate = Date.getToday() + profile?.apply { + luckyNumber = -1 + luckyNumberDate = Date.getToday() - json.getJsonObject("LuckyNumber")?.also { luckyNumber -> - profile.luckyNumber = luckyNumber.getInt("LuckyNumber") ?: -1 - profile.luckyNumberDate = Date.fromY_m_d(luckyNumber.getString("LuckyNumberDay")) + json.getJsonObject("LuckyNumber")?.also { luckyNumberEl -> + luckyNumber = luckyNumberEl.getInt("LuckyNumber") ?: -1 + luckyNumberDate = Date.fromY_m_d(luckyNumberEl.getString("LuckyNumberDay")) } data.luckyNumberList.add(LuckyNumber( profileId, - profile.luckyNumberDate ?: Date.getToday(), - profile.luckyNumber + luckyNumberDate ?: Date.getToday(), + luckyNumber )) } }