github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 19:04:38 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Hotfix] Fix merge problems and migration 96 crashing.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-10-19 17:06:10 +02:00
parent ca3e6f7fc9
commit fd62653d79
No known key found for this signature in database
GPG Key ID: 70CB8A85BA1633CB
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeTeachers.kt
View File

@ -4,12 +4,12 @@
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
import pl.szczodrzynski.edziennik.DAY
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TEACHERS import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TEACHERS
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_TEACHERS import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_TEACHERS
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
import pl.szczodrzynski.edziennik.getString import pl.szczodrzynski.edziennik.ext.DAY
import pl.szczodrzynski.edziennik.ext.getString
class VulcanHebeTeachers( class VulcanHebeTeachers(
override val data: DataVulcan, override val data: DataVulcan,

2
app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration96.kt
View File

@ -10,6 +10,6 @@ import androidx.sqlite.db.SupportSQLiteDatabase
class Migration96 : Migration(95, 96) { class Migration96 : Migration(95, 96) {
override fun migrate(database: SupportSQLiteDatabase) { override fun migrate(database: SupportSQLiteDatabase) {
// teachers - associated subjects list // teachers - associated subjects list
database.execSQL("ALTER TABLE teachers ADD COLUMN teacherSubjects TEXT NOT NULL;") database.execSQL("ALTER TABLE teachers ADD COLUMN teacherSubjects TEXT NOT NULL DEFAULT '[]';")
} }
} }

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/teachers/TeachersListFragment.kt
View File

@ -48,7 +48,7 @@ class TeachersListFragment : Fragment(), CoroutineScope {
val adapter = TeachersAdapter(activity) val adapter = TeachersAdapter(activity)
app.db.teacherDao().getAllTeachers(App.profileId).observe(this@TeachersListFragment, Observer { items -> app.db.teacherDao().getAllTeachers(App.profileId).observe(viewLifecycleOwner, Observer { items ->
if (!isAdded) return@Observer if (!isAdded) return@Observer
// load & configure the adapter // load & configure the adapter