mirror of
https://github.com/szkolny-eu/szkolny-android.git
synced 2024-11-24 10:54:36 -06:00
[DB] Workaround missing event types after profile archiving. (#60)
This commit is contained in:
parent
8f72e11d0c
commit
ea9d801d08
@ -21,6 +21,7 @@ import kotlinx.coroutines.*
|
|||||||
import pl.szczodrzynski.edziennik.App
|
import pl.szczodrzynski.edziennik.App
|
||||||
import pl.szczodrzynski.edziennik.MainActivity
|
import pl.szczodrzynski.edziennik.MainActivity
|
||||||
import pl.szczodrzynski.edziennik.R
|
import pl.szczodrzynski.edziennik.R
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.EventType
|
||||||
import pl.szczodrzynski.edziennik.data.db.entity.Metadata
|
import pl.szczodrzynski.edziennik.data.db.entity.Metadata
|
||||||
import pl.szczodrzynski.edziennik.data.db.entity.Profile
|
import pl.szczodrzynski.edziennik.data.db.entity.Profile
|
||||||
import pl.szczodrzynski.edziennik.databinding.FragmentAgendaCalendarBinding
|
import pl.szczodrzynski.edziennik.databinding.FragmentAgendaCalendarBinding
|
||||||
@ -136,9 +137,22 @@ class AgendaFragment : Fragment(), CoroutineScope {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private suspend fun checkEventTypes() {
|
||||||
|
withContext(Dispatchers.Default) {
|
||||||
|
val eventTypes = app.db.eventTypeDao().getAllNow(app.profileId).map {
|
||||||
|
it.id
|
||||||
|
}
|
||||||
|
val defaultEventTypes = EventType.getTypeColorMap().keys
|
||||||
|
if (!eventTypes.containsAll(defaultEventTypes)) {
|
||||||
|
app.db.eventTypeDao().addDefaultTypes(activity, app.profileId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun createDefaultAgendaView() { (b as? FragmentAgendaDefaultBinding)?.let { b -> launch {
|
private fun createDefaultAgendaView() { (b as? FragmentAgendaDefaultBinding)?.let { b -> launch {
|
||||||
if (!isAdded)
|
if (!isAdded)
|
||||||
return@launch
|
return@launch
|
||||||
|
checkEventTypes()
|
||||||
delay(500)
|
delay(500)
|
||||||
|
|
||||||
agendaDefault = AgendaFragmentDefault(activity, app, b)
|
agendaDefault = AgendaFragmentDefault(activity, app, b)
|
||||||
@ -146,6 +160,7 @@ class AgendaFragment : Fragment(), CoroutineScope {
|
|||||||
}}}
|
}}}
|
||||||
|
|
||||||
private fun createCalendarAgendaView() { (b as? FragmentAgendaCalendarBinding)?.let { b -> launch {
|
private fun createCalendarAgendaView() { (b as? FragmentAgendaCalendarBinding)?.let { b -> launch {
|
||||||
|
checkEventTypes()
|
||||||
delay(300)
|
delay(300)
|
||||||
|
|
||||||
val dayList = mutableListOf<EventDay>()
|
val dayList = mutableListOf<EventDay>()
|
||||||
|
Loading…
Reference in New Issue
Block a user