diff --git a/app/src/main/java/ru/sweetbread/unn/API.kt b/app/src/main/java/ru/sweetbread/unn/API.kt index 973ed44..74ed098 100644 --- a/app/src/main/java/ru/sweetbread/unn/API.kt +++ b/app/src/main/java/ru/sweetbread/unn/API.kt @@ -214,9 +214,8 @@ suspend fun getScheduleDay( if ((type == ME.type) and (id == ME.unnId!!)) { val schedule = withContext(Dispatchers.IO) { loadSchedule(date) } Log.d("Schedule", schedule.joinToString()) - if (schedule.size != 0) { + if (schedule.isNotEmpty()) return schedule - } } return getSchedule(type, id, date, date) diff --git a/app/src/main/java/ru/sweetbread/unn/db/Schedule.kt b/app/src/main/java/ru/sweetbread/unn/db/Schedule.kt index 7f13148..9b40ee1 100644 --- a/app/src/main/java/ru/sweetbread/unn/db/Schedule.kt +++ b/app/src/main/java/ru/sweetbread/unn/db/Schedule.kt @@ -376,7 +376,7 @@ fun loadSchedule(oid: Int): ScheduleUnit? { fun loadSchedule(date: LocalDate): ArrayList { db.scheduleDao().getSchedule(date.format(DateTimeFormatter.ISO_DATE)) - .mapNotNull { Log.d("meow", "${it.oid}: ${loadSchedule(it.oid)}") } + .map { Log.d("meow", "${it.oid}: ${loadSchedule(it.oid)}") } return ArrayList( db.scheduleDao().getSchedule(date.format(DateTimeFormatter.ISO_DATE)) .mapNotNull { loadSchedule(it.oid) }