[4.0-rc.4] Update build.gradle, signing and changelog.

annotation/.gitignore

@@ -0,0 +1 @@
+/build

annotation/build.gradle

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
+ */
+
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+apply plugin: 'kotlin-kapt'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+
+sourceCompatibility = "7"
+targetCompatibility = "7"
+
+repositories {
+    mavenCentral()
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/SelectiveDao.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28.
+ */
+
+package pl.szczodrzynski.edziennik.annotation
+
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+@MustBeDocumented
+annotation class SelectiveDao(
+        val db: KClass<*>
+)

annotation/src/main/java/pl/szczodrzynski/edziennik/annotation/UpdateSelective.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28. 
+ */
+
+package pl.szczodrzynski.edziennik.annotation
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.SOURCE)
+@MustBeDocumented
+annotation class UpdateSelective(
+        val primaryKeys: Array<String>,
+        val skippedColumns: Array<String> = []
+)

app/build.gradle

@@ -128,6 +128,7 @@ dependencies {
     implementation "com.mikepenz:iconics-core:${versions.iconics}"
     implementation "com.mikepenz:iconics-views:${versions.iconics}"
     implementation "com.mikepenz:community-material-typeface:${versions.font_cmd}@aar"
+    implementation "com.mikepenz:materialize:1.2.1"
 
     implementation "com.github.kuba2k2:NavLib:${versions.navlib}"
 
@@ -192,6 +193,9 @@ dependencies {
     implementation "io.coil-kt:coil:0.9.2"
 
     implementation 'com.github.kuba2k2:NumberSlidingPicker:2921225f76'
+
+    implementation project(":annotation")
+    kapt project(":codegen")
 }
 repositories {
     mavenCentral()

app/proguard/app.pro

@@ -31,6 +31,12 @@
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.luckynumber.WidgetLuckyNumberProvider
 
+-keepnames class androidx.appcompat.view.menu.MenuBuilder { setHeaderTitleInt(java.lang.CharSequence); }
+-keepclassmembernames class androidx.appcompat.view.menu.StandardMenuPopup { private *; }
+-keepnames class androidx.appcompat.view.menu.MenuPopupHelper { showPopup(int, int, boolean, boolean); }
+
+-keepclassmembernames class com.mikepenz.materialdrawer.widget.MiniDrawerSliderView { private *; }
+
 -keep class .R
 -keep class **.R$* {
     <fields>;

app/src/main/assets/pl-changelog.html

@@ -1,12 +1,19 @@
-<h3>Wersja 4.0-beta.14, 2020-03-24</h3>
+<h3>Wersja 4.0-rc.4, 2020-03-30</h3>
+<ul>
+    <li>Poprawione pobieranie załączników w Librusie.</li>
+    <li>Nowy widok zadań domowych</li>
+    <li>Możliwość oznaczania zadań domowych i wydarzeń jako wykonane.</li>
+</ul>
+<!--<h3>Wersja 4.0-rc.3, 2020-03-29</h3>
 <ul>
-    <li><b>Przebudowaliśmy cały moduł synchronizacji</b>, co oznacza większą stabilność aplikacji, szybkość oraz poprawność pobieranych danych.</li>
     <li><b><u>Wysyłanie wiadomości</u></b> - funkcja, na którą czekał każdy. Od teraz w Szkolnym można wysyłać oraz odpowiadać na wiadomości do nauczycieli &#x1F44F;</li>
+    <li><b>Przebudowaliśmy cały moduł synchronizacji</b>, co oznacza większą stabilność aplikacji, szybkość oraz poprawność pobieranych danych</li>
     <li>Udoskonalony wygląd Szkolnego - sprawi, że korzystanie z aplikacji będzie jeszcze przyjemniejsze</li>
     <li>Nowa <b>Strona główna</b> - ładniejszy wygląd oraz możliwość przestawiania kart na każdym profilu</li>
     <li>Nowy <b>Plan lekcji</b> - z doskonałą obsługą lekcji przesuniętych oraz dwóch lekcji o tej samej godzinie</li>
     <li>Nowe <b>Oceny</b> - z możliwością zmiany wartości plusów oraz minusów oraz wyłączenia niektórych ocen ze średniej</li>
     <li>Opcja wyłączenia wybranych powiadomień z aplikacji</li>
+    <li>Znaczki nieprzeczytanych informacji na obrazkach profili.</li>
     <br>
     <br>
     <li>Nowe okienka informacji o wydarzeniach oraz lekcjach</li>
@@ -21,17 +28,7 @@
     <li>Poprawiliśmy synchronizację w tle na niektórych telefonach</li>
     <li>Usunąłem denerwujący brak zaznaczenia w lewym menu</li>
     <li>Znaczna ilość błędów z poprzednich wersji już nie występuje</li>
-    <li><strike>Występują natomiast nowe błędy, dlatego proszę o ich zgłaszanie :)</strike></li>
-</ul>
-<br>
-<br>
-<br>
-<b>Uwaga.</b> Ponieważ to wersja <i>beta</i>, niektóre funkcje mogą nie działać prawidłowo.<br>
-Staramy się usuwać takie przypadki, jednak na chwilę obecną mogą występować błędy w:
-<ul>
-    <li>Wysyłanie wiadomości może nie działać w pełni prawidłowo - proszę o zgłaszanie wszystkich błędów na naszym serwerze Discord</li>
-</ul>
-<br>
+</ul>-->
 <br>
 <br>
 Dzięki za korzystanie ze Szkolnego!<br>

app/src/main/cpp/szkolny-signing.cpp

@@ -9,7 +9,7 @@
 
 /*secret password - removed for source code publication*/
 static toys AES_IV[16] = {
-	0xc4, 0x97, 0xfb, 0xbd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
+	0x1c, 0x15, 0x0f, 0x1c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  };
 
 unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat);
 

app/src/main/java/pl/szczodrzynski/edziennik/App.kt

@@ -28,9 +28,6 @@ import com.hypertrack.hyperlog.HyperLog
 import com.mikepenz.iconics.Iconics
 import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import im.wangchao.mhttp.MHttp
-import im.wangchao.mhttp.internal.cookie.PersistentCookieJar
-import im.wangchao.mhttp.internal.cookie.cache.SetCookieCache
-import im.wangchao.mhttp.internal.cookie.persistence.SharedPrefsCookiePersistor
 import kotlinx.coroutines.*
 import me.leolin.shortcutbadger.ShortcutBadger
 import okhttp3.OkHttpClient
@@ -41,6 +38,7 @@ import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.network.NetworkUtils
+import pl.szczodrzynski.edziennik.network.cookie.DumbCookieJar
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
 import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity
@@ -125,7 +123,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .followSslRedirects(false)
                 .build()
     }
-    val cookieJar by lazy { PersistentCookieJar(SetCookieCache(), SharedPrefsCookiePersistor(this)) }
+    val cookieJar by lazy { DumbCookieJar(this) }
 
     /*     _____ _                   _
           / ____(_)                 | |

app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt

@@ -40,6 +40,9 @@ import androidx.core.util.forEach
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.viewpager.widget.ViewPager
 import com.google.android.gms.security.ProviderInstaller
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
@@ -141,6 +144,10 @@ fun CharSequence?.isNotNullNorEmpty(): Boolean {
     return this != null && this.isNotEmpty()
 }
 
+fun <T> Collection<T>?.isNotNullNorEmpty(): Boolean {
+    return this != null && this.isNotEmpty()
+}
+
 fun CharSequence?.isNotNullNorBlank(): Boolean {
     return this != null && this.isNotBlank()
 }
@@ -722,6 +729,13 @@ inline fun <T : View> T.onClick(crossinline onClickListener: (v: T) -> Unit) {
     }
 }
 
+@Suppress("UNCHECKED_CAST")
+inline fun <T : View> T.onLongClick(crossinline onLongClickListener: (v: T) -> Boolean) {
+    setOnLongClickListener { v: View ->
+        onLongClickListener(v as T)
+    }
+}
+
 @Suppress("UNCHECKED_CAST")
 inline fun <T : CompoundButton> T.onChange(crossinline onChangeListener: (v: T, isChecked: Boolean) -> Unit) {
     setOnCheckedChangeListener { buttonView, isChecked ->
@@ -1008,6 +1022,7 @@ fun Context.getNotificationTitle(type: Int): String {
         Notification.TYPE_FEEDBACK_MESSAGE -> R.string.notification_type_feedback_message
         Notification.TYPE_NEW_ANNOUNCEMENT -> R.string.notification_type_new_announcement
         Notification.TYPE_AUTO_ARCHIVING -> R.string.notification_type_auto_archiving
+        Notification.TYPE_TEACHER_ABSENCE -> R.string.notification_type_new_teacher_absence
         Notification.TYPE_GENERAL -> R.string.notification_type_general
         else -> R.string.notification_type_general
     })
@@ -1166,3 +1181,19 @@ fun TextView.getTextPosition(range: IntRange): Rect {
 
     return parentTextViewRect
 }
+
+inline fun ViewPager.addOnPageSelectedListener(crossinline block: (position: Int) -> Unit) = addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+    override fun onPageScrollStateChanged(state: Int) {}
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+    override fun onPageSelected(position: Int) { block(position) }
+})
+
+val SwipeRefreshLayout.onScrollListener: RecyclerView.OnScrollListener
+    get() = object : RecyclerView.OnScrollListener() {
+        override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+            if (recyclerView.canScrollVertically(-1))
+                this@onScrollListener.isEnabled = false
+            if (!recyclerView.canScrollVertically(-1) && newState == RecyclerView.SCROLL_STATE_IDLE)
+                this@onScrollListener.isEnabled = true
+        }
+    }

app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt

@@ -31,8 +31,8 @@ import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.ProfileDrawerItem
 import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.IProfile
+import com.mikepenz.materialdrawer.model.interfaces.*
+import com.mikepenz.materialdrawer.model.utils.withIsHiddenInMiniDrawer
 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -61,7 +61,7 @@ import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
 import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
-import pl.szczodrzynski.edziennik.ui.modules.grades.GradesFragment
+import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListFragment
 import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
 import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
@@ -70,9 +70,10 @@ import pl.szczodrzynski.edziennik.ui.modules.messages.MessageFragment
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeFragment
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesListFragment
-import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsFragment
+import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsListFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment
+import pl.szczodrzynski.edziennik.ui.modules.template.TemplateFragment
 import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment
 import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushFragment
 import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
@@ -90,7 +91,6 @@ import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
 import pl.szczodrzynski.navlib.drawer.NavDrawer
 import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem
-import pl.szczodrzynski.navlib.drawer.items.withAppTitle
 import java.io.File
 import java.io.IOException
 import java.util.*
@@ -130,6 +130,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         const val TARGET_MESSAGES_DETAILS = 503
         const val TARGET_MESSAGES_COMPOSE = 504
         const val TARGET_WEB_PUSH = 140
+        const val TARGET_TEMPLATE = 1000
 
         const val HOME_ID = DRAWER_ITEM_HOME
 
@@ -154,7 +155,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     .withBadgeTypeId(TYPE_EVENT)
                     .isInDrawer(true)
 
-            list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesFragment::class)
+            list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesListFragment::class)
                     .withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline)
                     .withBadgeTypeId(TYPE_GRADE)
                     .isInDrawer(true)
@@ -186,7 +187,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
 
             // static drawer items
-            list += NavTarget(DRAWER_ITEM_NOTIFICATIONS, R.string.menu_notifications, NotificationsFragment::class)
+            list += NavTarget(DRAWER_ITEM_NOTIFICATIONS, R.string.menu_notifications, NotificationsListFragment::class)
                     .withIcon(CommunityMaterial.Icon.cmd_bell_ring_outline)
                     .isInDrawer(true)
                     .isStatic(true)
@@ -228,6 +229,13 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             list += NavTarget(TARGET_MESSAGES_COMPOSE, R.string.menu_message_compose, MessagesComposeFragment::class)
             list += NavTarget(TARGET_WEB_PUSH, R.string.menu_web_push, WebPushFragment::class)
             list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
+            if (App.devMode) {
+                list += NavTarget(TARGET_TEMPLATE, R.string.menu_template, TemplateFragment::class)
+                        .withIcon(CommunityMaterial.Icon2.cmd_test_tube_empty)
+                        .isInDrawer(true)
+                        .isBelowSeparator(true)
+                        .isStatic(true)
+            }
 
             list
         }
@@ -361,7 +369,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     false
                 }
                 drawerProfileLongClickListener = { _, profile, _, view ->
-                    if (profile is ProfileDrawerItem) {
+                    if (view != null && profile is ProfileDrawerItem) {
                         showProfileContextMenu(profile, view)
                         true
                     }
@@ -915,7 +923,8 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         bottomSheet.removeAllContextual()
         bottomSheet.toggleGroupEnabled = false
         drawer.close()
-        drawer.setSelection(target.id, fireOnClick = false)
+        if (drawer.getSelection() != target.id)
+            drawer.setSelection(target.id, fireOnClick = false)
         navView.toolbar.setTitle(target.title ?: target.name)
         navView.bottomBar.fabEnable = false
         navView.bottomBar.fabExtended = false
@@ -1063,11 +1072,12 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         val item = DrawerPrimaryItem()
                 .withIdentifier(target.id.toLong())
                 .withName(target.name)
-                .withHiddenInMiniDrawer(!app.config.ui.miniMenuButtons.contains(target.id))
+                .withIsHiddenInMiniDrawer(!app.config.ui.miniMenuButtons.contains(target.id))
                 .also { if (target.description != null) it.withDescription(target.description!!) }
                 .also { if (target.icon != null) it.withIcon(target.icon!!) }
                 .also { if (target.title != null) it.withAppTitle(getString(target.title!!)) }
                 .also { if (target.badgeTypeId != null) it.withBadgeStyle(drawer.badgeStyle)}
+                .withSelectedBackgroundAnimated(false)
 
         if (target.badgeTypeId != null)
             drawer.addUnreadCounterType(target.badgeTypeId!!, target.id)
@@ -1127,7 +1137,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         drawer.addProfileSettings(*drawerProfiles.toTypedArray())
     }
 
-    private fun showProfileContextMenu(profile: IProfile<*>, view: View) {
+    private fun showProfileContextMenu(profile: IProfile, view: View) {
         val profileId = profile.identifier.toInt()
         val popupMenu = PopupMenu(this, view)
         popupMenu.menu.add(0, 1, 1, R.string.profile_menu_open_settings)
@@ -1140,7 +1150,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 }
                 loadTarget(DRAWER_ITEM_SETTINGS, null)
             } else if (item.itemId == 2) {
-                ProfileRemoveDialog(this, profileId, profile.name?.getText(this)?.toString() ?: "?")
+                ProfileRemoveDialog(this, profileId, profile.name?.getText(this) ?: "?")
             }
             true
         }

app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt

@@ -22,7 +22,7 @@ import kotlin.coroutines.CoroutineContext
 
 class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
     companion object {
-        const val DATA_VERSION = 11
+        const val DATA_VERSION = 12
     }
 
     private val job = Job()

app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt

@@ -18,7 +18,7 @@ import kotlin.coroutines.CoroutineContext
 
 class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List<ConfigEntry>) : CoroutineScope, AbstractConfig {
     companion object {
-        const val DATA_VERSION = 1
+        const val DATA_VERSION = 2
     }
 
     private val job = Job()

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt

@@ -64,11 +64,25 @@ class ConfigMigration(app: App, config: Config) {
             dataVersion = 2
         }
 
+        if (dataVersion < 3) {
+            update = null
+            privacyPolicyAccepted = false
+            debugMode = false
+            devModePassword = null
+            appInstalledTime = 0L
+            appRateSnackbarTime = 0L
+
+            dataVersion = 3
+        }
+
         if (dataVersion < 10) {
             ui.openDrawerOnBackPressed = false
             ui.snowfall = false
             ui.bottomSheetOpened = false
             sync.dontShowAppManagerDialog = false
+            sync.webPushEnabled = true
+            sync.lastAppSync = 0L
+
 
             dataVersion = 10
         }

app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt

@@ -5,6 +5,7 @@
 package pl.szczodrzynski.edziennik.config.utils
 
 import pl.szczodrzynski.edziennik.config.ProfileConfig
+import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.COLOR_MODE_WEIGHTED
 import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_ALL_GRADES
@@ -14,11 +15,23 @@ class ProfileConfigMigration(config: ProfileConfig) {
 
         if (dataVersion < 1) {
             grades.colorMode = COLOR_MODE_WEIGHTED
-            grades.dontCountEnabled = false
             grades.yearAverageMode = YEAR_ALL_GRADES
+            grades.hideImproved = false
+            grades.averageWithoutWeight = true
+            grades.plusValue = null
+            grades.minusValue = null
+            grades.dontCountEnabled = false
+            grades.dontCountGrades = listOf()
             ui.agendaViewType = AGENDA_DEFAULT
+            // no migration for ui.homeCards
 
             dataVersion = 1
         }
+
+        if (dataVersion < 2) {
+            sync.notificationFilter = sync.notificationFilter + Notification.TYPE_TEACHER_ABSENCE
+
+            dataVersion = 2
+        }
     }}
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt

@@ -70,13 +70,13 @@ val librusLoginMethods = listOf(
         LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_SYNERGIA, LibrusLoginSynergia::class.java)
                 .withIsPossible { _, loginStore -> !loginStore.hasLoginData("fakeLogin") }
                 .withRequiredLoginMethod { profile, _ ->
-                    if (profile?.hasStudentData("accountPassword") == false) LOGIN_METHOD_LIBRUS_API else LOGIN_METHOD_NOT_NEEDED
+                    if (profile?.hasStudentData("accountPassword") == false || true) LOGIN_METHOD_LIBRUS_API else LOGIN_METHOD_NOT_NEEDED
                 },
 
         LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_MESSAGES, LibrusLoginMessages::class.java)
                 .withIsPossible { _, loginStore -> !loginStore.hasLoginData("fakeLogin") }
                 .withRequiredLoginMethod { profile, _ ->
-                    if (profile?.hasStudentData("accountPassword") == false) LOGIN_METHOD_LIBRUS_SYNERGIA else LOGIN_METHOD_NOT_NEEDED
+                    if (profile?.hasStudentData("accountPassword") == false || true) LOGIN_METHOD_LIBRUS_SYNERGIA else LOGIN_METHOD_NOT_NEEDED
                 }
 )
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt

@@ -7,7 +7,6 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data
 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
@@ -43,8 +42,8 @@ open class EdudziennikWeb(open val data: DataEdudziennik, open val lastSync: Lon
 
                 if (semester == null && url.contains("start")) {
                     profile?.also { profile ->
-                        val cookies = data.app.cookieJar.getForDomain("dziennikel.appspot.com")
-                        val semesterCookie = cookies.firstOrNull { it.name() == "semester" }?.value()?.toIntOrNull()
+                        val cookies = data.app.cookieJar.getAll("dziennikel.appspot.com")
+                        val semesterCookie = cookies["semester"]?.toIntOrNull()
 
                         semesterCookie?.let { data.currentSemester = it }
 
@@ -75,13 +74,7 @@ open class EdudziennikWeb(open val data: DataEdudziennik, open val lastSync: Lon
             }
         }
 
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name("sessionid")
-                        .value(data.webSessionId!!)
-                        .domain("dziennikel.appspot.com")
-                        .secure().httpOnly().build()
-        ))
+        data.app.cookieJar.set("dziennikel.appspot.com", "sessionid", data.webSessionId)
 
         Request.builder()
                 .url(url)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebEvents.kt

@@ -39,17 +39,16 @@ class EdudziennikWebEvents(override val data: DataEdudziennik,
                         ?: return@forEach
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        date,
-                        null,
-                        title,
-                        -1,
-                        Event.TYPE_CLASS_EVENT,
-                        false,
-                        -1,
-                        -1,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = date,
+                        time = null,
+                        topic = title,
+                        color = null,
+                        type = Event.TYPE_CLASS_EVENT,
+                        teacherId = -1,
+                        subjectId = -1,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt

@@ -56,17 +56,16 @@ class EdudziennikWebExams(override val data: DataEdudziennik,
                 val eventType = data.getEventType(eventTypeId, eventTypeName)
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        date,
-                        startTime,
-                        topic,
-                        -1,
-                        eventType.id,
-                        false,
-                        -1,
-                        subject.id,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = date,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = eventType.id,
+                        teacherId = -1,
+                        subjectId = subject.id,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt

@@ -52,17 +52,16 @@ class EdudziennikWebHomework(override val data: DataEdudziennik,
                     val topic = homeworkElement.child(4).text()
 
                     val eventObject = Event(
-                            profileId,
-                            id,
-                            date,
-                            startTime,
-                            topic,
-                            -1,
-                            Event.TYPE_HOMEWORK,
-                            false,
-                            teacher.id,
-                            subject.id,
-                            data.teamClass?.id ?: -1
+                            profileId = profileId,
+                            id = id,
+                            date = date,
+                            time = startTime,
+                            topic = topic,
+                            color = null,
+                            type = Event.TYPE_HOMEWORK,
+                            teacherId = teacher.id,
+                            subjectId = subject.id,
+                            teamId = data.teamClass?.id ?: -1
                     )
 
                     data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt

@@ -24,7 +24,7 @@ class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit)
             onSuccess()
         }
         else {
-            data.app.cookieJar.clearForDomain("dziennikel.appspot.com")
+            data.app.cookieJar.clear("dziennikel.appspot.com")
             if (data.loginEmail.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) {
                 loginWithCredentials()
             }
@@ -59,8 +59,8 @@ class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit)
                     }
                 }
 
-                val cookies = data.app.cookieJar.getForDomain("dziennikel.appspot.com")
-                val sessionId = cookies.firstOrNull { it.name() == "sessionid" }?.value()
+                val cookies = data.app.cookieJar.getAll("dziennikel.appspot.com")
+                val sessionId = cookies["sessionid"]
 
                 if (sessionId == null) {
                     data.error(ApiError(TAG, ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt

@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik
 
 import androidx.core.util.set
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB
@@ -24,18 +23,8 @@ class DataIdziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(
         loginMethods.clear()
         if (isWebLoginValid()) {
             loginMethods += LOGIN_METHOD_IDZIENNIK_WEB
-            app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("ASP.NET_SessionId_iDziennik")
-                            .value(webSessionId!!)
-                            .domain("iuczniowie.progman.pl")
-                            .secure().httpOnly().build(),
-                    Cookie.Builder()
-                            .name(".ASPXAUTH")
-                            .value(webAuth!!)
-                            .domain("iuczniowie.progman.pl")
-                            .secure().httpOnly().build()
-            ))
+            app.cookieJar.set("iuczniowie.progman.pl", "ASP.NET_SessionId_iDziennik", webSessionId)
+            app.cookieJar.set("iuczniowie.progman.pl", ".ASPXAUTH", webAuth)
         }
         if (isApiLoginValid())
             loginMethods += LOGIN_METHOD_IDZIENNIK_API

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt

@@ -80,17 +80,16 @@ class IdziennikWebExams(override val data: DataIdziennik,
                 }
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        examDate,
-                        startTime,
-                        topic,
-                        -1,
-                        eventType,
-                        false,
-                        teacherId,
-                        subjectId,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = examDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = eventType,
+                        teacherId = teacherId,
+                        subjectId = subjectId,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt

@@ -67,17 +67,16 @@ class IdziennikWebHomework(override val data: DataIdziennik,
 
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        eventDate,
-                        startTime,
-                        topic,
-                        -1,
-                        Event.TYPE_HOMEWORK,
-                        false,
-                        teacherId,
-                        subjectId,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = eventDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = Event.TYPE_HOMEWORK,
+                        teacherId = teacherId,
+                        subjectId = subjectId,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt

@@ -7,7 +7,6 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login
 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik
@@ -24,22 +23,12 @@ class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
 
     init { run {
         if (data.isWebLoginValid()) {
-            data.app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("ASP.NET_SessionId_iDziennik")
-                            .value(data.webSessionId!!)
-                            .domain("iuczniowie.progman.pl")
-                            .secure().httpOnly().build(),
-                    Cookie.Builder()
-                            .name(".ASPXAUTH")
-                            .value(data.webAuth!!)
-                            .domain("iuczniowie.progman.pl")
-                            .secure().httpOnly().build()
-            ))
+            data.app.cookieJar.set("iuczniowie.progman.pl", "ASP.NET_SessionId_iDziennik", data.webSessionId)
+            data.app.cookieJar.set("iuczniowie.progman.pl", ".ASPXAUTH", data.webAuth)
             onSuccess()
         }
         else {
-            data.app.cookieJar.clearForDomain("iuczniowie.progman.pl")
+            data.app.cookieJar.clear("iuczniowie.progman.pl")
             if (data.webSchoolName != null && data.webUsername != null && data.webPassword != null) {
                 loginWithCredentials()
             }
@@ -62,11 +51,11 @@ class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) {
 
                 // login succeeded: there is a start page
                 if (text.contains("czyWyswietlicDostepMobilny")) {
-                    val cookies = data.app.cookieJar.getForDomain("iuczniowie.progman.pl")
+                    val cookies = data.app.cookieJar.getAll("iuczniowie.progman.pl")
                     run {
-                        data.webSessionId = cookies.singleOrNull { it.name() == "ASP.NET_SessionId_iDziennik" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION
-                        data.webAuth = cookies.singleOrNull { it.name() == ".ASPXAUTH" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH
-                        data.apiBearer = cookies.singleOrNull { it.name() == "Bearer" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER
+                        data.webSessionId = cookies["ASP.NET_SessionId_iDziennik"] ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION
+                        data.webAuth = cookies[".ASPXAUTH"] ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH
+                        data.apiBearer = cookies["Bearer"]?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER
                         data.loginExpiryTime = response.getUnixDate() + 30 * MINUTE /* after about 40 minutes the login didn't work already */
                         data.apiExpiryTime = response.getUnixDate() + 12 * HOUR /* actually it expires after 24 hours but I'm not sure when does the token refresh. */
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt

@@ -4,7 +4,6 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus
 
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.currentTimeUnix
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_API
@@ -31,23 +30,11 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
             loginMethods += LOGIN_METHOD_LIBRUS_API
         if (isSynergiaLoginValid()) {
             loginMethods += LOGIN_METHOD_LIBRUS_SYNERGIA
-            app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("DZIENNIKSID")
-                            .value(synergiaSessionId!!)
-                            .domain("synergia.librus.pl")
-                            .secure().httpOnly().build()
-            ))
+            app.cookieJar.set("synergia.librus.pl", "DZIENNIKSID", synergiaSessionId)
         }
         if (isMessagesLoginValid()) {
             loginMethods += LOGIN_METHOD_LIBRUS_MESSAGES
-            app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("DZIENNIKSID")
-                            .value(messagesSessionId!!)
-                            .domain("wiadomosci.librus.pl")
-                            .secure().httpOnly().build()
-            ))
+            app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", messagesSessionId)
         }
     }
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt

@@ -64,7 +64,7 @@ val LibrusFeatures = listOf(
         Feature(LOGIN_TYPE_LIBRUS, FEATURE_PUSH_CONFIG, listOf(
                 ENDPOINT_LIBRUS_API_PUSH_CONFIG to LOGIN_METHOD_LIBRUS_API
         ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data ->
-                !data.app.config.sync.tokenLibrusList.contains(data.profileId)
+                (data as DataLibrus).isPremium && !data.app.config.sync.tokenLibrusList.contains(data.profileId)
         },
 
 
@@ -116,11 +116,11 @@ val LibrusFeatures = listOf(
          * Homework - using API.
          * Sync only if account has premium access.
          */
-        Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf(
+        /*Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf(
                 ENDPOINT_LIBRUS_API_HOMEWORK to LOGIN_METHOD_LIBRUS_API
         ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data ->
                 (data as DataLibrus).isPremium
-        },
+        },*/
         /**
          * Behaviour - using API.
          */
@@ -227,9 +227,9 @@ val LibrusFeatures = listOf(
          */
         Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf(
                 ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK to LOGIN_METHOD_LIBRUS_SYNERGIA
-        ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA)).withShouldSync { data ->
+        ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA))/*.withShouldSync { data ->
                 !(data as DataLibrus).isPremium
-        },
+        }*/,
 
         /**
          * Messages inbox - using messages website.

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusMessages.kt

@@ -12,7 +12,6 @@ import im.wangchao.mhttp.body.MediaTypeUtils
 import im.wangchao.mhttp.callback.FileCallbackHandler
 import im.wangchao.mhttp.callback.JsonCallbackHandler
 import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
 import org.json.JSONObject
 import org.json.XML
 import org.jsoup.Jsoup
@@ -89,14 +88,7 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
             }
         }
 
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name("DZIENNIKSID")
-                        .value(data.messagesSessionId!!)
-                        .domain("wiadomosci.librus.pl")
-                        .secure().httpOnly().build()
-        ))
-
+        data.app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", data.messagesSessionId)
 
         val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
         val doc = docBuilder.newDocument()
@@ -180,14 +172,7 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
             }
         }
 
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name("DZIENNIKSID")
-                        .value(data.messagesSessionId!!)
-                        .domain("wiadomosci.librus.pl")
-                        .secure().httpOnly().build()
-        ))
-
+        data.app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", data.messagesSessionId)
 
         val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
         val doc = docBuilder.newDocument()
@@ -267,10 +252,11 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
                 .enqueue()
     }
 
-    fun sandboxGetFile(tag: String, action: String, targetFile: File, onSuccess: (file: File) -> Unit,
+    fun sandboxGetFile(tag: String, url: String, targetFile: File, onSuccess: (file: File) -> Unit,
+                       method: Int = GET,
                        onProgress: (written: Long, total: Long) -> Unit) {
 
-        d(tag, "Request: Librus/Messages - $LIBRUS_SANDBOX_URL$action")
+        d(tag, "Request: Librus/Messages - $url")
 
         val callback = object : FileCallbackHandler(targetFile) {
             override fun onSuccess(file: File?, response: Response?) {
@@ -306,9 +292,14 @@ open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) {
         }
 
         Request.builder()
-                .url("$LIBRUS_SANDBOX_URL$action")
+                .url(url)
                 .userAgent(SYNERGIA_USER_AGENT)
-                .post()
+                .also {
+                    when (method) {
+                        POST -> it.post()
+                        else -> it.get()
+                    }
+                }
                 .callback(callback)
                 .build()
                 .enqueue()

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt

@@ -13,6 +13,7 @@ import pl.szczodrzynski.edziennik.data.db.entity.Attendance
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
 import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
 
 class LibrusApiAttendances(override val data: DataLibrus,
                            override val lastSync: Long?,
@@ -45,7 +46,7 @@ class LibrusApiAttendances(override val data: DataLibrus,
                 val typeObject = data.attendanceTypes[type] ?: null
                 val topic = typeObject?.name ?: ""
 
-                val startTime = data.lessonRanges.get(lessonNo).startTime
+                val startTime = data.lessonRanges.get(lessonNo)?.startTime
 
                 val lesson = if (lessonId != -1L)
                     data.librusLessons.singleOrNull { it.lessonId == lessonId }
@@ -59,7 +60,7 @@ class LibrusApiAttendances(override val data: DataLibrus,
                         semester,
                         topic,
                         lessonDate,
-                        startTime,
+                        startTime ?: Time(0, 0, 0),
                         typeObject?.type ?: Attendance.TYPE_CUSTOM
                 )
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt

@@ -47,17 +47,16 @@ class LibrusApiEvents(override val data: DataLibrus,
                 val addedDate = Date.fromIso(event.getString("AddDate"))
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        eventDate,
-                        startTime,
-                        topic,
-                        -1,
-                        type,
-                        false,
-                        teacherId,
-                        subjectId,
-                        teamId
+                        profileId = profileId,
+                        id = id,
+                        date = eventDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = type,
+                        teacherId = teacherId,
+                        subjectId = subjectId,
+                        teamId = teamId
                 )
 
                 data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt

@@ -34,17 +34,16 @@ class LibrusApiHomework(override val data: DataLibrus,
                 val addedDate = Date.fromY_m_d(homework.getString("Date"))
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        eventDate,
-                        null,
-                        topic,
-                        -1,
-                        -1,
-                        false,
-                        teacherId,
-                        -1,
-                        -1
+                        profileId = profileId,
+                        id = id,
+                        date = eventDate,
+                        time = null,
+                        topic = topic,
+                        color = null,
+                        type = -1,
+                        teacherId = teacherId,
+                        subjectId = -1,
+                        teamId = -1
                 )
 
                 data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt

@@ -4,15 +4,12 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api
 
-import pl.szczodrzynski.edziennik.DAY
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LUCKY_NUMBER
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.getJsonObject
-import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
 
@@ -41,9 +38,10 @@ class LibrusApiLuckyNumber(override val data: DataLibrus,
                             luckyNumber
                     )
 
-                    //if (luckyNumberDate > Date.getToday()) {
+                    if (luckyNumberDate >= Date.getToday())
                         nextSync = luckyNumberDate.combineWith(Time(15, 0, 0))
-                    //}
+                    else
+                        nextSync = System.currentTimeMillis() + 6*HOUR*1000
 
                     data.luckyNumberList.add(luckyNumberObject)
                     data.metadataList.add(

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt

@@ -39,17 +39,16 @@ class LibrusApiPtMeetings(override val data: DataLibrus,
                 }
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        eventDate,
-                        startTime,
-                        topic,
-                        -1,
-                        Event.TYPE_PT_MEETING,
-                        false,
-                        teacherId,
-                        -1,
-                        data.teamClass?.id ?: -1
+                        profileId = profileId,
+                        id = id,
+                        date = eventDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = Event.TYPE_PT_MEETING,
+                        teacherId = teacherId,
+                        subjectId = -1,
+                        teamId = data.teamClass?.id ?: -1
                 )
 
                 data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPushConfig.kt

@@ -21,6 +21,14 @@ class LibrusApiPushConfig(override val data: DataLibrus,
     }
 
     init { data.app.config.sync.tokenLibrus?.also { tokenLibrus ->
+        if(tokenLibrus.isEmpty()) {
+            data.setSyncNext(ENDPOINT_LIBRUS_API_PUSH_CONFIG, SYNC_ALWAYS)
+            data.app.config.sync.tokenLibrusList =
+                    data.app.config.sync.tokenLibrusList + profileId
+            onSuccess(ENDPOINT_LIBRUS_API_PUSH_CONFIG)
+            return@also
+        }
+
         apiGet(TAG, "ChangeRegister", payload = JsonObject(
                 "provider" to "FCM",
                 "device" to tokenLibrus,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt

@@ -59,7 +59,7 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
                         profileId,
                         Metadata.TYPE_TEACHER_ABSENCE,
                         id,
-                        profile?.empty ?: false,
+                        true,
                         profile?.empty ?: false,
                         System.currentTimeMillis()
                 ))

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt

@@ -6,9 +6,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages
 
 import kotlinx.coroutines.*
 import org.greenrobot.eventbus.EventBus
-import pl.szczodrzynski.edziennik.data.api.ERROR_FILE_DOWNLOAD
-import pl.szczodrzynski.edziennik.data.api.EXCEPTION_LIBRUS_MESSAGES_REQUEST
-import pl.szczodrzynski.edziennik.data.api.Regexes
+import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
@@ -53,11 +51,10 @@ class LibrusMessagesGetAttachment(override val data: DataLibrus,
 
                 val attachmentKey = keyMatcher[1]
                 getAttachmentCheckKey(attachmentKey) {
-                    downloadAttachment(attachmentKey)
+                    downloadAttachment("${LIBRUS_SANDBOX_URL}CSDownload&singleUseKey=$attachmentKey", method = POST)
                 }
             } else {
-                data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD)
-                        .withApiResponse(doc.toString()))
+                downloadAttachment("$downloadLink/get", method = GET)
             }
         }
     }
@@ -91,10 +88,10 @@ class LibrusMessagesGetAttachment(override val data: DataLibrus,
         }
     }
 
-    private fun downloadAttachment(attachmentKey: String) {
+    private fun downloadAttachment(url: String, method: Int = GET) {
         val targetFile = File(Utils.getStorageDir(), attachmentName)
 
-        sandboxGetFile(TAG, "CSDownload&singleUseKey=$attachmentKey", targetFile, { file ->
+        sandboxGetFile(TAG, url, targetFile, { file ->
 
             val event = AttachmentGetEvent(
                     profileId,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt

@@ -109,6 +109,11 @@ class LibrusMessagesGetList(override val data: DataLibrus,
                             id
                     )
 
+                    element.select("isAnyFileAttached")?.text()?.let {
+                        if (it == "1")
+                            messageObject.overrideHasAttachments = true
+                    }
+
                     data.messageIgnoreList.add(messageObject)
                     data.messageRecipientList.add(messageRecipientObject)
                     data.setSeenMetadataList.add(Metadata(

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt

@@ -89,17 +89,16 @@ class LibrusSynergiaHomework(override val data: DataLibrus,
                     }
 
                     val eventObject = Event(
-                            profileId,
-                            id,
-                            eventDate,
-                            startTime,
-                            "$topic\n$description",
-                            -1,
-                            Event.TYPE_HOMEWORK,
-                            false,
-                            teacherId,
-                            subjectId,
-                            data.teamClass?.id ?: -1
+                            profileId = profileId,
+                            id = id,
+                            date = eventDate,
+                            time = startTime,
+                            topic = "$topic\n$description",
+                            color = null,
+                            type = Event.TYPE_HOMEWORK,
+                            teacherId = teacherId,
+                            subjectId = subjectId,
+                            teamId = data.teamClass?.id ?: -1
                     )
 
                     data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginMessages.kt

@@ -8,7 +8,6 @@ import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.body.MediaTypeUtils
 import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
@@ -64,21 +63,15 @@ class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) {
         }
 
         if (data.isMessagesLoginValid()) {
-            data.app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("DZIENNIKSID")
-                            .value(data.messagesSessionId!!)
-                            .domain("wiadomosci.librus.pl")
-                            .secure().httpOnly().build()
-            ))
+            data.app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", data.messagesSessionId)
             onSuccess()
         }
         else {
-            data.app.cookieJar.clearForDomain("wiadomosci.librus.pl")
+            data.app.cookieJar.clear("wiadomosci.librus.pl")
             if (data.loginMethods.contains(LOGIN_METHOD_LIBRUS_SYNERGIA)) {
                 loginWithSynergia()
             }
-            else if (data.apiLogin != null && data.apiPassword != null) {
+            else if (data.apiLogin != null && data.apiPassword != null && false) {
                 loginWithCredentials()
             }
             else {
@@ -148,7 +141,7 @@ class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) {
     }
 
     private fun saveSessionId(response: Response?, text: String?) {
-        var sessionId = data.app.cookieJar.getCookie("wiadomosci.librus.pl", "DZIENNIKSID")
+        var sessionId = data.app.cookieJar.get("wiadomosci.librus.pl", "DZIENNIKSID")
         sessionId = sessionId?.replace("-MAINT", "") // dunno what's this
         sessionId = sessionId?.replace("MAINT", "") // dunno what's this
         if (sessionId == null) {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt

@@ -37,19 +37,19 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) {
         }
         else if (data.portalRefreshToken != null) {
             if (data.fakeLogin) {
-                data.app.cookieJar.clearForDomain("librus.szkolny.eu")
+                data.app.cookieJar.clear("librus.szkolny.eu")
             }
             else {
-                data.app.cookieJar.clearForDomain("portal.librus.pl")
+                data.app.cookieJar.clear("portal.librus.pl")
             }
             accessToken(null, data.portalRefreshToken)
         }
         else {
             if (data.fakeLogin) {
-                data.app.cookieJar.clearForDomain("librus.szkolny.eu")
+                data.app.cookieJar.clear("librus.szkolny.eu")
             }
             else {
-                data.app.cookieJar.clearForDomain("portal.librus.pl")
+                data.app.cookieJar.clear("portal.librus.pl")
             }
             authorize(if (data.fakeLogin) FAKE_LIBRUS_AUTHORIZE else LIBRUS_AUTHORIZE_URL)
         }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginSynergia.kt

@@ -8,7 +8,6 @@ import com.google.gson.JsonObject
 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
@@ -30,17 +29,11 @@ class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Un
         }
 
         if (data.isSynergiaLoginValid()) {
-            data.app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("DZIENNIKSID")
-                            .value(data.synergiaSessionId!!)
-                            .domain("synergia.librus.pl")
-                            .secure().httpOnly().build()
-            ))
+            data.app.cookieJar.set("synergia.librus.pl", "DZIENNIKSID", data.synergiaSessionId)
             onSuccess()
         }
         else {
-            data.app.cookieJar.clearForDomain("synergia.librus.pl")
+            data.app.cookieJar.clear("synergia.librus.pl")
             if (data.loginMethods.contains(LOGIN_METHOD_LIBRUS_API)) {
                 loginWithApi()
             }
@@ -92,7 +85,7 @@ class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Un
                 }
 
                 if (location?.endsWith("centrum_powiadomien") == true) {
-                    val sessionId = data.app.cookieJar.getCookie("synergia.librus.pl", "DZIENNIKSID")
+                    val sessionId = data.app.cookieJar.get("synergia.librus.pl", "DZIENNIKSID")
                     if (sessionId == null) {
                         data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_SYNERGIA_NO_SESSION_ID)
                                 .withResponse(response)
@@ -117,7 +110,7 @@ class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Un
             }
         }
 
-        data.app.cookieJar.clearForDomain("synergia.librus.pl")
+        data.app.cookieJar.clear("synergia.librus.pl")
         Request.builder()
                 .url(LIBRUS_SYNERGIA_TOKEN_LOGIN_URL.replace("TOKEN", token) + "/uczen/widok/centrum_powiadomien")
                 .userAgent(LIBRUS_USER_AGENT)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikWeb.kt

@@ -8,7 +8,6 @@ import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
 import im.wangchao.mhttp.callback.FileCallbackHandler
 import im.wangchao.mhttp.callback.TextCallbackHandler
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
@@ -105,18 +104,8 @@ open class MobidziennikWeb(open val data: DataMobidziennik, open val lastSync: L
             }
         }
 
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name(data.webSessionKey!!)
-                        .value(data.webSessionValue!!)
-                        .domain("${data.loginServerName}.mobidziennik.pl")
-                        .secure().httpOnly().build(),
-                Cookie.Builder()
-                        .name("SERVERID")
-                        .value(data.webServerId!!)
-                        .domain("${data.loginServerName}.mobidziennik.pl")
-                        .secure().httpOnly().build()
-        ))
+        data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", data.webSessionKey, data.webSessionValue)
+        data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", "SERVERID", data.webServerId)
 
         Request.builder()
                 .url(url)
@@ -187,18 +176,8 @@ open class MobidziennikWeb(open val data: DataMobidziennik, open val lastSync: L
             }
         }
 
-        data.app.cookieJar.saveFromResponse(null, listOf(
-                Cookie.Builder()
-                        .name(data.webSessionKey!!)
-                        .value(data.webSessionValue!!)
-                        .domain("${data.loginServerName}.mobidziennik.pl")
-                        .secure().httpOnly().build(),
-                Cookie.Builder()
-                        .name("SERVERID")
-                        .value(data.webServerId!!)
-                        .domain("${data.loginServerName}.mobidziennik.pl")
-                        .secure().httpOnly().build()
-        ))
+        data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", data.webSessionKey, data.webSessionValue)
+        data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", "SERVERID", data.webServerId)
 
         Request.builder()
                 .url(url)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiEvents.kt

@@ -51,17 +51,16 @@ class MobidziennikApiEvents(val data: DataMobidziennik, rows: List<String>) {
 
 
                 val eventObject = Event(
-                        data.profileId,
-                        id,
-                        eventDate,
-                        startTime,
-                        topic,
-                        -1,
-                        type,
-                        false,
-                        teacherId,
-                        subjectId,
-                        teamId)
+                        profileId = data.profileId,
+                        id = id,
+                        date = eventDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = type,
+                        teacherId = teacherId,
+                        subjectId = subjectId,
+                        teamId = teamId)
 
                 data.eventList.add(eventObject)
                 data.metadataList.add(
@@ -76,6 +75,8 @@ class MobidziennikApiEvents(val data: DataMobidziennik, rows: List<String>) {
             }
         }
 
-        data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK))
+        data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_DEFAULT))
+        data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_EXAM))
+        data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_SHORT_QUIZ))
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiHomework.kt

@@ -4,6 +4,7 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api
 
+import android.text.Html
 import androidx.core.util.contains
 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
@@ -25,22 +26,21 @@ class MobidziennikApiHomework(val data: DataMobidziennik, rows: List<String>) {
                 val id = cols[0].toLong()
                 val teacherId = cols[7].toLong()
                 val subjectId = cols[6].toLong()
-                val topic = cols[1]
+                val topic = Html.fromHtml(cols[1])?.toString() ?: ""
                 val eventDate = Date.fromYmd(cols[2])
                 val startTime = Time.fromYmdHm(cols[3])
 
                 val eventObject = Event(
-                        data.profileId,
-                        id,
-                        eventDate,
-                        startTime,
-                        topic,
-                        -1,
-                        Event.TYPE_HOMEWORK,
-                        false,
-                        teacherId,
-                        subjectId,
-                        teamId)
+                        profileId = data.profileId,
+                        id = id,
+                        date = eventDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = Event.TYPE_HOMEWORK,
+                        teacherId = teacherId,
+                        subjectId = subjectId,
+                        teamId = teamId)
 
                 data.eventList.add(eventObject)
                 data.metadataList.add(

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTeams.kt

@@ -44,7 +44,7 @@ class MobidziennikApiTeams(val data: DataMobidziennik, tableTeams: List<String>?
 
                 val studentId = cols[1].toInt()
                 val teamId = cols[2].toLong()
-                val studentNumber = cols[4].toInt()
+                val studentNumber = cols[4].toIntOrNull() ?: -1
 
                 if (studentId != data.studentId)
                     continue

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebCalendar.kt

@@ -61,26 +61,25 @@ class MobidziennikWebCalendar(override val data: DataMobidziennik,
                     val title = event.getString("title")
                     val comment = event.getString("comment")
 
-                    var topic = title
+                    var topic = title ?: ""
                     if (title != comment) {
                         topic += "\n" + comment
                     }
 
                     if (id == -1L) {
-                        id = crc16(topic?.toByteArray()).toLong()
+                        id = crc16(topic.toByteArray()).toLong()
                     }
 
                     val eventObject = Event(
-                            profileId,
-                            id,
-                            eventDate, null,
-                            topic,
-                            -1,
-                            eventType,
-                            false,
-                            -1,
-                            -1,
-                            data.teamClass?.id ?: -1
+                            profileId = profileId,
+                            id = id,
+                            date = eventDate, time = null,
+                            topic = topic,
+                            color = null,
+                            type = eventType,
+                            teacherId = -1,
+                            subjectId = -1,
+                            teamId = data.teamClass?.id ?: -1
                     )
 
                     data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginWeb.kt

@@ -26,7 +26,7 @@ class MobidziennikLoginWeb(val data: DataMobidziennik, val onSuccess: () -> Unit
         }
         else {
             if (data.loginServerName.isNotNullNorEmpty() && data.loginUsername.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) {
-                data.app.cookieJar.clearForDomain(data.loginServerName + ".mobidziennik.pl")
+                data.app.cookieJar.clear("${data.loginServerName}.mobidziennik.pl")
                 loginWithCredentials()
             }
             else {
@@ -58,10 +58,10 @@ class MobidziennikLoginWeb(val data: DataMobidziennik, val onSuccess: () -> Unit
                     }
                 }
 
-                val cookies = data.app.cookieJar.getForDomain("${data.loginServerName}.mobidziennik.pl")
-                val cookie = cookies.singleOrNull { it.name().length > 32 }
-                val sessionKey = cookie?.name()
-                val sessionId = cookie?.value()
+                val cookies = data.app.cookieJar.getAll("${data.loginServerName}.mobidziennik.pl")
+                val cookie = cookies.entries.firstOrNull { it.key.length > 32 }
+                val sessionKey = cookie?.key
+                val sessionId = cookie?.value
                 if (sessionId == null) {
                     data.error(ApiError(TAG, ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID)
                             .withResponse(response)
@@ -71,7 +71,7 @@ class MobidziennikLoginWeb(val data: DataMobidziennik, val onSuccess: () -> Unit
 
                 data.webSessionKey = sessionKey
                 data.webSessionValue = sessionId
-                data.webServerId = data.app.cookieJar.getCookie("${data.loginServerName}.mobidziennik.pl", "SERVERID")
+                data.webServerId = data.app.cookieJar.get("${data.loginServerName}.mobidziennik.pl", "SERVERID")
                 data.webSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45min */
                 onSuccess()
             }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/DataTemplate.kt

@@ -4,7 +4,6 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.template
 
-import okhttp3.Cookie
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.currentTimeUnix
 import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_TEMPLATE_API
@@ -28,13 +27,7 @@ class DataTemplate(app: App, profile: Profile?, loginStore: LoginStore) : Data(a
         loginMethods.clear()
         if (isWebLoginValid()) {
             loginMethods += LOGIN_METHOD_TEMPLATE_WEB
-            app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("AuthCookie")
-                            .value(webCookie!!)
-                            .domain("eregister.example.com")
-                            .secure().httpOnly().build()
-            ))
+            app.cookieJar.set("eregister.example.com", "AuthCookie", webCookie)
         }
         if (isApiLoginValid())
             loginMethods += LOGIN_METHOD_TEMPLATE_API

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/login/TemplateLoginWeb.kt

@@ -4,12 +4,11 @@
 
 package pl.szczodrzynski.edziennik.data.api.edziennik.template.login
 
-import okhttp3.Cookie
+import pl.szczodrzynski.edziennik.currentTimeUnix
 import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_DATA_MISSING
 import pl.szczodrzynski.edziennik.data.api.ERROR_PROFILE_MISSING
 import pl.szczodrzynski.edziennik.data.api.edziennik.template.DataTemplate
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.currentTimeUnix
 
 class TemplateLoginWeb(val data: DataTemplate, val onSuccess: () -> Unit) {
     companion object {
@@ -23,17 +22,11 @@ class TemplateLoginWeb(val data: DataTemplate, val onSuccess: () -> Unit) {
         }
 
         if (data.isWebLoginValid()) {
-            data.app.cookieJar.saveFromResponse(null, listOf(
-                    Cookie.Builder()
-                            .name("AuthCookie")
-                            .value(data.webCookie!!)
-                            .domain("eregister.example.com")
-                            .secure().httpOnly().build()
-            ))
+            data.app.cookieJar.set("eregister.example.com", "AuthCookie", data.webCookie)
             onSuccess()
         }
         else {
-            data.app.cookieJar.clearForDomain("eregister.example.com")
+            data.app.cookieJar.clear("eregister.example.com")
             if (/*data.webLogin != null && data.webPassword != null && */true) {
                 loginWithCredentials()
             }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiEvents.kt

@@ -72,17 +72,16 @@ class VulcanApiEvents(override val data: DataVulcan,
                 val teamId = event.getLong("IdOddzial") ?: data.teamClass?.id ?: -1
 
                 val eventObject = Event(
-                        profileId,
-                        id,
-                        eventDate,
-                        startTime,
-                        topic,
-                        -1,
-                        type,
-                        false,
-                        teacherId,
-                        subjectId,
-                        teamId
+                        profileId = profileId,
+                        id = id,
+                        date = eventDate,
+                        time = startTime,
+                        topic = topic,
+                        color = null,
+                        type = type,
+                        teacherId = teacherId,
+                        subjectId = subjectId,
+                        teamId = teamId
                 )
 
                 data.eventList.add(eventObject)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt

@@ -284,7 +284,7 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
             db.gradeDao().addAll(gradeList)
         }
         if (eventList.isNotEmpty()) {
-            db.eventDao().addAll(eventList)
+            db.eventDao().upsertAll(eventList, removeNotKept = true)
         }
         if (noticeList.isNotEmpty()) {
             db.noticeDao().clear(profile.id)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt

@@ -56,9 +56,9 @@ open class DataRemoveModel {
         }
 
         fun commit(profileId: Int, dao: EventDao) {
-            type?.let { dao.removeFutureWithType(profileId, Date.getToday(), it) }
-            exceptType?.let { dao.removeFutureExceptType(profileId, Date.getToday(), it) }
-            exceptTypes?.let { dao.removeFutureExceptTypes(profileId, Date.getToday(), it) }
+            type?.let { dao.dontKeepFutureWithType(profileId, Date.getToday(), it) }
+            exceptType?.let { dao.dontKeepFutureExceptType(profileId, Date.getToday(), it) }
+            exceptTypes?.let { dao.dontKeepFutureExceptTypes(profileId, Date.getToday(), it) }
         }
     }
 

app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt

@@ -196,6 +196,11 @@ class SzkolnyApi(val app: App) : CoroutineScope {
             // skip blacklisted events
             if (event.id in blacklistedIds)
                 return@forEach
+
+            // force nullable non-negative colors
+            if (event.color == -1)
+                event.color = null
+
             // create the event for every matching team and profile
             teams.filter { it.code == event.teamCode }.onEach { team ->
                 val profile = profiles.firstOrNull { it.id == team.profileId } ?: return@onEach

app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt

@@ -46,6 +46,6 @@ object Signing {
 
     /*fun provideKey(param1: String, param2: Long): ByteArray {*/
     fun pleaseStopRightNow(param1: String, param2: Long): ByteArray {
-        return "$param1.MTIzNDU2Nzg5MDurcz1Rjg===.$param2".sha256()
+        return "$param1.MTIzNDU2Nzg5MDj3yyZoD8===.$param2".sha256()
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/EventShareRequest.kt

@@ -12,7 +12,8 @@ data class EventShareRequest (
 
         val action: String = "event",
 
-        val sharedByName: String,
+        /* If null, the server shows an error */
+        val sharedByName: String?,
         val shareTeamCode: String? = null,
         val unshareTeamCode: String? = null,
         val requesterName: String? = null,

app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/AppSync.kt

@@ -34,7 +34,7 @@ class AppSync(val app: App, val notifications: MutableList<Notification>, val pr
         if (events.isNotEmpty()) {
             val today = Date.getToday()
             app.db.metadataDao().addAllIgnore(events.map { event ->
-                val isPast = event.eventDate < today
+                val isPast = event.date < today
                 Metadata(
                         event.profileId,
                         Metadata.TYPE_EVENT,
@@ -44,7 +44,7 @@ class AppSync(val app: App, val notifications: MutableList<Notification>, val pr
                         event.addedDate
                 )
             })
-            return app.db.eventDao().addAll(events).size
+            return app.db.eventDao().upsertAll(events).size
         }
         return 0;
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt

@@ -34,6 +34,7 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
         announcementNotifications()
         messageNotifications()
         luckyNumberNotifications()
+        teacherAbsenceNotifications()
     }
 
     private fun timetableNotifications() {
@@ -58,7 +59,7 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
     }
 
     private fun eventNotifications() {
-        for (event in app.db.eventDao().notNotifiedNow.filter { it.eventDate >= today }) {
+        for (event in app.db.eventDao().getNotNotifiedNow().filter { it.date >= today }) {
             val text = if (event.type == Event.TYPE_HOMEWORK)
                 app.getString(
                         if (event.subjectLongName.isNullOrEmpty())
@@ -66,7 +67,7 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
                         else
                             R.string.notification_homework_format,
                         event.subjectLongName,
-                        event.eventDate.formattedString
+                        event.date.formattedString
                 )
             else
                 app.getString(
@@ -74,8 +75,8 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
                             R.string.notification_event_no_subject_format
                         else
                             R.string.notification_event_format,
-                        event.typeName,
-                        event.eventDate.formattedString,
+                        event.typeName ?: "wydarzenie",
+                        event.date.formattedString,
                         event.subjectLongName
                 )
             val type = if (event.type == Event.TYPE_HOMEWORK) Notification.TYPE_NEW_HOMEWORK else Notification.TYPE_NEW_EVENT
@@ -88,17 +89,17 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
                     profileName = profiles.singleOrNull { it.id == event.profileId }?.name,
                     viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA,
                     addedDate = event.addedDate
-            ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
+            ).addExtra("eventId", event.id).addExtra("eventDate", event.date.value.toLong())
         }
     }
 
     fun sharedEventNotifications() {
-        for (event in app.db.eventDao().notNotifiedNow.filter { it.eventDate >= today && it.sharedBy != null }) {
+        for (event in app.db.eventDao().getNotNotifiedNow().filter { it.date >= today && it.sharedBy != null }) {
             val text = app.getString(
                     R.string.notification_shared_event_format,
                     event.sharedByName,
                     event.typeName ?: "wydarzenie",
-                    event.eventDate.formattedString,
+                    event.date.formattedString,
                     event.topic
             )
             val type = if (event.type == Event.TYPE_HOMEWORK) Notification.TYPE_NEW_HOMEWORK else Notification.TYPE_NEW_EVENT
@@ -111,7 +112,7 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
                     profileName = profiles.singleOrNull { it.id == event.profileId }?.name,
                     viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA,
                     addedDate = event.addedDate
-            ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
+            ).addExtra("eventId", event.id).addExtra("eventDate", event.date.value.toLong())
         }
     }
 
@@ -274,4 +275,23 @@ class Notifications(val app: App, val notifications: MutableList<Notification>,
             )
         }
     }
+
+    private fun teacherAbsenceNotifications() {
+        for (teacherAbsence in app.db.teacherAbsenceDao().getNotNotifiedNow()) {
+            val message = app.getString(
+                    R.string.notification_teacher_absence_new_format,
+                    teacherAbsence.teacherFullName
+            )
+            notifications += Notification(
+                    id = Notification.buildId(teacherAbsence.profileId, Notification.TYPE_TEACHER_ABSENCE, teacherAbsence.id),
+                    title = app.getNotificationTitle(Notification.TYPE_TEACHER_ABSENCE),
+                    text = message,
+                    type = Notification.TYPE_TEACHER_ABSENCE,
+                    profileId = teacherAbsence.profileId,
+                    profileName = profiles.singleOrNull { it.id == teacherAbsence.profileId }?.name,
+                    viewId = MainActivity.DRAWER_ITEM_AGENDA,
+                    addedDate = teacherAbsence.addedDate
+            ).addExtra("eventDate", teacherAbsence.dateFrom.value.toLong())
+        }
+    }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt

@@ -43,7 +43,7 @@ import pl.szczodrzynski.edziennik.data.db.migration.*
     LibrusLesson::class,
     TimetableManual::class,
     Metadata::class
-], version = 79)
+], version = 83)
 @TypeConverters(
         ConverterTime::class,
         ConverterDate::class,
@@ -164,7 +164,11 @@ abstract class AppDb : RoomDatabase() {
                 Migration76(),
                 Migration77(),
                 Migration78(),
-                Migration79()
+                Migration79(),
+                Migration80(),
+                Migration81(),
+                Migration82(),
+                Migration83()
         ).allowMainThreadQueries().build()
     }
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/BaseDao.kt

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-28.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.dao
+
+import androidx.lifecycle.LiveData
+import androidx.room.*
+import androidx.sqlite.db.SimpleSQLiteQuery
+import androidx.sqlite.db.SupportSQLiteQuery
+import pl.szczodrzynski.edziennik.data.db.entity.Keepable
+
+@Dao
+interface BaseDao<T : Keepable, F : T> {
+    @RawQuery
+    fun getRaw(query: SupportSQLiteQuery): LiveData<List<F>>
+    fun getRaw(query: String) = getRaw(SimpleSQLiteQuery(query))
+    @RawQuery
+    fun getRawNow(query: SupportSQLiteQuery): List<F>
+    fun getRawNow(query: String) = getRawNow(SimpleSQLiteQuery(query))
+    @RawQuery
+    fun getOneNow(query: SupportSQLiteQuery): F?
+    fun getOneNow(query: String) = getOneNow(SimpleSQLiteQuery(query))
+
+    @Query("DELETE FROM events WHERE keep = 0")
+    fun removeNotKept()
+
+    /**
+     * INSERT an [item] into the database,
+     * ignoring any conflicts.
+     */
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    fun add(item: T): Long
+    /**
+     * INSERT [items] into the database,
+     * ignoring any conflicts.
+     */
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    fun addAll(items: List<T>): LongArray
+
+    /**
+     * REPLACE an [item] in the database,
+     * removing any conflicting rows.
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun replace(item: T)
+    /**
+     * REPLACE [items] in the database,
+     * removing any conflicting rows.
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun replaceAll(items: List<T>)
+
+    /**
+     * Selective UPDATE an [item] in the database.
+     * Do nothing if a matching item does not exist.
+     */
+    fun update(item: T): Long
+    /**
+     * Selective UPDATE [items] in the database.
+     * Do nothing for those items which do not exist.
+     */
+    fun updateAll(items: List<T>): LongArray
+
+    /**
+     * Remove all items from the database,
+     * that match the given [profileId].
+     */
+    fun clear(profileId: Int)
+
+    /**
+     * INSERT an [item] into the database,
+     * doing a selective [update] on conflicts.
+     * @return the newly inserted item's ID or -1L if the item was updated instead
+     */
+    @Transaction
+    fun upsert(item: T): Long {
+        val id = add(item)
+        if (id == -1L) update(item)
+        return id
+    }
+    /**
+     * INSERT [items] into the database,
+     * doing a selective [update] on conflicts.
+     * @return a [LongArray] of IDs of newly inserted items or -1L if the item existed before
+     */
+    @Transaction
+    fun upsertAll(items: List<T>, removeNotKept: Boolean = false): LongArray {
+        val insertResult = addAll(items)
+        val updateList = mutableListOf<T>()
+
+        insertResult.forEachIndexed { index, result ->
+            if (result == -1L) updateList.add(items[index])
+        }
+
+        if (updateList.isNotEmpty()) updateAll(items)
+        if (removeNotKept) removeNotKept()
+        return insertResult
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.java

@@ -1,186 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2020-1-6
- */
-
-package pl.szczodrzynski.edziennik.data.db.dao;
-
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import androidx.room.RawQuery;
-import androidx.room.Transaction;
-import androidx.sqlite.db.SimpleSQLiteQuery;
-import androidx.sqlite.db.SupportSQLiteQuery;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.entity.Event;
-import pl.szczodrzynski.edziennik.data.db.full.EventFull;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-
-import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_EVENT;
-import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_HOMEWORK;
-import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_LESSON_CHANGE;
-
-@Dao
-public abstract class EventDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    public abstract long add(Event event);
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    public abstract long[] addAll(List<Event> eventList);
-
-    @Query("DELETE FROM events WHERE profileId = :profileId")
-    public abstract void clear(int profileId);
-
-    @Query("DELETE FROM events WHERE profileId = :profileId AND eventId = :id")
-    public abstract void remove(int profileId, long id);
-    @Query("DELETE FROM metadata WHERE profileId = :profileId AND thingType = :thingType AND thingId = :thingId")
-    public abstract void removeMetadata(int profileId, int thingType, long thingId);
-    @Transaction
-    public void remove(int profileId, long type, long id) {
-        remove(profileId, id);
-        removeMetadata(profileId, type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, id);
-    }
-    @Transaction
-    public void remove(Event event) {
-        remove(event.profileId, event.type, event.id);
-    }
-    @Transaction
-    public void remove(int profileId, Event event) {
-        remove(profileId, event.type, event.id);
-    }
-    @Query("DELETE FROM events WHERE teamId = :teamId AND eventId = :id")
-    public abstract void removeByTeamId(long teamId, long id);
-
-    @RawQuery(observedEntities = {Event.class})
-    abstract LiveData<List<EventFull>> getAll(SupportSQLiteQuery query);
-    public LiveData<List<EventFull>> getAll(int profileId, String filter, String limit) {
-        String query = "SELECT \n" +
-                "*, \n" +
-                "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName,\n" +
-                "eventTypes.eventTypeName AS typeName,\n" +
-                "eventTypes.eventTypeColor AS typeColor\n" +
-                "FROM events\n" +
-                "LEFT JOIN subjects USING(profileId, subjectId)\n" +
-                "LEFT JOIN teachers USING(profileId, teacherId)\n" +
-                "LEFT JOIN teams USING(profileId, teamId)\n" +
-                "LEFT JOIN eventTypes USING(profileId, eventType)\n" +
-                "LEFT JOIN metadata ON eventId = thingId AND (thingType = " + TYPE_EVENT + " OR thingType = " + TYPE_HOMEWORK + ") AND metadata.profileId = "+profileId+"\n" +
-                "WHERE events.profileId = "+profileId+" AND events.eventBlacklisted = 0 AND "+filter+"\n" +
-                "GROUP BY eventId\n" +
-                "ORDER BY eventDate, eventStartTime ASC "+limit;
-        Log.d("DB", query);
-        return getAll(new SimpleSQLiteQuery(query));
-    }
-    public LiveData<List<EventFull>> getAll(int profileId) {
-        return getAll(profileId, "1", "");
-    }
-    public List<EventFull> getAllNow(int profileId) {
-        return getAllNow(profileId, "1");
-    }
-    public LiveData<List<EventFull>> getAllWhere(int profileId, String filter) {
-        return getAll(profileId, filter, "");
-    }
-    public LiveData<List<EventFull>> getAllByType(int profileId, long type, String filter) {
-        return getAll(profileId, "eventType = "+type+" AND "+filter, "");
-    }
-    public LiveData<List<EventFull>> getAllByDate(int profileId, @NonNull Date date) {
-        return getAll(profileId, "eventDate = '"+date.getStringY_m_d()+"'", "");
-    }
-    public List<EventFull> getAllByDateNow(int profileId, @NonNull Date date) {
-        return getAllNow(profileId, "eventDate = '"+date.getStringY_m_d()+"'");
-    }
-    public LiveData<List<EventFull>> getAllByDateTime(int profileId, @NonNull Date date, Time time) {
-        if (time == null)
-            return getAllByDate(profileId, date);
-        return getAll(profileId, "eventDate = '"+date.getStringY_m_d()+"' AND eventStartTime = '"+time.getStringValue()+"'", "");
-    }
-    public LiveData<List<EventFull>> getAllNearest(int profileId, @NonNull Date today, int limit) {
-        return getAll(profileId, "eventDate >= '"+today.getStringY_m_d()+"'", "LIMIT "+limit);
-    }
-
-    @RawQuery
-    abstract List<EventFull> getAllNow(SupportSQLiteQuery query);
-    public List<EventFull> getAllNow(int profileId, String filter) {
-        return getAllNow(new SimpleSQLiteQuery("SELECT \n" +
-                "*, \n" +
-                "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName,\n" +
-                "eventTypes.eventTypeName AS typeName,\n" +
-                "eventTypes.eventTypeColor AS typeColor\n" +
-                "FROM events \n" +
-                "LEFT JOIN subjects USING(profileId, subjectId)\n" +
-                "LEFT JOIN teachers USING(profileId, teacherId)\n" +
-                "LEFT JOIN teams USING(profileId, teamId)\n" +
-                "LEFT JOIN eventTypes USING(profileId, eventType)\n" +
-                "LEFT JOIN metadata ON eventId = thingId AND (thingType = " + TYPE_EVENT + " OR thingType = " + TYPE_HOMEWORK + ") AND metadata.profileId = "+profileId+"\n" +
-                "WHERE events.profileId = "+profileId+" AND events.eventBlacklisted = 0 AND "+filter+"\n" +
-                "GROUP BY eventId\n" +
-                "ORDER BY eventStartTime, addedDate ASC"));
-    }
-    public List<EventFull> getNotNotifiedNow(int profileId) {
-        return getAllNow(profileId, "notified = 0");
-    }
-
-    @Query("SELECT eventId FROM events WHERE profileId = :profileId AND eventBlacklisted = 1")
-    public abstract List<Long> getBlacklistedIds(int profileId);
-    @Query("SELECT eventId FROM events WHERE eventBlacklisted = 1")
-    public abstract List<Long> getBlacklistedIds();
-
-    @Query("SELECT " +
-            "*, " +
-            "eventTypes.eventTypeName AS typeName, " +
-            "eventTypes.eventTypeColor AS typeColor " +
-            "FROM events " +
-            "LEFT JOIN subjects USING(profileId, subjectId) " +
-            "LEFT JOIN eventTypes USING(profileId, eventType) " +
-            "LEFT JOIN metadata ON eventId = thingId AND (thingType = " + TYPE_EVENT + " OR thingType = " + TYPE_HOMEWORK + ") AND metadata.profileId = events.profileId " +
-            "WHERE events.eventBlacklisted = 0 AND notified = 0 " +
-            "GROUP BY eventId " +
-            "ORDER BY addedDate ASC")
-    public abstract List<EventFull> getNotNotifiedNow();
-
-    public EventFull getByIdNow(int profileId, long eventId) {
-        List<EventFull> eventList = getAllNow(profileId, "eventId = "+eventId);
-        return eventList.size() == 0 ? null : eventList.get(0);
-    }
-
-    @Query("UPDATE events SET eventAddedManually = 1 WHERE profileId = :profileId AND eventDate < :date")
-    public abstract void convertOlderToManual(int profileId, Date date);
-
-    @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0")
-    public abstract void removeNotManual(int profileId);
-
-    @RawQuery
-    abstract long removeFuture(SupportSQLiteQuery query);
-    @Transaction
-    public void removeFuture(int profileId, Date todayDate, String filter) {
-        removeFuture(new SimpleSQLiteQuery("DELETE FROM events WHERE profileId = " + profileId
-                + " AND eventAddedManually = 0 AND eventDate >= '" + todayDate.getStringY_m_d() + "'" +
-                " AND " + filter));
-    }
-
-    @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType = :type")
-    public abstract void removeFutureWithType(int profileId, Date todayDate, long type);
-
-    @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType != :exceptType")
-    public abstract void removeFutureExceptType(int profileId, Date todayDate, long exceptType);
-
-    @Transaction
-    public void removeFutureExceptTypes(int profileId, Date todayDate, List<Long> exceptTypes) {
-        removeFuture(profileId, todayDate, "eventType NOT IN " + exceptTypes.toString().replace('[', '(').replace(']', ')'));
-    }
-
-    @Query("UPDATE metadata SET seen = :seen WHERE profileId = :profileId AND (thingType = "+TYPE_EVENT+" OR thingType = "+TYPE_LESSON_CHANGE+" OR thingType = "+TYPE_HOMEWORK+") AND thingId IN (SELECT eventId FROM events WHERE profileId = :profileId AND eventDate = :date)")
-    public abstract void setSeenByDate(int profileId, Date date, boolean seen);
-
-    @Query("UPDATE events SET eventBlacklisted = :blacklisted WHERE profileId = :profileId AND eventId = :eventId")
-    public abstract void setBlacklisted(int profileId, long eventId, boolean blacklisted);
-}
-

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-6
+ */
+package pl.szczodrzynski.edziennik.data.db.dao
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.RawQuery
+import androidx.room.Transaction
+import androidx.sqlite.db.SimpleSQLiteQuery
+import androidx.sqlite.db.SupportSQLiteQuery
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.annotation.SelectiveDao
+import pl.szczodrzynski.edziennik.annotation.UpdateSelective
+import pl.szczodrzynski.edziennik.data.db.AppDb
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+@Dao
+@SelectiveDao(db = AppDb::class)
+abstract class EventDao : BaseDao<Event, EventFull> {
+    companion object {
+        private const val QUERY = """
+            SELECT 
+            *, 
+            teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName,
+            eventTypes.eventTypeName AS typeName,
+            eventTypes.eventTypeColor AS typeColor
+            FROM events
+            LEFT JOIN subjects USING(profileId, subjectId)
+            LEFT JOIN teachers USING(profileId, teacherId)
+            LEFT JOIN teams USING(profileId, teamId)
+            LEFT JOIN eventTypes USING(profileId, eventType)
+            LEFT JOIN metadata ON eventId = thingId AND (thingType = ${Metadata.TYPE_EVENT} OR thingType = ${Metadata.TYPE_HOMEWORK}) AND metadata.profileId = events.profileId
+        """
+
+        private const val ORDER_BY = """GROUP BY eventId ORDER BY eventDate, eventTime, addedDate ASC"""
+        private const val NOT_BLACKLISTED = """events.eventBlacklisted = 0"""
+        private const val NOT_DONE = """events.eventIsDone = 0"""
+    }
+
+    private val selective by lazy { EventDaoSelective(App.db) }
+
+    @RawQuery(observedEntities = [Event::class])
+    abstract override fun getRaw(query: SupportSQLiteQuery): LiveData<List<EventFull>>
+
+    // SELECTIVE UPDATE
+    @UpdateSelective(primaryKeys = ["profileId", "eventId"], skippedColumns = ["eventIsDone", "eventBlacklisted", "homeworkBody", "attachmentIds", "attachmentNames"])
+    override fun update(item: Event) = selective.update(item)
+    override fun updateAll(items: List<Event>) = selective.updateAll(items)
+
+    // CLEAR
+    @Query("DELETE FROM events WHERE profileId = :profileId")
+    abstract override fun clear(profileId: Int)
+
+    // GET ALL - LIVE DATA
+    fun getAll(profileId: Int) =
+            getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId $ORDER_BY")
+    fun getAllByType(profileId: Int, type: Long, filter: String = "1") =
+            getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventType = $type AND $filter $ORDER_BY")
+    fun getAllByDate(profileId: Int, date: Date) =
+            getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' $ORDER_BY")
+    fun getAllByDateTime(profileId: Int, date: Date, time: Time) =
+            getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' AND eventTime = '${time.stringValue}'")
+    fun getNearestNotDone(profileId: Int, today: Date, limit: Int) =
+            getRaw("$QUERY WHERE $NOT_BLACKLISTED AND $NOT_DONE AND events.profileId = $profileId AND eventDate >= '${today.stringY_m_d}' $ORDER_BY LIMIT $limit")
+
+    // GET ALL - NOW
+    fun getAllNow(profileId: Int) =
+            getRawNow("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId $ORDER_BY")
+    fun getNotNotifiedNow() =
+            getRawNow("$QUERY WHERE $NOT_BLACKLISTED AND notified = 0 $ORDER_BY")
+    fun getNotNotifiedNow(profileId: Int) =
+            getRawNow("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND notified = 0 $ORDER_BY")
+    fun getAllByDateNow(profileId: Int, date: Date) =
+            getRawNow("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' $ORDER_BY")
+
+    // GET ONE - NOW
+    fun getByIdNow(profileId: Int, id: Long) =
+            getOneNow("$QUERY WHERE events.profileId = $profileId AND eventId = $id")
+
+
+    @Query("SELECT eventId FROM events WHERE profileId = :profileId AND eventBlacklisted = 1")
+    abstract fun getBlacklistedIds(profileId: Int): List<Long>
+
+    @get:Query("SELECT eventId FROM events WHERE eventBlacklisted = 1")
+    abstract val blacklistedIds: List<Long>
+
+    /*@Query("UPDATE events SET eventAddedManually = 1 WHERE profileId = :profileId AND eventDate < :date")
+    abstract fun convertOlderToManual(profileId: Int, date: Date?)
+
+    @Query("DELETE FROM events WHERE teamId = :teamId AND eventId = :id")
+    abstract fun removeByTeamId(teamId: Long, id: Long)
+
+    @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0")
+    abstract fun removeNotManual(profileId: Int)*/
+
+    @RawQuery
+    abstract fun dontKeepFuture(query: SupportSQLiteQuery?): Long
+
+    @Transaction
+    open fun dontKeepFuture(profileId: Int, todayDate: Date, filter: String) {
+        dontKeepFuture(SimpleSQLiteQuery("UPDATE events SET keep = 0 WHERE profileId = " + profileId
+                + " AND eventAddedManually = 0 AND eventDate >= '" + todayDate.stringY_m_d + "'" +
+                " AND " + filter))
+    }
+
+    @Query("UPDATE events SET keep = 0 WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType = :type")
+    abstract fun dontKeepFutureWithType(profileId: Int, todayDate: Date, type: Long)
+
+    @Query("UPDATE events SET keep = 0 WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType != :exceptType")
+    abstract fun dontKeepFutureExceptType(profileId: Int, todayDate: Date, exceptType: Long)
+
+    @Transaction
+    open fun dontKeepFutureExceptTypes(profileId: Int, todayDate: Date, exceptTypes: List<Long>) {
+        dontKeepFuture(profileId, todayDate, "eventType NOT IN " + exceptTypes.toString().replace('[', '(').replace(']', ')'))
+    }
+
+    @Query("UPDATE metadata SET seen = :seen WHERE profileId = :profileId AND (thingType = " + Metadata.TYPE_EVENT + " OR thingType = " + Metadata.TYPE_LESSON_CHANGE + " OR thingType = " + Metadata.TYPE_HOMEWORK + ") AND thingId IN (SELECT eventId FROM events WHERE profileId = :profileId AND eventDate = :date)")
+    abstract fun setSeenByDate(profileId: Int, date: Date, seen: Boolean)
+
+    @Query("UPDATE events SET eventBlacklisted = :blacklisted WHERE profileId = :profileId AND eventId = :eventId")
+    abstract fun setBlacklisted(profileId: Int, eventId: Long, blacklisted: Boolean)
+
+    @Query("DELETE FROM events WHERE profileId = :profileId AND eventId = :id")
+    abstract fun remove(profileId: Int, id: Long)
+
+    @Query("DELETE FROM metadata WHERE profileId = :profileId AND thingType = :thingType AND thingId = :thingId")
+    abstract fun removeMetadata(profileId: Int, thingType: Int, thingId: Long)
+
+    @Transaction
+    open fun remove(profileId: Int, type: Long, id: Long) {
+        remove(profileId, id)
+        removeMetadata(profileId, if (type == Event.TYPE_HOMEWORK) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT, id)
+    }
+
+    @Transaction
+    open fun remove(event: Event) {
+        remove(event.profileId, event.type, event.id)
+    }
+
+    @Transaction
+    open fun remove(profileId: Int, event: Event) {
+        remove(profileId, event.type, event.id)
+    }
+
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2020-1-6
- */
-
-package pl.szczodrzynski.edziennik.data.db.dao;
-
-import androidx.lifecycle.LiveData;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.entity.EventType;
-
-@Dao
-public interface EventTypeDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    void add(EventType gradeCategory);
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    void addAll(List<EventType> gradeCategoryList);
-
-    @Query("DELETE FROM eventTypes WHERE profileId = :profileId")
-    void clear(int profileId);
-
-    @Query("SELECT * FROM eventTypes WHERE profileId = :profileId AND eventType = :typeId")
-    EventType getByIdNow(int profileId, long typeId);
-
-    @Query("SELECT * FROM eventTypes WHERE profileId = :profileId")
-    LiveData<List<EventType>> getAll(int profileId);
-
-    @Query("SELECT * FROM eventTypes WHERE profileId = :profileId")
-    List<EventType> getAllNow(int profileId);
-
-    @Query("SELECT * FROM eventTypes")
-    List<EventType> getAllNow();
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.kt

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-6
+ */
+package pl.szczodrzynski.edziennik.data.db.dao
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_CLASS_EVENT
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_DEFAULT
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_ESSAY
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_EXAM
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_EXCURSION
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_HOMEWORK
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_INFORMATION
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_PROJECT
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_PT_MEETING
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_READING
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_SHORT_QUIZ
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_CLASS_EVENT
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_DEFAULT
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_ESSAY
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_EXAM
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_EXCURSION
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_HOMEWORK
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_INFORMATION
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_PROJECT
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_PT_MEETING
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_READING
+import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_SHORT_QUIZ
+import pl.szczodrzynski.edziennik.data.db.entity.EventType
+
+@Dao
+abstract class EventTypeDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun add(eventType: EventType)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun addAll(eventTypeList: List<EventType>)
+
+    @Query("DELETE FROM eventTypes WHERE profileId = :profileId")
+    abstract fun clear(profileId: Int)
+
+    @Query("SELECT * FROM eventTypes WHERE profileId = :profileId AND eventType = :typeId")
+    abstract fun getByIdNow(profileId: Int, typeId: Long): EventType?
+
+    @Query("SELECT * FROM eventTypes WHERE profileId = :profileId")
+    abstract fun getAll(profileId: Int): LiveData<List<EventType>>
+
+    @Query("SELECT * FROM eventTypes WHERE profileId = :profileId")
+    abstract fun getAllNow(profileId: Int): List<EventType>
+
+    @get:Query("SELECT * FROM eventTypes")
+    abstract val allNow: List<EventType>
+
+    fun addDefaultTypes(context: Context, profileId: Int): List<EventType> {
+        val typeList = listOf(
+                EventType(profileId, TYPE_HOMEWORK, context.getString(R.string.event_type_homework), COLOR_HOMEWORK),
+                EventType(profileId, TYPE_DEFAULT, context.getString(R.string.event_other), COLOR_DEFAULT),
+                EventType(profileId, TYPE_EXAM, context.getString(R.string.event_exam), COLOR_EXAM),
+                EventType(profileId, TYPE_SHORT_QUIZ, context.getString(R.string.event_short_quiz), COLOR_SHORT_QUIZ),
+                EventType(profileId, TYPE_ESSAY, context.getString(R.string.event_essay), COLOR_ESSAY),
+                EventType(profileId, TYPE_PROJECT, context.getString(R.string.event_project), COLOR_PROJECT),
+                EventType(profileId, TYPE_PT_MEETING, context.getString(R.string.event_pt_meeting), COLOR_PT_MEETING),
+                EventType(profileId, TYPE_EXCURSION, context.getString(R.string.event_excursion), COLOR_EXCURSION),
+                EventType(profileId, TYPE_READING, context.getString(R.string.event_reading), COLOR_READING),
+                EventType(profileId, TYPE_CLASS_EVENT, context.getString(R.string.event_class_event), COLOR_CLASS_EVENT),
+                EventType(profileId, TYPE_INFORMATION, context.getString(R.string.event_information), COLOR_INFORMATION)
+        )
+        addAll(typeList)
+        return typeList
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java

@@ -78,8 +78,8 @@ public abstract class MetadataDao {
             }
         }
         if (o instanceof Event) {
-            if (add(new Metadata(profileId, ((Event) o).type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).id, seen, false, 0)) == -1) {
-                updateSeen(profileId, ((Event) o).type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).id, seen);
+            if (add(new Metadata(profileId, ((Event) o).getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).getId(), seen, false, 0)) == -1) {
+                updateSeen(profileId, ((Event) o).getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).getId(), seen);
             }
         }
         if (o instanceof LessonFull) {
@@ -117,8 +117,8 @@ public abstract class MetadataDao {
             }
         }
         if (o instanceof Event) {
-            if (add(new Metadata(profileId, ((Event) o).type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).id, false, notified, 0)) == -1) {
-                updateNotified(profileId, ((Event) o).type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).id, notified);
+            if (add(new Metadata(profileId, ((Event) o).getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).getId(), false, notified, 0)) == -1) {
+                updateNotified(profileId, ((Event) o).getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).getId(), notified);
             }
         }
         if (o instanceof LessonFull) {
@@ -141,9 +141,9 @@ public abstract class MetadataDao {
     @Transaction
     public void setBoth(int profileId, Event o, boolean seen, boolean notified, long addedDate) {
         if (o != null) {
-            if (add(new Metadata(profileId, o.type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.id, seen, notified, addedDate)) == -1) {
-                updateSeen(profileId, o.type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.id, seen);
-                updateNotified(profileId, o.type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.id, notified);
+            if (add(new Metadata(profileId, o.getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.getId(), seen, notified, addedDate)) == -1) {
+                updateSeen(profileId, o.getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.getId(), seen);
+                updateNotified(profileId, o.getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.getId(), notified);
             }
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceDao.kt

@@ -49,6 +49,17 @@ interface TeacherAbsenceDao {
             "AND :date BETWEEN teacherAbsenceDateFrom AND teacherAbsenceDateTo")
     fun getAllByDateNow(profileId: Int, date: Date): List<TeacherAbsenceFull>
 
+    @Query("""
+        SELECT *,
+        teachers.teacherName || ' ' || teachers.teacherSurname as teacherFullName
+        FROM teacherAbsence
+        LEFT JOIN teachers USING (profileId, teacherId)
+        LEFT JOIN metadata ON teacherAbsenceId = thingId AND metadata.thingType = ${Metadata.TYPE_TEACHER_ABSENCE}
+        AND teachers.profileId = metadata.profileId WHERE metadata.notified = 0
+        ORDER BY addedDate DESC
+    """)
+    fun getNotNotifiedNow(): List<TeacherAbsenceFull>
+
     @Query("DELETE FROM teacherAbsence WHERE profileId = :profileId")
     fun clear(profileId: Int)
 }

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.java

@@ -1,161 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2020-1-6
- */
-
-package pl.szczodrzynski.edziennik.data.db.entity;
-
-import androidx.annotation.Nullable;
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.Ignore;
-import androidx.room.Index;
-
-import java.util.Calendar;
-
-import pl.szczodrzynski.edziennik.data.db.full.EventFull;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-
-@Entity(tableName = "events",
-        primaryKeys = {"profileId", "eventId"},
-        indices = {@Index(value = {"profileId", "eventDate", "eventStartTime"}), @Index(value = {"profileId", "eventType"})})
-public class Event {
-    public int profileId;
-
-    @ColumnInfo(name = "eventId")
-    public long id;
-
-    @ColumnInfo(name = "eventDate")
-    public Date eventDate;
-    @ColumnInfo(name = "eventStartTime")
-    @Nullable
-    public Time startTime; // null for allDay
-    @ColumnInfo(name = "eventTopic")
-    public String topic;
-    @ColumnInfo(name = "eventColor")
-    public int color = -1;
-    public static final long TYPE_UNDEFINED = -2;
-    public static final long TYPE_HOMEWORK = -1;
-    public static final long TYPE_DEFAULT = 0;
-    public static final long TYPE_EXAM = 1;
-    public static final long TYPE_SHORT_QUIZ = 2;
-    public static final long TYPE_ESSAY = 3;
-    public static final long TYPE_PROJECT = 4;
-    public static final long TYPE_PT_MEETING = 5;
-    public static final long TYPE_EXCURSION = 6;
-    public static final long TYPE_READING = 7;
-    public static final long TYPE_CLASS_EVENT = 8;
-    public static final long TYPE_INFORMATION = 9;
-    public static final long TYPE_TEACHER_ABSENCE = 10;
-    public static final int COLOR_HOMEWORK = 0xff795548;
-    public static final int COLOR_DEFAULT = 0xffffc107;
-    public static final int COLOR_EXAM = 0xfff44336;
-    public static final int COLOR_SHORT_QUIZ = 0xff76ff03;
-    public static final int COLOR_ESSAY = 0xFF4050B5;
-    public static final int COLOR_PROJECT = 0xFF673AB7;
-    public static final int COLOR_PT_MEETING = 0xff90caf9;
-    public static final int COLOR_EXCURSION = 0xFF4CAF50;
-    public static final int COLOR_READING = 0xFFFFEB3B;
-    public static final int COLOR_CLASS_EVENT = 0xff388e3c;
-    public static final int COLOR_INFORMATION = 0xff039be5;
-    public static final int COLOR_TEACHER_ABSENCE = 0xff039be5;
-    @ColumnInfo(name = "eventType")
-    public long type = TYPE_DEFAULT;
-    @ColumnInfo(name = "eventAddedManually")
-    public boolean addedManually;
-    @ColumnInfo(name = "eventSharedBy")
-    public String sharedBy = null;
-    @ColumnInfo(name = "eventSharedByName")
-    public String sharedByName = null;
-    @ColumnInfo(name = "eventBlacklisted")
-    public boolean blacklisted = false;
-
-
-    public long teacherId;
-    public long subjectId;
-    public long teamId;
-
-    @Ignore
-    public Event() {}
-
-    public Event(int profileId, long id, Date eventDate, @Nullable Time startTime, String topic, int color, long type, boolean addedManually, long teacherId, long subjectId, long teamId)
-    {
-        this.profileId = profileId;
-        this.id = id;
-        this.eventDate = eventDate;
-        this.startTime = startTime;
-        this.topic = topic;
-        this.color = color;
-        this.type = type;
-        this.addedManually = addedManually;
-        this.teacherId = teacherId;
-        this.subjectId = subjectId;
-        this.teamId = teamId;
-    }
-
-    @Ignore
-    public EventFull withMetadata(Metadata metadata) {
-        return new EventFull(this, metadata);
-    }
-
-    @Ignore
-    public Calendar getStartTimeCalendar() {
-        Calendar c = Calendar.getInstance();
-        c.set(
-                eventDate.year,
-                eventDate.month - 1,
-                eventDate.day,
-                (startTime == null) ? 0 : startTime.hour,
-                (startTime == null) ? 0 : startTime.minute,
-                (startTime == null) ? 0 : startTime.second
-        );
-        return c;
-    }
-
-    @Ignore
-    public Calendar getEndTimeCalendar() {
-        Calendar c = Calendar.getInstance();
-        c.setTimeInMillis(getStartTimeCalendar().getTimeInMillis() + (45 * 60 * 1000));
-        return c;
-    }
-
-    @Override
-    public Event clone() {
-        Event event = new Event(
-                profileId,
-                id,
-                eventDate.clone(),
-                startTime == null ? null : startTime.clone(),
-                topic,
-                color,
-                type,
-                addedManually,
-                subjectId,
-                teacherId,
-                teamId
-        );
-        event.sharedBy = sharedBy;
-        event.sharedByName = sharedByName;
-        event.blacklisted = blacklisted;
-        return event;
-    }
-
-    @Override
-    public String toString() {
-        return "Event{" +
-                "profileId=" + profileId +
-                ", id=" + id +
-                ", eventDate=" + eventDate +
-                ", startTime=" + startTime +
-                ", topic='" + topic + '\'' +
-                ", color=" + color +
-                ", type=" + type +
-                ", addedManually=" + addedManually +
-                ", sharedBy='" + sharedBy + '\'' +
-                ", sharedByName='" + sharedByName + '\'' +
-                ", teacherId=" + teacherId +
-                ", subjectId=" + subjectId +
-                ", teamId=" + teamId +
-                '}';
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-6
+ */
+package pl.szczodrzynski.edziennik.data.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.Index
+import com.google.gson.annotations.SerializedName
+import pl.szczodrzynski.edziennik.MINUTE
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import java.util.*
+
+@Entity(tableName = "events",
+        primaryKeys = ["profileId", "eventId"],
+        indices = [
+            Index(value = ["profileId", "eventDate", "eventTime"]),
+            Index(value = ["profileId", "eventType"])
+        ])
+open class Event(
+        /* This needs to be mutable: see SzkolnyApi.getEvents() */
+        var profileId: Int,
+        @ColumnInfo(name = "eventId")
+        var id: Long,
+        @ColumnInfo(name = "eventDate")
+        @SerializedName("eventDate")
+        var date: Date,
+        @ColumnInfo(name = "eventTime")
+        @SerializedName("startTime")
+        var time: Time?,
+
+        @ColumnInfo(name = "eventTopic")
+        var topic: String,
+        @ColumnInfo(name = "eventColor")
+        var color: Int?,
+        @ColumnInfo(name = "eventType")
+        var type: Long,
+
+        var teacherId: Long,
+        var subjectId: Long,
+        var teamId: Long
+) : Keepable() {
+    companion object {
+        const val TYPE_UNDEFINED = -2L
+        const val TYPE_HOMEWORK = -1L
+        const val TYPE_DEFAULT = 0L
+        const val TYPE_EXAM = 1L
+        const val TYPE_SHORT_QUIZ = 2L
+        const val TYPE_ESSAY = 3L
+        const val TYPE_PROJECT = 4L
+        const val TYPE_PT_MEETING = 5L
+        const val TYPE_EXCURSION = 6L
+        const val TYPE_READING = 7L
+        const val TYPE_CLASS_EVENT = 8L
+        const val TYPE_INFORMATION = 9L
+        const val TYPE_TEACHER_ABSENCE = 10L
+        const val COLOR_HOMEWORK = 0xff795548.toInt()
+        const val COLOR_DEFAULT = 0xffffc107.toInt()
+        const val COLOR_EXAM = 0xfff44336.toInt()
+        const val COLOR_SHORT_QUIZ = 0xff76ff03.toInt()
+        const val COLOR_ESSAY = 0xFF4050B5.toInt()
+        const val COLOR_PROJECT = 0xFF673AB7.toInt()
+        const val COLOR_PT_MEETING = 0xff90caf9.toInt()
+        const val COLOR_EXCURSION = 0xFF4CAF50.toInt()
+        const val COLOR_READING = 0xFFFFEB3B.toInt()
+        const val COLOR_CLASS_EVENT = 0xff388e3c.toInt()
+        const val COLOR_INFORMATION = 0xff039be5.toInt()
+        const val COLOR_TEACHER_ABSENCE = 0xff039be5.toInt()
+    }
+
+    @ColumnInfo(name = "eventAddedManually")
+    var addedManually: Boolean = false
+    @ColumnInfo(name = "eventSharedBy")
+    var sharedBy: String? = null
+    @ColumnInfo(name = "eventSharedByName")
+    var sharedByName: String? = null
+    @ColumnInfo(name = "eventBlacklisted")
+    var blacklisted: Boolean = false
+    @ColumnInfo(name = "eventIsDone")
+    var isDone: Boolean = false
+
+    var homeworkBody: String? = null
+    var attachmentIds: List<Long>? = null
+    var attachmentNames: List<String>? = null
+
+    @Ignore
+    var showAsUnseen = false
+
+    val startTimeCalendar: Calendar
+        get() = Calendar.getInstance().also { it.set(
+                date.year,
+                date.month - 1,
+                date.day,
+                time?.hour ?: 0,
+                time?.minute ?: 0,
+                time?.second ?: 0
+        ) }
+
+    val endTimeCalendar: Calendar
+        get() = startTimeCalendar.also {
+            it.timeInMillis += 45 * MINUTE * 1000
+        }
+
+    @Ignore
+    fun withMetadata(metadata: Metadata) = EventFull(this, metadata)
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Keepable.kt

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-30.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.entity
+
+abstract class Keepable {
+    var keep: Boolean = true
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt

@@ -52,6 +52,7 @@ data class Notification(
         const val TYPE_NEW_ANNOUNCEMENT = 15
         const val TYPE_FEEDBACK_MESSAGE = 16
         const val TYPE_AUTO_ARCHIVING = 17
+        const val TYPE_TEACHER_ABSENCE = 19
 
         fun buildId(profileId: Int, type: Int, itemId: Long): Long {
             return 1000000000000 + profileId*10000000000 + type*100000000 + itemId;

app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.java

@@ -1,117 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2020-1-6
- */
-
-package pl.szczodrzynski.edziennik.data.db.full;
-
-import pl.szczodrzynski.edziennik.data.db.entity.Event;
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata;
-
-public class EventFull extends Event {
-    public String typeName = "";
-    public int typeColor = -1;
-
-    public String teacherFullName = "";
-
-    public String subjectLongName = "";
-    public String subjectShortName = "";
-
-    public String teamName = "";
-    public String teamCode = null;
-
-    // metadata
-    public boolean seen;
-    public boolean notified;
-    public long addedDate;
-
-    public EventFull() {}
-
-    public EventFull(Event event) {
-        super(
-                event.profileId,
-                event.id,
-                event.eventDate.clone(),
-                event.startTime == null ? null : event.startTime.clone(),
-                event.topic,
-                event.color,
-                event.type,
-                event.addedManually,
-                event.teacherId,
-                event.subjectId,
-                event.teamId
-        );
-
-        this.sharedBy = event.sharedBy;
-        this.sharedByName = event.sharedByName;
-        this.blacklisted = event.blacklisted;
-    }
-    public EventFull(EventFull event) {
-        super(
-                event.profileId,
-                event.id,
-                event.eventDate.clone(),
-                event.startTime == null ? null : event.startTime.clone(),
-                event.topic,
-                event.color,
-                event.type,
-                event.addedManually,
-                event.teacherId,
-                event.subjectId,
-                event.teamId
-        );
-
-        this.sharedBy = event.sharedBy;
-        this.sharedByName = event.sharedByName;
-        this.blacklisted = event.blacklisted;
-        this.typeName = event.typeName;
-        this.typeColor = event.typeColor;
-        this.teacherFullName = event.teacherFullName;
-        this.subjectLongName = event.subjectLongName;
-        this.subjectShortName = event.subjectShortName;
-        this.teamName = event.teamName;
-        this.teamCode = event.teamCode;
-        this.seen = event.seen;
-        this.notified = event.notified;
-        this.addedDate = event.addedDate;
-    }
-
-    public EventFull(Event event, Metadata metadata) {
-        this(event);
-
-        this.seen = metadata.seen;
-        this.notified = metadata.notified;
-        this.addedDate = metadata.addedDate;
-    }
-
-    public int getColor() {
-        return color == -1 ? typeColor : color;
-    }
-
-    @Override
-    public String toString() {
-        return "EventFull{" +
-                "profileId=" + profileId +
-                ", id=" + id +
-                ", eventDate=" + eventDate +
-                ", startTime=" + startTime +
-                ", topic='" + topic + '\'' +
-                ", color=" + color +
-                ", type=" + type +
-                ", addedManually=" + addedManually +
-                ", sharedBy='" + sharedBy + '\'' +
-                ", sharedByName='" + sharedByName + '\'' +
-                ", blacklisted=" + blacklisted +
-                ", teacherId=" + teacherId +
-                ", subjectId=" + subjectId +
-                ", teamId=" + teamId +
-                ", typeName='" + typeName + '\'' +
-                ", teacherFullName='" + teacherFullName + '\'' +
-                ", subjectLongName='" + subjectLongName + '\'' +
-                ", subjectShortName='" + subjectShortName + '\'' +
-                ", teamName='" + teamName + '\'' +
-                ", seen=" + seen +
-                ", notified=" + notified +
-                ", addedDate=" + addedDate +
-                '}';
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2020-1-6
+ */
+package pl.szczodrzynski.edziennik.data.db.full
+
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class EventFull(
+        profileId: Int, id: Long, date: Date, time: Time?,
+        topic: String, color: Int?, type: Long,
+        teacherId: Long, subjectId: Long, teamId: Long
+) : Event(
+        profileId, id, date, time,
+        topic, color, type,
+        teacherId, subjectId, teamId
+) {
+    constructor(event: Event, metadata: Metadata? = null) : this(
+            event.profileId, event.id, event.date, event.time,
+            event.topic, event.color, event.type,
+            event.teacherId, event.subjectId, event.teamId) {
+        event.let {
+            addedManually = it.addedManually
+            sharedBy = it.sharedBy
+            sharedByName = it.sharedByName
+            blacklisted = it.blacklisted
+            homeworkBody = it.homeworkBody
+            attachmentIds = it.attachmentIds
+            attachmentNames = it.attachmentNames
+        }
+        metadata?.let {
+            seen = it.seen
+            notified = it.notified
+            addedDate = it.addedDate
+        }
+    }
+
+    var typeName: String? = null
+    var typeColor: Int? = null
+
+    var teacherName: String? = null
+    var subjectLongName: String? = null
+    var subjectShortName: String? = null
+    var teamName: String? = null
+    var teamCode: String? = null
+    // metadata
+    var seen = false
+    var notified = false
+    var addedDate: Long = 0
+
+    val eventColor
+        get() = color ?: typeColor ?: 0xff2196f3.toInt()
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration80.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-27.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration80 : Migration(79, 80) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        // The Homework Update
+        database.execSQL("ALTER TABLE events RENAME TO _events;")
+        database.execSQL("""CREATE TABLE events (
+            profileId INTEGER NOT NULL,
+            eventId INTEGER NOT NULL,
+            eventDate TEXT NOT NULL,
+            eventTime TEXT,
+            eventTopic TEXT NOT NULL,
+            eventColor INTEGER,
+            eventType INTEGER NOT NULL,
+            teacherId INTEGER NOT NULL,
+            subjectId INTEGER NOT NULL,
+            teamId INTEGER NOT NULL,
+            eventAddedManually INTEGER NOT NULL DEFAULT 0,
+            eventSharedBy TEXT DEFAULT NULL,
+            eventSharedByName TEXT DEFAULT NULL,
+            eventBlacklisted INTEGER NOT NULL DEFAULT 0,
+            homeworkBody TEXT DEFAULT NULL,
+            attachmentIds TEXT DEFAULT NULL,
+            attachmentNames TEXT DEFAULT NULL,
+            PRIMARY KEY(profileId, eventId)
+        )""")
+        database.execSQL("DROP INDEX IF EXISTS index_events_profileId_eventDate_eventStartTime")
+        database.execSQL("DROP INDEX IF EXISTS index_events_profileId_eventType")
+        database.execSQL("CREATE INDEX index_events_profileId_eventDate_eventTime ON events (profileId, eventDate, eventTime)")
+        database.execSQL("CREATE INDEX index_events_profileId_eventType ON events (profileId, eventType)")
+        database.execSQL("""
+            INSERT INTO events (profileId, eventId, eventDate, eventTime, eventTopic, eventColor, eventType, teacherId, subjectId, teamId, eventAddedManually, eventSharedBy, eventSharedByName, eventBlacklisted)
+            SELECT profileId, eventId, eventDate, eventStartTime, eventTopic,
+            CASE eventColor WHEN -1 THEN NULL ELSE eventColor END,
+            eventType, teacherId, subjectId, teamId,
+            eventAddedManually, eventSharedBy, eventSharedByName, eventBlacklisted
+            FROM _events
+        """)
+        database.execSQL("DROP TABLE _events")
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration81.kt

@@ -0,0 +1,11 @@
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+
+class Migration81 : Migration(80, 81) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("UPDATE metadata SET seen = 1, notified = 1 WHERE thingType = ${Metadata.TYPE_TEACHER_ABSENCE}")
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration82.kt

@@ -0,0 +1,10 @@
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration82 : Migration(81, 82) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE events ADD COLUMN eventIsDone INTEGER DEFAULT 0 NOT NULL")
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration83.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-30.
+ */
+
+package pl.szczodrzynski.edziennik.data.db.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration83 : Migration(82, 83) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE events ADD COLUMN keep INTEGER NOT NULL DEFAULT 1")
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseService.kt

@@ -9,8 +9,8 @@ import android.app.PendingIntent
 import android.app.PendingIntent.CanceledException
 import android.content.Intent
 import android.util.Log
-import com.google.firebase.iid.zzaq
-import com.google.firebase.iid.zzv
+import com.google.firebase.iid.zzad
+import com.google.firebase.iid.zzaz
 import com.google.firebase.messaging.zzc
 import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.*
@@ -36,7 +36,7 @@ open class FirebaseService : zzc() {
 
     // apparently this gets the correct intent from some
     // kind of queue inside Firebase's InstanceID Receiver
-    final override fun zza(intent: Intent?) = zzaq.zza()?.zzb()
+    final override fun zza(intent: Intent?) = zzaz.zza()?.zzb()
     final override fun zzb(intent: Intent?): Boolean {
         val action = intent?.action
         if (action == "com.google.firebase.messaging.NOTIFICATION_OPEN") {
@@ -80,7 +80,7 @@ open class FirebaseService : zzc() {
                     val ackBundle = Bundle(
                             "google.message_id" to messageId
                     )
-                    zzv.zza(this).zza(2, ackBundle)
+                    zzad.zza(this).zza(2, ackBundle)
                 }
                 // check for duplicate message
                 // and add it to queue

app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt

@@ -105,18 +105,19 @@ class SzkolnyAppFirebase(val app: App, val profiles: List<Profile>, val message:
             if (profile.registration != Profile.REGISTRATION_ENABLED)
                 return@forEach
             val event = Event(
-                    team.profileId,
-                    json.getLong("id") ?: return,
-                    json.getInt("eventDate")?.let { Date.fromValue(it) } ?: return,
-                    json.getInt("startTime")?.let { Time.fromValue(it) },
-                    json.getString("topic") ?: "",
-                    json.getInt("color") ?: -1,
-                    json.getLong("type") ?: 0,
-                    true,
-                    json.getLong("teacherId") ?: -1,
-                    json.getLong("subjectId") ?: -1,
-                    team.id
+                    profileId = team.profileId,
+                    id = json.getLong("id") ?: return,
+                    date = json.getInt("eventDate")?.let { Date.fromValue(it) } ?: return,
+                    time = json.getInt("startTime")?.let { Time.fromValue(it) },
+                    topic = json.getString("topic") ?: "",
+                    color = json.getInt("color"),
+                    type = json.getLong("type") ?: 0,
+                    teacherId = json.getLong("teacherId") ?: -1,
+                    subjectId = json.getLong("subjectId") ?: -1,
+                    teamId = team.id
             )
+            if (event.color == -1)
+                event.color = null
 
             event.sharedBy = json.getString("sharedBy")
             event.sharedByName = json.getString("sharedByName")
@@ -144,14 +145,14 @@ class SzkolnyAppFirebase(val app: App, val profiles: List<Profile>, val message:
                         profileName = profile.name,
                         viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA,
                         addedDate = metadata.addedDate
-                ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
+                ).addExtra("eventId", event.id).addExtra("eventDate", event.date.value.toLong())
                 notificationList += notification
             }
 
             events += event
             metadataList += metadata
         }
-        app.db.eventDao().addAll(events)
+        app.db.eventDao().upsertAll(events)
         app.db.metadataDao().addAllReplace(metadataList)
         if (notificationList.isNotEmpty()) {
             app.db.notificationDao().addAll(notificationList)

app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookie.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-24.
+ */
+
+package pl.szczodrzynski.edziennik.network.cookie
+
+import okhttp3.Cookie
+
+class DumbCookie(var cookie: Cookie) {
+
+    constructor(domain: String, name: String, value: String, expiresAt: Long? = null) : this(
+            Cookie.Builder()
+                    .name(name)
+                    .value(value)
+                    .also { if (expiresAt != null) it.expiresAt(expiresAt) }
+                    .domain(domain)
+                    .build()
+    )
+
+    init {
+        cookie = Cookie.Builder()
+                .name(cookie.name())
+                .value(cookie.value())
+                .expiresAt(cookie.expiresAt())
+                .domain(cookie.domain())
+                .build()
+    }
+
+    fun domainMatches(host: String): Boolean {
+        val domain = cookie.domain()
+        return host == domain || host.endsWith(".$domain")
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is DumbCookie) return false
+        if (this.cookie === other.cookie) return true
+
+        return cookie.name() == other.cookie.name()
+                && cookie.domain() == other.cookie.domain()
+    }
+
+    override fun hashCode(): Int {
+        var hash = 17
+        hash = 31 * hash + cookie.name().hashCode()
+        hash = 31 * hash + cookie.domain().hashCode()
+        return hash
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookieJar.kt

@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-24.
+ */
+
+package pl.szczodrzynski.edziennik.network.cookie
+
+import android.content.Context
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+
+/**
+ * A simple cookie jar that does not care about the [Cookie.secure], [Cookie.hostOnly],
+ * [Cookie.httpOnly] and [Cookie.path] attributes.
+ */
+class DumbCookieJar(
+        /**
+         * A context to create the shared prefs file.
+         */
+        context: Context,
+
+        /**
+         * Whether to persist session cookies as well, when [Cookie.persistent] is false.
+         */
+        private val persistAll: Boolean = false
+) : CookieJar {
+
+    private val prefs = context.getSharedPreferences("cookies", Context.MODE_PRIVATE)
+    private val sessionCookies = mutableSetOf<DumbCookie>()
+    private val savedCookies = mutableSetOf<DumbCookie>()
+    private fun save(dc: DumbCookie) {
+        sessionCookies.remove(dc)
+        sessionCookies.add(dc)
+        if (dc.cookie.persistent() || persistAll) {
+            savedCookies.remove(dc)
+            savedCookies.add(dc)
+        }
+    }
+    private fun delete(vararg toRemove: DumbCookie) {
+        sessionCookies.removeAll(toRemove)
+        savedCookies.removeAll(toRemove)
+    }
+
+    override fun saveFromResponse(url: HttpUrl?, cookies: List<Cookie>) {
+        for (cookie in cookies) {
+            val dc = DumbCookie(cookie)
+            save(dc)
+        }
+    }
+
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        return sessionCookies.filter {
+            it.cookie.matches(url)
+        }.map { it.cookie }
+    }
+
+    fun get(domain: String, name: String): String? {
+        return sessionCookies.firstOrNull {
+            it.domainMatches(domain) && it.cookie.name() == name
+        }?.cookie?.value()
+    }
+
+    fun set(domain: String, name: String, value: String?, isSession: Boolean) = set(
+            domain, name, value,
+            if (isSession) null
+            else System.currentTimeMillis() + 365 * 24 * 60 * 60 * 1000L
+    )
+
+    /**
+     * Add a cookie to the cache.
+     * By default a session cookie is added. If [expiresAt] is set, the cookie is
+     * additionally persisted.
+     */
+    fun set(domain: String, name: String?, value: String?, expiresAt: Long? = null) {
+        name ?: return
+        if (value == null) {
+            remove(domain, name)
+            return
+        }
+        val dc = DumbCookie(domain, name, value, expiresAt)
+        save(dc)
+    }
+
+    fun getAll(domain: String): Map<String, String> {
+        return sessionCookies.filter {
+            it.domainMatches(domain)
+        }.map { it.cookie.name() to it.cookie.value() }.toMap()
+    }
+
+    fun remove(domain: String, name: String) {
+        val toRemove = sessionCookies.filter {
+            it.domainMatches(domain) && it.cookie.name() == name
+        }
+        delete(*toRemove.toTypedArray())
+    }
+
+    fun clear(domain: String) {
+        val toRemove = sessionCookies.filter {
+            it.domainMatches(domain)
+        }
+        delete(*toRemove.toTypedArray())
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/TemplateAdapter.kt

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2019-12-19.
- */
-
-package pl.szczodrzynski.edziennik.ui
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.databinding.TemplateListItemBinding
-import pl.szczodrzynski.edziennik.onClick
-
-class TemplateAdapter(
-        val context: Context,
-        val onItemClick: ((item: TemplateItem) -> Unit)? = null,
-        val onItemButtonClick: ((item: TemplateItem) -> Unit)? = null
-) : RecyclerView.Adapter<TemplateAdapter.ViewHolder>() {
-
-    private val app by lazy { context.applicationContext as App }
-
-    var items = listOf<TemplateItem>()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        val view = TemplateListItemBinding.inflate(inflater, parent, false)
-        return ViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = items[position]
-        val b = holder.b
-
-        onItemClick?.let { listener ->
-            b.root.onClick { listener(item) }
-        }
-
-        /*b.someButton.visibility = if (buttonVisible) View.VISIBLE else View.GONE
-        onItemButtonClick?.let { listener ->
-            b.someButton.onClick { listener(item) }
-        }*/
-    }
-
-    override fun getItemCount() = items.size
-
-    class ViewHolder(val b: TemplateListItemBinding) : RecyclerView.ViewHolder(b.root)
-
-    data class TemplateItem(val text: String)
-}

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt

@@ -146,6 +146,11 @@ class DayDialog(
 
         adapter = EventListAdapter(
                 activity,
+                showWeekDay = false,
+                showDate = false,
+                showType = true,
+                showTime = true,
+                showSubject = true,
                 onItemClick = {
                     EventDetailsDialog(
                             activity,

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt

@@ -87,11 +87,11 @@ class EventDetailsDialog(
         val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity)
 
         try {
-            b.monthName = app.resources.getStringArray(R.array.months_day_of_array)[event.eventDate.month - 1]
+            b.monthName = app.resources.getStringArray(R.array.months_day_of_array)[event.date.month - 1]
         }
         catch (_: Exception) {}
 
-        b.typeColor.background?.setTintColor(event.getColor())
+        b.typeColor.background?.setTintColor(event.eventColor)
 
         b.details = mutableListOf(
                 event.subjectLongName,
@@ -102,14 +102,14 @@ class EventDetailsDialog(
                 when (event.sharedBy) {
                     null -> when {
                         event.addedManually -> R.string.event_details_added_by_self_format
-                        event.teacherFullName == null -> R.string.event_details_added_by_unknown_format
+                        event.teacherName == null -> R.string.event_details_added_by_unknown_format
                         else -> R.string.event_details_added_by_format
                     }
                     "self" -> R.string.event_details_shared_by_self_format
                     else -> R.string.event_details_shared_by_format
                 },
                 Date.fromMillis(event.addedDate).formattedString,
-                event.sharedByName ?: event.teacherFullName ?: ""
+                event.sharedByName ?: event.teacherName ?: ""
         )
 
         b.editButton.visibility = if (event.addedManually) View.VISIBLE else View.GONE
@@ -125,7 +125,7 @@ class EventDetailsDialog(
 
         b.goToTimetableButton.setOnClickListener {
             dialog.dismiss()
-            val dateStr = event.eventDate?.stringY_m_d ?: return@setOnClickListener
+            val dateStr = event.date.stringY_m_d
 
             val intent =
                     if (activity is MainActivity && activity.navTargetId == MainActivity.DRAWER_ITEM_TIMETABLE)
@@ -148,6 +148,10 @@ class EventDetailsDialog(
             openInCalendar()
         }
 
+        b.checkDoneButton.setOnLongClickListener {
+            Toast.makeText(activity, R.string.hint_mark_as_done, Toast.LENGTH_SHORT).show()
+            true
+        }
         b.goToTimetableButton.setOnLongClickListener {
             Toast.makeText(activity, R.string.hint_go_to_timetable, Toast.LENGTH_SHORT).show()
             true
@@ -161,6 +165,14 @@ class EventDetailsDialog(
             true
         }
 
+        b.checkDoneButton.isChecked = event.isDone
+        b.checkDoneButton.addOnCheckedChangeListener { _, isChecked ->
+            event.isDone = isChecked
+            launch(Dispatchers.Default) {
+                app.db.eventDao().replace(event)
+            }
+        }
+
         b.topic.text = event.topic
         BetterLink.attach(b.topic) {
             dialog.dismiss()
@@ -245,7 +257,7 @@ class EventDetailsDialog(
     }
 
     private fun openInCalendar() { launch {
-        val title = (event.typeName ?: "") +
+        val title = event.typeName ?: "" +
                 (if (event.typeName.isNotNullNorBlank() && event.subjectLongName.isNotNullNorBlank()) " - " else " ") +
                 (event.subjectLongName ?: "")
 
@@ -254,12 +266,12 @@ class EventDetailsDialog(
             putExtra(Events.TITLE, title)
             putExtra(Events.DESCRIPTION, event.topic)
 
-            if (event.startTime == null) {
+            if (event.time == null) {
                 putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, true)
-                putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, event.eventDate.inMillis)
-                putExtra(CalendarContract.EXTRA_EVENT_END_TIME, event.eventDate.inMillis)
+                putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, event.date.inMillis)
+                putExtra(CalendarContract.EXTRA_EVENT_END_TIME, event.date.inMillis)
             } else {
-                val startTime = event.eventDate.combineWith(event.startTime)
+                val startTime = event.date.combineWith(event.time)
                 val endTime = startTime + 45 * 60 * 1000 /* 45 min */
 
                 putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, false)

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.kt

@@ -6,9 +6,9 @@ package pl.szczodrzynski.edziennik.ui.dialogs.event
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
@@ -19,8 +19,11 @@ import pl.szczodrzynski.edziennik.utils.models.Week
 class EventListAdapter(
         val context: Context,
         val simpleMode: Boolean = false,
-        val showDate: Boolean = false,
         val showWeekDay: Boolean = false,
+        val showDate: Boolean = false,
+        val showType: Boolean = true,
+        val showTime: Boolean = true,
+        val showSubject: Boolean = true,
         val onItemClick: ((event: EventFull) -> Unit)? = null,
         val onEventEditClick: ((event: EventFull) -> Unit)? = null
 ) : RecyclerView.Adapter<EventListAdapter.ViewHolder>() {
@@ -48,37 +51,41 @@ class EventListAdapter(
         b.simpleMode = simpleMode
 
         b.topic.text = event.topic
+        b.topic.maxLines = if (simpleMode) 2 else 3
 
         b.details.text = mutableListOf<CharSequence?>(
-                if (showWeekDay) Week.getFullDayName(event.eventDate.weekDay) else null,
-                if (showDate) event.eventDate.getRelativeString(context, 7) ?: event.eventDate.formattedStringShort else null,
-                event.typeName,
-                if (simpleMode) null else event.startTime?.stringHM ?: app.getString(R.string.event_all_day),
-                if (simpleMode) null else event.subjectLongName
+                if (showWeekDay) Week.getFullDayName(event.date.weekDay) else null,
+                if (showDate) event.date.getRelativeString(context, 7) ?: event.date.formattedStringShort else null,
+                if (showType) event.typeName else null,
+                if (showTime) event.time?.stringHM ?: app.getString(R.string.event_all_day) else null,
+                if (showSubject) event.subjectLongName else null
         ).concat(bullet)
 
         b.addedBy.setText(
                 when (event.sharedBy) {
                     null -> when {
                         event.addedManually -> R.string.event_list_added_by_self_format
-                        event.teacherFullName == null -> R.string.event_list_added_by_unknown_format
+                        event.teacherName == null -> R.string.event_list_added_by_unknown_format
                         else -> R.string.event_list_added_by_format
                     }
                     "self" -> R.string.event_list_shared_by_self_format
                     else -> R.string.event_list_shared_by_format
                 },
                 Date.fromMillis(event.addedDate).formattedString,
-                event.sharedByName ?: event.teacherFullName ?: "",
+                event.sharedByName ?: event.teacherName ?: "",
                 event.teamName?.let { bullet+it } ?: ""
         )
 
-        b.typeColor.background?.setTintColor(event.getColor())
+        b.typeColor.background?.setTintColor(event.eventColor)
+        b.typeColor.isVisible = showType
 
-        b.editButton.visibility = if (event.addedManually && !simpleMode) View.VISIBLE else View.GONE
+        b.editButton.isVisible = !simpleMode && event.addedManually && !event.isDone
         b.editButton.onClick {
             onEventEditClick?.invoke(event)
         }
 
+        b.isDone.isVisible = event.isDone
+
         b.editButton.setOnLongClickListener {
             Toast.makeText(context, R.string.hint_edit_event, Toast.LENGTH_SHORT).show()
             true

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt

@@ -216,7 +216,7 @@ class EventManualDialog(
             progressDialog?.dismiss()
             launch {
                 b.timeDropdown.loadItems()
-                b.timeDropdown.selectDefault(editingEvent?.startTime)
+                b.timeDropdown.selectDefault(editingEvent?.time)
                 b.timeDropdown.selectDefault(defaultLesson?.displayStartTime ?: defaultTime)
             }
         }
@@ -241,7 +241,7 @@ class EventManualDialog(
 
         with (b.dateDropdown) {
             db = app.db
-            profileId = profileId
+            profileId = this@EventManualDialog.profileId
             showWeekDays = false
             showDays = true
             showOtherDate = true
@@ -251,7 +251,7 @@ class EventManualDialog(
                 nextLessonTeamId = it.displayTeamId
             }
             loadItems()
-            selectDefault(editingEvent?.eventDate)
+            selectDefault(editingEvent?.date)
             selectDefault(defaultLesson?.displayDate ?: defaultDate)
             onDateSelected = { date, lesson ->
                 b.timeDropdown.deselect()
@@ -269,15 +269,15 @@ class EventManualDialog(
 
         with (b.timeDropdown) {
             db = app.db
-            profileId = profileId
+            profileId = this@EventManualDialog.profileId
             showAllDay = true
             showCustomTime = true
             lessonsDate = b.dateDropdown.getSelected() as? Date ?: Date.getToday()
             displayMode = DISPLAY_LESSONS
             if (!loadItems())
                 syncTimetable(lessonsDate ?: Date.getToday())
-            selectDefault(editingEvent?.startTime)
-            if (editingEvent != null && editingEvent.startTime == null)
+            selectDefault(editingEvent?.time)
+            if (editingEvent != null && editingEvent.time == null)
                 select(0L)
             selectDefault(defaultLesson?.displayStartTime ?: defaultTime)
             onLessonSelected = { lesson ->
@@ -289,7 +289,7 @@ class EventManualDialog(
 
         with (b.teamDropdown) {
             db = app.db
-            profileId = profileId
+            profileId = this@EventManualDialog.profileId
             showNoTeam = true
             loadItems()
             selectTeamClass()
@@ -299,7 +299,7 @@ class EventManualDialog(
 
         with (b.subjectDropdown) {
             db = app.db
-            profileId = profileId
+            profileId = this@EventManualDialog.profileId
             showNoSubject = true
             showCustomSubject = false
             loadItems()
@@ -309,7 +309,7 @@ class EventManualDialog(
 
         with (b.teacherDropdown) {
             db = app.db
-            profileId = profileId
+            profileId = this@EventManualDialog.profileId
             showNoTeacher = true
             loadItems()
             selectDefault(editingEvent?.teacherId)
@@ -319,7 +319,12 @@ class EventManualDialog(
 
         val deferred = async(Dispatchers.Default) {
             // get the event type list
-            val eventTypes = app.db.eventTypeDao().getAllNow(profileId)
+            var eventTypes = app.db.eventTypeDao().getAllNow(profileId)
+
+            if (eventTypes.none { it.id in -1L..10L }) {
+                eventTypes = app.db.eventTypeDao().addDefaultTypes(activity, profileId)
+            }
+
             b.typeDropdown.clear()
             b.typeDropdown += eventTypes.map { TextInputDropDown.Item(it.id, it.name, tag = it) }
         }
@@ -338,10 +343,10 @@ class EventManualDialog(
         // copy IDs from event being edited
         editingEvent?.let {
             b.topic.setText(it.topic)
-            b.typeDropdown.select(it.type.toLong())?.let { item ->
+            b.typeDropdown.select(it.type)?.let { item ->
                 customColor = (item.tag as EventType).color
             }
-            if (it.color != -1)
+            if (it.color != null && it.color != -1)
                 customColor = it.color
         }
 
@@ -464,22 +469,25 @@ class EventManualDialog(
             (timeSelected as? Pair<*, *>)?.first as? Time
 
         if (isError) return
+        date ?: return
+        topic ?: return
 
         val id = System.currentTimeMillis()
 
         val eventObject = Event(
-                profileId,
-                editingEvent?.id ?: id,
-                date,
-                startTime,
-                topic,
-                customColor ?: -1,
-                type ?: Event.TYPE_DEFAULT,
-                true,
-                teacherId ?: -1,
-                subjectId ?: -1,
-                teamId ?: -1
-        )
+                profileId = profileId,
+                id = editingEvent?.id ?: id,
+                date = date,
+                time = startTime,
+                topic = topic,
+                color = customColor,
+                type = type ?: Event.TYPE_DEFAULT,
+                teacherId = teacherId ?: -1,
+                subjectId = subjectId ?: -1,
+                teamId = teamId ?: -1
+        ).also {
+            it.addedManually = true
+        }
 
         val metadataObject = Metadata(
                 profileId,
@@ -579,7 +587,7 @@ class EventManualDialog(
     private fun finishAdding(eventObject: Event, metadataObject: Metadata) {
         launch {
             withContext(Dispatchers.Default) {
-                app.db.eventDao().add(eventObject)
+                app.db.eventDao().upsert(eventObject)
                 app.db.metadataDao().add(metadataObject)
             }
         }
@@ -590,6 +598,7 @@ class EventManualDialog(
             activity.reloadTarget()
     }
     private fun finishRemoving() {
+        editingEvent ?: return
         launch {
             withContext(Dispatchers.Default) {
                 app.db.eventDao().remove(editingEvent)

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/NotificationFilterDialog.kt

@@ -37,7 +37,8 @@ class NotificationFilterDialog(
                 Notification.TYPE_NEW_ANNOUNCEMENT to R.string.notification_type_new_announcement,
                 Notification.TYPE_NEW_SHARED_EVENT to R.string.notification_type_new_shared_event,
                 Notification.TYPE_NEW_SHARED_HOMEWORK to R.string.notification_type_new_shared_homework,
-                Notification.TYPE_REMOVED_SHARED_EVENT to R.string.notification_type_removed_shared_event
+                Notification.TYPE_REMOVED_SHARED_EVENT to R.string.notification_type_removed_shared_event,
+                Notification.TYPE_TEACHER_ABSENCE to R.string.notification_type_new_teacher_absence
         )
     }
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt

@@ -170,6 +170,11 @@ class LessonDetailsDialog(
 
         adapter = EventListAdapter(
                 activity,
+                showWeekDay = false,
+                showDate = false,
+                showType = true,
+                showTime = true,
+                showSubject = true,
                 onItemClick = {
                     EventDetailsDialog(
                             activity,

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt

@@ -222,22 +222,22 @@ class AgendaFragment : Fragment(), CoroutineScope {
 
         events.forEach { event ->
             eventList.add(BaseCalendarEvent(
-                    "${event.typeName} - ${event.topic}",
+                    "${event.typeName ?: "wydarzenie"} - ${event.topic}",
                     "",
-                    (if (event.startTime == null) getString(R.string.agenda_event_all_day) else event.startTime!!.stringHM) +
+                    (if (event.time == null) getString(R.string.agenda_event_all_day) else event.time!!.stringHM) +
                             (event.subjectLongName?.let { ", $it" } ?: "") +
-                            (event.teacherFullName?.let { ", $it" } ?: "") +
+                            (event.teacherName?.let { ", $it" } ?: "") +
                             (event.teamName?.let { ", $it" } ?: ""),
-                    event.getColor(),
-                    Colors.legibleTextColor(event.getColor()),
+                    event.eventColor,
+                    Colors.legibleTextColor(event.eventColor),
                     event.startTimeCalendar,
                     event.endTimeCalendar,
-                    event.startTime == null,
+                    event.time == null,
                     event.id,
                     !event.seen
             ))
 
-            if (!event.seen) unreadEventDates.add(event.eventDate.value)
+            if (!event.seen) unreadEventDates.add(event.date.value)
         }
 
         b.agendaDefaultView.init(eventList, minDate, maxDate, Locale.getDefault(), object : CalendarPickerController {
@@ -281,11 +281,11 @@ class AgendaFragment : Fragment(), CoroutineScope {
             val eventIcon = IconicsDrawable(activity)
                     .icon(CommunityMaterial.Icon.cmd_checkbox_blank_circle)
                     .size(IconicsSize.dp(10))
-                    .color(IconicsColor.colorInt(event.getColor()))
+                    .color(IconicsColor.colorInt(event.eventColor))
 
             dayList.add(EventDay(event.startTimeCalendar, eventIcon))
 
-            if (!event.seen) unreadEventDates.add(event.eventDate.value)
+            if (!event.seen) unreadEventDates.add(event.date.value)
         }
 
         b.agendaCalendarView.setEvents(dayList)

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/PagerFragment.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) Kuba Szczodrzyński 2020-2-22.
- */
-
-package pl.szczodrzynski.edziennik.ui.modules.base
-
-import androidx.fragment.app.Fragment
-
-abstract class PagerFragment : Fragment() {
-    private var isPageCreated = false
-
-    /**
-     * Called when the page is first shown, or if previous
-     * [onPageCreated] returned false
-     *
-     * @return true if the view is set up
-     * @return false if the setup failed. The method may be then called
-     * again, when page becomes visible.
-     */
-    abstract fun onPageCreated(): Boolean
-
-    override fun onResume() {
-        if (!isPageCreated) {
-            isPageCreated = onPageCreated()
-        }
-        super.onResume()
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/FragmentLazyPagerAdapter.kt

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-30.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
+
+import androidx.fragment.app.FragmentManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+
+class FragmentLazyPagerAdapter(
+        fragmentManager: FragmentManager,
+        swipeRefreshLayout: SwipeRefreshLayout,
+        private val fragments: List<Pair<LazyFragment, CharSequence>>
+) : LazyPagerAdapter(fragmentManager, swipeRefreshLayout) {
+    override fun getPage(position: Int) = fragments[position].first
+    override fun getPageTitle(position: Int) = fragments[position].second
+    override fun getCount() = fragments.size
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyFragment.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-29.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
+
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+
+abstract class LazyFragment : Fragment() {
+    private var isPageCreated = false
+    internal var position = -1
+    internal var swipeRefreshLayoutCallback: ((position: Int, isEnabled: Boolean) -> Unit)? = null
+
+    /**
+     * Called when the page is first shown, or if previous
+     * [onPageCreated] returned false
+     *
+     * @return true if the view is set up
+     * @return false if the setup failed. The method may be then called
+     * again, when page becomes visible.
+     */
+    abstract fun onPageCreated(): Boolean
+
+    fun enableSwipeToRefresh() = swipeRefreshLayoutCallback?.invoke(position, true)
+    fun disableSwipeToRefresh() = swipeRefreshLayoutCallback?.invoke(position, false)
+    fun setSwipeToRefresh(enabled: Boolean) = swipeRefreshLayoutCallback?.invoke(position, enabled)
+
+    val onScrollListener: RecyclerView.OnScrollListener
+        get() = object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                if (recyclerView.canScrollVertically(-1))
+                    disableSwipeToRefresh()
+                if (!recyclerView.canScrollVertically(-1) && newState == RecyclerView.SCROLL_STATE_IDLE)
+                    enableSwipeToRefresh()
+            }
+        }
+
+    internal fun createPage() {
+        if (!isPageCreated && isAdded) {
+            isPageCreated = onPageCreated()
+        }
+    }
+
+    override fun onDestroyView() {
+        isPageCreated = false
+        super.onDestroyView()
+    }
+
+    override fun onResume() {
+        createPage()
+        super.onResume()
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyPagerAdapter.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-29.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
+
+import android.util.SparseBooleanArray
+import androidx.core.util.set
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+
+abstract class LazyPagerAdapter(fragmentManager: FragmentManager, val swipeRefreshLayout: SwipeRefreshLayout? = null) : FragmentStatePagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+    internal val enabledList = SparseBooleanArray()
+    private val refreshLayoutCallback: (position: Int, isEnabled: Boolean) -> Unit = { position, isEnabled ->
+        swipeRefreshLayout?.isEnabled = isEnabled
+        if (position > -1)
+            enabledList[position] = isEnabled
+    }
+    final override fun getItem(position: Int): LazyFragment {
+        return getPage(position).also {
+            it.position = position
+            it.swipeRefreshLayoutCallback = refreshLayoutCallback
+        }
+    }
+    abstract fun getPage(position: Int): LazyFragment
+    abstract override fun getPageTitle(position: Int): CharSequence
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/lazypager/LazyViewPager.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-29.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.base.lazypager
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.viewpager.widget.ViewPager
+
+class LazyViewPager @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null
+) : ViewPager(context, attrs) {
+
+    private var pageSelection = -1
+    private var scrollState = 0
+
+    init {
+        addOnPageChangeListener(object : OnPageChangeListener {
+            override fun onPageScrollStateChanged(state: Int) {
+                scrollState = state
+                (adapter as? LazyPagerAdapter)?.let {
+                    it.swipeRefreshLayout?.isEnabled = state == SCROLL_STATE_IDLE && it.enabledList[pageSelection, true]
+                }
+            }
+
+            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+
+            }
+
+            override fun onPageSelected(position: Int) {
+                pageSelection = position
+                (adapter as? LazyPagerAdapter)?.let {
+                    it.swipeRefreshLayout?.isEnabled = scrollState == SCROLL_STATE_IDLE && it.enabledList[pageSelection, true]
+                    val fragment = adapter?.instantiateItem(this@LazyViewPager, position)
+                    val lazyFragment = fragment as? LazyFragment
+                    lazyFragment?.createPage()
+                }
+            }
+        })
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListFragment.kt

@@ -10,11 +10,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial.Icon2
 import kotlinx.coroutines.*
@@ -23,7 +22,7 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.TARGET_GRADES_EDITOR
 import pl.szczodrzynski.edziennik.data.db.entity.Grade
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_GRADE
 import pl.szczodrzynski.edziennik.data.db.full.GradeFull
-import pl.szczodrzynski.edziennik.databinding.GradesFragmentBinding
+import pl.szczodrzynski.edziennik.databinding.GradesListFragmentBinding
 import pl.szczodrzynski.edziennik.ui.dialogs.grade.GradeDetailsDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.GradesConfigDialog
 import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesAverages
@@ -36,24 +35,20 @@ import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
 import kotlin.coroutines.CoroutineContext
 import kotlin.math.max
 
-
-class GradesFragment : Fragment(), CoroutineScope {
+class GradesListFragment : Fragment(), CoroutineScope {
     companion object {
         private const val TAG = "GradesFragment"
     }
 
     private lateinit var app: App
     private lateinit var activity: MainActivity
-    private lateinit var b: GradesFragmentBinding
+    private lateinit var b: GradesListFragmentBinding
 
     private val job: Job = Job()
     override val coroutineContext: CoroutineContext
         get() = job + Dispatchers.Main
 
     // local/private variables go here
-    private val adapter by lazy {
-        GradesAdapter(activity)
-    }
     private val manager by lazy { app.gradesManager }
     private val dontCountEnabled by lazy { manager.dontCountEnabled }
     private val dontCountGrades by lazy { manager.dontCountGrades }
@@ -63,51 +58,49 @@ class GradesFragment : Fragment(), CoroutineScope {
         activity = (getActivity() as MainActivity?) ?: return null
         context ?: return null
         app = activity.application as App
-        b = GradesFragmentBinding.inflate(inflater)
+        b = GradesListFragmentBinding.inflate(inflater)
         b.refreshLayout.setParent(activity.swipeRefreshLayout)
         return b.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!isAdded)
-            return
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { startCoroutineTimer(100L) {
+        if (!isAdded) return@startCoroutineTimer
 
         expandSubjectId = arguments?.getLong("gradesSubjectId") ?: 0L
 
-        app.db.gradeDao()
-                .getAllOrderBy(App.profileId, app.gradesManager.getOrderByString())
-                .observe(this, Observer { grades ->
-                    if (b.gradesRecyclerView.adapter == null) {
-                        b.gradesRecyclerView.adapter = adapter
-                        b.gradesRecyclerView.apply {
-                            setHasFixedSize(true)
-                            layoutManager = LinearLayoutManager(context)
-                            //addItemDecoration(SimpleDividerItemDecoration(context))
-                            addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                                override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                                    if (recyclerView.canScrollVertically(-1)) {
-                                        b.refreshLayout.isEnabled = false
-                                    }
-                                    if (!recyclerView.canScrollVertically(-1) && newState == SCROLL_STATE_IDLE) {
-                                        b.refreshLayout.isEnabled = true
-                                    }
-                                }
-                            })
-                        }
-                    }
+        val adapter = GradesAdapter(activity)
+        var firstRun = true
 
-                    launch(Dispatchers.Default) {
-                        processGrades(grades)
-                    }
+        app.db.gradeDao().getAllOrderBy(App.profileId, app.gradesManager.getOrderByString()).observe(this, Observer { items -> launch {
+            if (!isAdded) return@launch
 
-                    if (grades != null && grades.isNotEmpty()) {
-                        b.gradesRecyclerView.visibility = View.VISIBLE
-                        b.gradesNoData.visibility = View.GONE
-                    } else {
-                        b.gradesRecyclerView.visibility = View.GONE
-                        b.gradesNoData.visibility = View.VISIBLE
-                    }
-                })
+            // load & configure the adapter
+            adapter.items = withContext(Dispatchers.Default) { processGrades(items) }
+            if (items.isNotNullNorEmpty() && b.list.adapter == null) {
+                b.list.adapter = adapter
+                b.list.apply {
+                    setHasFixedSize(true)
+                    layoutManager = LinearLayoutManager(context)
+                    addOnScrollListener(b.refreshLayout.onScrollListener)
+                }
+            }
+            adapter.notifyDataSetChanged()
+
+            if (firstRun) {
+                expandSubject(adapter)
+                firstRun = false
+            }
+
+            // show/hide relevant views
+            b.progressBar.isVisible = false
+            if (items.isNullOrEmpty()) {
+                b.list.isVisible = false
+                b.noData.isVisible = true
+            } else {
+                b.list.isVisible = true
+                b.noData.isVisible = false
+            }
+        }})
 
         adapter.onGradeClick = {
             GradeDetailsDialog(activity, it)
@@ -153,10 +146,30 @@ class GradesFragment : Fragment(), CoroutineScope {
                         })
         )
         activity.gainAttention()
+    }}
+
+    private fun expandSubject(adapter: GradesAdapter) {
+        var expandSubjectModel: GradesSubject? = null
+        if (expandSubjectId != 0L) {
+            expandSubjectModel = adapter.items.firstOrNull { it is GradesSubject && it.subjectId == expandSubjectId } as? GradesSubject
+            adapter.expandModel(
+                    model = expandSubjectModel,
+                    view = null,
+                    notifyAdapter = false
+            )
+        }
+
+        startCoroutineTimer(500L) {
+            if (expandSubjectModel != null) {
+                b.list.smoothScrollToPosition(
+                        adapter.items.indexOf(expandSubjectModel) + expandSubjectModel.semesters.size + (expandSubjectModel.semesters.firstOrNull()?.grades?.size ?: 0)
+                )
+            }
+        }
     }
 
     @Suppress("SuspendFunctionOnCoroutineScope")
-    private suspend fun processGrades(grades: List<GradeFull>) {
+    private fun processGrades(grades: List<GradeFull>): MutableList<Any> {
         val items = mutableListOf<GradesSubject>()
 
         var subjectId = -1L
@@ -284,30 +297,7 @@ class GradesFragment : Fragment(), CoroutineScope {
             GradesManager.ORDER_BY_DATE_ASC -> items.sortBy { it.lastAddedDate }
         }
 
-        adapter.items = items.toMutableList()
-        adapter.items.add(stats)
-
-        var expandSubjectModel: GradesSubject? = null
-        if (expandSubjectId != 0L) {
-            expandSubjectModel = items.firstOrNull { it.subjectId == expandSubjectId }
-            adapter.expandModel(
-                    model = expandSubjectModel,
-                    view = null,
-                    notifyAdapter = false
-            )
-        }
-
-        withContext(Dispatchers.Main) {
-            adapter.notifyDataSetChanged()
-        }
-
-        startCoroutineTimer(500L, 0L) {
-            if (expandSubjectModel != null) {
-                b.gradesRecyclerView.smoothScrollToPosition(
-                        items.indexOf(expandSubjectModel) + expandSubjectModel.semesters.size + (expandSubjectModel.semesters.firstOrNull()?.grades?.size ?: 0)
-                )
-            }
-        }
+        return (items + stats).toMutableList()
     }
 
     private fun countGrade(grade: Grade, averages: GradesAverages) {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeEventsCard.kt

@@ -60,8 +60,11 @@ class HomeEventsCard(
         adapter = EventListAdapter(
                 activity,
                 simpleMode = true,
-                showDate = true,
                 showWeekDay = true,
+                showDate = true,
+                showType = true,
+                showTime = false,
+                showSubject = false,
                 onItemClick = {
                     EventDetailsDialog(
                             activity,
@@ -77,7 +80,7 @@ class HomeEventsCard(
                 }
         )
 
-        app.db.eventDao().getAllNearest(profile.id, Date.getToday(), 4).observe(activity, Observer { events ->
+        app.db.eventDao().getNearestNotDone(profile.id, Date.getToday(), 4).observe(activity, Observer { events ->
             adapter.items = events
             if (b.eventsView.adapter == null) {
                 b.eventsView.adapter = adapter

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java

@@ -50,17 +50,17 @@ public class HomeworkAdapter extends RecyclerView.Adapter<HomeworkAdapter.ViewHo
 
         EventFull homework = homeworkList.get(position);
 
-        int diffDays = Date.diffDays(homework.eventDate, Date.getToday());
+        int diffDays = Date.diffDays(homework.getDate(), Date.getToday());
 
-        holder.homeworkItemHomeworkDate.setText(app.getString(R.string.date_relative_format, homework.eventDate.getFormattedString(), Date.dayDiffString(context, diffDays)));
-        holder.homeworkItemTopic.setText(homework.topic);
-        holder.homeworkItemSubjectTeacher.setText(context.getString(R.string.homework_subject_teacher_format, bs(homework.subjectLongName), bs(homework.teacherFullName)));
-        holder.homeworkItemTeamDate.setText(context.getString(R.string.homework_team_date_format, bs(homework.teamName), Date.fromMillis(homework.addedDate).getFormattedStringShort()));
+        holder.homeworkItemHomeworkDate.setText(app.getString(R.string.date_relative_format, homework.getDate().getFormattedString(), Date.dayDiffString(context, diffDays)));
+        holder.homeworkItemTopic.setText(homework.getTopic());
+        holder.homeworkItemSubjectTeacher.setText(context.getString(R.string.homework_subject_teacher_format, bs(homework.getSubjectLongName()), bs(homework.getTeacherName())));
+        holder.homeworkItemTeamDate.setText(context.getString(R.string.homework_team_date_format, bs(homework.getTeamName()), Date.fromMillis(homework.getAddedDate()).getFormattedStringShort()));
 
-        if (!homework.seen) {
+        if (!homework.getSeen()) {
             holder.homeworkItemTopic.setBackground(context.getResources().getDrawable(R.drawable.bg_rounded_8dp));
             holder.homeworkItemTopic.getBackground().setColorFilter(new PorterDuffColorFilter(0x692196f3, PorterDuff.Mode.MULTIPLY));
-            homework.seen = true;
+            homework.setSeen(true);
             AsyncTask.execute(() -> {
                 App.db.metadataDao().setSeen(App.Companion.getProfileId(), homework, true);
             });
@@ -69,11 +69,11 @@ public class HomeworkAdapter extends RecyclerView.Adapter<HomeworkAdapter.ViewHo
             holder.homeworkItemTopic.setBackground(null);
         }
 
-        holder.homeworkItemEdit.setVisibility((homework.addedManually ? View.VISIBLE : View.GONE));
+        holder.homeworkItemEdit.setVisibility((homework.getAddedManually() ? View.VISIBLE : View.GONE));
         holder.homeworkItemEdit.setOnClickListener(v -> {
             new EventManualDialog(
                     (MainActivity) context,
-                    homework.profileId,
+                    homework.getProfileId(),
                     null,
                     null,
                     null,
@@ -83,11 +83,11 @@ public class HomeworkAdapter extends RecyclerView.Adapter<HomeworkAdapter.ViewHo
                     null);
         });
 
-        if (homework.sharedBy == null) {
+        if (homework.getSharedBy() == null) {
             holder.homeworkItemSharedBy.setVisibility(View.GONE);
         }
-        else if (homework.sharedByName != null) {
-            holder.homeworkItemSharedBy.setText(app.getString(R.string.event_shared_by_format, (homework.sharedBy.equals("self") ? app.getString(R.string.event_shared_by_self) : homework.sharedByName)));
+        else if (homework.getSharedByName() != null) {
+            holder.homeworkItemSharedBy.setText(app.getString(R.string.event_shared_by_format, (homework.getSharedBy().equals("self") ? app.getString(R.string.event_shared_by_self) : homework.getSharedByName())));
         }
     }
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-3-30.
+ */
+
 package pl.szczodrzynski.edziennik.ui.modules.homework
 
 import android.os.AsyncTask
@@ -7,46 +11,48 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import androidx.viewpager.widget.ViewPager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.R
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Event
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.databinding.FragmentHomeworkBinding
+import pl.szczodrzynski.edziennik.databinding.HomeworkFragmentBinding
 import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
-import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.FragmentLazyPagerAdapter
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem
+import kotlin.coroutines.CoroutineContext
 
-class HomeworkFragment : Fragment() {
+class HomeworkFragment : Fragment(), CoroutineScope {
     companion object {
+        private const val TAG = "HomeworkFragment"
         var pageSelection = 0
     }
 
     private lateinit var app: App
     private lateinit var activity: MainActivity
-    private lateinit var b: FragmentHomeworkBinding
+    private lateinit var b: HomeworkFragmentBinding
+
+    private val job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    // local/private variables go here
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         activity = (getActivity() as MainActivity?) ?: return null
-        if (context == null)
-            return null
+        context ?: return null
         app = activity.application as App
-        context!!.theme.applyStyle(Themes.appTheme, true)
-        // activity, context and profile is valid
-        b = FragmentHomeworkBinding.inflate(inflater)
+        b = HomeworkFragmentBinding.inflate(inflater)
         b.refreshLayout.setParent(activity.swipeRefreshLayout)
         return b.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        // TODO check if app, activity, b can be null
-        if (app.profile == null || !isAdded)
-            return
+        if (!isAdded) return
 
         activity.bottomSheet.prependItems(
                 BottomSheetPrimaryItem(true)
@@ -67,34 +73,29 @@ class HomeworkFragment : Fragment() {
                     Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show()
                 }))
 
-        b.viewPager.adapter = MessagesFragment.Adapter(childFragmentManager).also { adapter ->
-            adapter.addFragment(HomeworkListFragment().also { fragment ->
-                fragment.arguments = Bundle().also {  args ->
-                    args.putInt("homeworkDate", HomeworkDate.CURRENT)
-                }
-            }, getString(R.string.homework_tab_current))
+        val pagerAdapter = FragmentLazyPagerAdapter(
+                fragmentManager ?: return,
+                b.refreshLayout,
+                listOf(
+                        HomeworkListFragment().apply {
+                            arguments = Bundle("homeworkDate" to HomeworkDate.CURRENT)
+                        } to getString(R.string.homework_tab_current),
 
-            adapter.addFragment(HomeworkListFragment().also { fragment ->
-                fragment.arguments = Bundle().also {  args ->
-                    args.putInt("homeworkDate", HomeworkDate.PAST)
-                }
-            }, getString(R.string.homework_tab_past))
+                        HomeworkListFragment().apply {
+                            arguments = Bundle("homeworkDate" to HomeworkDate.PAST)
+                        } to getString(R.string.homework_tab_past)
+                )
+        )
+        b.viewPager.apply {
+            offscreenPageLimit = 1
+            adapter = pagerAdapter
+            currentItem = pageSelection
+            addOnPageSelectedListener {
+                pageSelection = it
+            }
+            b.tabLayout.setupWithViewPager(this)
         }
 
-        b.viewPager.currentItem = pageSelection
-        b.viewPager.clearOnPageChangeListeners()
-        b.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
-            override fun onPageScrollStateChanged(state: Int) {
-                b.refreshLayout.isEnabled = state == ViewPager.SCROLL_STATE_IDLE
-            }
-            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
-            override fun onPageSelected(position: Int) {
-                pageSelection = position
-            }
-        })
-
-        b.tabLayout.setupWithViewPager(b.viewPager)
-
         activity.navView.apply {
             bottomBar.apply {
                 fabEnable = true

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt

@@ -4,67 +4,106 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.MainActivity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.databinding.HomeworkListBinding
-import pl.szczodrzynski.edziennik.getInt
+import pl.szczodrzynski.edziennik.databinding.HomeworkListFragmentBinding
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventDetailsDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListAdapter
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment
+import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
 import pl.szczodrzynski.edziennik.utils.models.Date
+import kotlin.coroutines.CoroutineContext
 
-class HomeworkListFragment : Fragment() {
+class HomeworkListFragment : LazyFragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "HomeworkListFragment"
+    }
 
     private lateinit var app: App
     private lateinit var activity: MainActivity
-    private lateinit var b: HomeworkListBinding
+    private lateinit var b: HomeworkListFragmentBinding
 
-    private var homeworkDate = HomeworkDate.CURRENT
+    private val job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    // local/private variables go here
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         activity = (getActivity() as MainActivity?) ?: return null
         context ?: return null
         app = activity.application as App
-        b = HomeworkListBinding.inflate(inflater)
+        b = HomeworkListFragmentBinding.inflate(inflater)
         return b.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        // TODO check if app, activity, b can be null
-        if (!isAdded)
-            return
-
-        if (arguments != null) {
-            homeworkDate = arguments.getInt("homeworkDate", HomeworkDate.CURRENT)
-        }
-
-        val layoutManager = LinearLayoutManager(context)
-        layoutManager.reverseLayout = homeworkDate == HomeworkDate.PAST
-        layoutManager.stackFromEnd = homeworkDate == HomeworkDate.PAST
-
-        b.homeworkView.setHasFixedSize(true)
-        b.homeworkView.layoutManager = layoutManager
+    override fun onPageCreated(): Boolean { startCoroutineTimer(100L) {
+        val homeworkDate = arguments.getInt("homeworkDate", HomeworkDate.CURRENT)
 
+        val today = Date.getToday()
         val filter = when(homeworkDate) {
-            HomeworkDate.CURRENT -> "eventDate >= '" + Date.getToday().stringY_m_d + "'"
-            else -> "eventDate < '" + Date.getToday().stringY_m_d + "'"
+            HomeworkDate.CURRENT -> "eventDate >= '${today.stringY_m_d}' AND eventIsDone = 0"
+            else -> "eventDate < '${today.stringY_m_d}' OR eventIsDone = 1"
         }
 
-        app.db.eventDao()
-                .getAllByType(App.profileId, Event.TYPE_HOMEWORK, filter)
-                .observe(this, Observer { homeworkList ->
-                    if (!isAdded) return@Observer
+        val adapter = EventListAdapter(
+                activity,
+                showWeekDay = true,
+                showDate = true,
+                showType = false,
+                showTime = true,
+                showSubject = true,
+                onItemClick = {
+                    EventDetailsDialog(
+                            activity,
+                            it
+                    )
+                },
+                onEventEditClick = {
+                    EventManualDialog(
+                            activity,
+                            it.profileId,
+                            editingEvent = it
+                    )
+                }
+        )
 
-                    if (homeworkList != null && homeworkList.size > 0) {
-                        val adapter = HomeworkAdapter(context, homeworkList)
-                        b.homeworkView.adapter = adapter
-                        b.homeworkView.visibility = View.VISIBLE
-                        b.homeworkNoData.visibility = View.GONE
-                    } else {
-                        b.homeworkView.visibility = View.GONE
-                        b.homeworkNoData.visibility = View.VISIBLE
+        app.db.eventDao().getAllByType(App.profileId, Event.TYPE_HOMEWORK, filter).observe(this@HomeworkListFragment, Observer { items ->
+            if (!isAdded) return@Observer
+
+            // load & configure the adapter
+            adapter.items = items
+            if (items.isNotNullNorEmpty() && b.list.adapter == null) {
+                b.list.adapter = adapter
+                b.list.apply {
+                    setHasFixedSize(true)
+                    layoutManager = LinearLayoutManager(context).apply {
+                        reverseLayout = homeworkDate == HomeworkDate.PAST
+                        stackFromEnd = homeworkDate == HomeworkDate.PAST
                     }
-                })
-    }
+                    addItemDecoration(SimpleDividerItemDecoration(context))
+                    addOnScrollListener(onScrollListener)
+                }
+            }
+            adapter.notifyDataSetChanged()
+            setSwipeToRefresh(false) // TODO
+
+            // show/hide relevant views
+            b.progressBar.isVisible = false
+            if (items.isNullOrEmpty()) {
+                b.list.isVisible = false
+                b.noData.isVisible = true
+            } else {
+                b.list.isVisible = true
+                b.noData.isVisible = false
+            }
+        })
+    }; return true }
 }

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt

@@ -19,8 +19,6 @@ import pl.szczodrzynski.edziennik.data.api.events.ApiTaskAllFinishedEvent
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskErrorEvent
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskProgressEvent
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskStartedEvent
-import pl.szczodrzynski.edziennik.data.db.entity.Event.*
-import pl.szczodrzynski.edziennik.data.db.entity.EventType
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.REGISTRATION_DISABLED
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.REGISTRATION_ENABLED
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginSyncBinding
@@ -62,20 +60,7 @@ class LoginSyncFragment : Fragment(), CoroutineScope {
             else
                 REGISTRATION_DISABLED
 
-            val typeList = listOf(
-                    EventType(it.id, TYPE_HOMEWORK, getString(R.string.event_type_homework), COLOR_HOMEWORK),
-                    EventType(it.id, TYPE_DEFAULT, getString(R.string.event_other), COLOR_DEFAULT),
-                    EventType(it.id, TYPE_EXAM, getString(R.string.event_exam), COLOR_EXAM),
-                    EventType(it.id, TYPE_SHORT_QUIZ, getString(R.string.event_short_quiz), COLOR_SHORT_QUIZ),
-                    EventType(it.id, TYPE_ESSAY, getString(R.string.event_essay), COLOR_SHORT_QUIZ),
-                    EventType(it.id, TYPE_PROJECT, getString(R.string.event_project), COLOR_PROJECT),
-                    EventType(it.id, TYPE_PT_MEETING, getString(R.string.event_pt_meeting), COLOR_PT_MEETING),
-                    EventType(it.id, TYPE_EXCURSION, getString(R.string.event_excursion), COLOR_EXCURSION),
-                    EventType(it.id, TYPE_READING, getString(R.string.event_reading), COLOR_READING),
-                    EventType(it.id, TYPE_CLASS_EVENT, getString(R.string.event_class_event), COLOR_CLASS_EVENT),
-                    EventType(it.id, TYPE_INFORMATION, getString(R.string.event_information), COLOR_INFORMATION)
-            )
-            app.db.eventTypeDao().addAll(typeList)
+            app.db.eventTypeDao().addDefaultTypes(activity, it.id)
         }
 
         app.db.profileDao().addAll(profiles)

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt

@@ -15,6 +15,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.ProgressBar
+import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.Fragment
 import com.google.android.material.chip.Chip
 import com.mikepenz.iconics.IconicsColor
@@ -62,7 +63,7 @@ class MessageFragment : Fragment(), CoroutineScope {
     private lateinit var activity: MainActivity
     private lateinit var b: MessageFragmentBinding
 
-    private lateinit var job: Job
+    private val job: Job = Job()
     override val coroutineContext: CoroutineContext
         get() = job + Dispatchers.Main
 
@@ -73,16 +74,12 @@ class MessageFragment : Fragment(), CoroutineScope {
         activity = (getActivity() as MainActivity?) ?: return null
         context ?: return null
         app = activity.application as App
-        context!!.theme.applyStyle(Themes.appTheme, true)
         b = MessageFragmentBinding.inflate(inflater)
-        job = Job()
         return b.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        // TODO check if app, activity, b can be null
-        if (app.profile == null || !isAdded)
-            return
+        if (!isAdded) return
 
         b.closeButton.setImageDrawable(
                 IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_window_close)
@@ -260,16 +257,35 @@ class MessageFragment : Fragment(), CoroutineScope {
         MessagesFragment.pageSelection = min(message.type, 1)
     }
 
+    private val attachmentOnClick = { v: View ->
+        if (v.tag is Int) {
+            downloadAttachment(v.tag as Int)
+        }
+    }
+
+    private val attachmentOnLongClick = { v: View ->
+        (v.tag as? Int)?.let { tag ->
+            val popupMenu = PopupMenu(v.context, v)
+            popupMenu.menu.add(0, tag, 0, R.string.messages_attachment_download_again)
+            popupMenu.setOnMenuItemClickListener {
+                downloadAttachment(it.itemId, forceDownload = true)
+                true
+            }
+            popupMenu.show()
+        }
+        true
+    }
+
     private fun showAttachments() {
         if (message.attachmentIds != null) {
             val insertPoint = b.attachments
             insertPoint.removeAllViews()
 
             val chipLayoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-            chipLayoutParams.setMargins(0, Utils.dpToPx(8), 0, Utils.dpToPx(8))
+            chipLayoutParams.setMargins(0, 8.dp, 0, 0)
 
-            val progressLayoutParams = FrameLayout.LayoutParams(Utils.dpToPx(18), Utils.dpToPx(18))
-            progressLayoutParams.setMargins(Utils.dpToPx(8), 0, Utils.dpToPx(8), 0)
+            val progressLayoutParams = FrameLayout.LayoutParams(18.dp, 18.dp)
+            progressLayoutParams.setMargins(8.dp, 0, 8.dp, 0)
             progressLayoutParams.gravity = END or CENTER_VERTICAL
 
             // CREATE VIEWS AND AN OBJECT FOR EVERY ATTACHMENT
@@ -280,12 +296,13 @@ class MessageFragment : Fragment(), CoroutineScope {
                 val size = message.attachmentSizes[index]
                 // create the parent
                 val attachmentLayout = FrameLayout(b.root.context)
-                attachmentLayout.setPadding(Utils.dpToPx(16), 0, Utils.dpToPx(16), 0)
+                attachmentLayout.setPadding(16.dp, 0, 16.dp, 0)
 
                 val attachmentChip = Chip(attachmentLayout.context)
                 //attachmentChip.setChipBackgroundColorResource(ThemeUtils.getChipColorRes());
                 attachmentChip.layoutParams = chipLayoutParams
-                attachmentChip.height = Utils.dpToPx(40)
+                attachmentChip.chipMinHeight = 40.dp.toFloat()
+                //attachmentChip.height = Utils.dpToPx(40)
 
                 // show the file size or not
                 if (size == -1L)
@@ -312,11 +329,8 @@ class MessageFragment : Fragment(), CoroutineScope {
                 attachmentChip.isCloseIconVisible = false
                 // set the object's index in the attachmentList as the tag
                 attachmentChip.tag = index
-                attachmentChip.setOnClickListener { v ->
-                    if (v.tag is Int) {
-                        downloadAttachment(v.tag as Int)
-                    }
-                }
+                attachmentChip.onClick(attachmentOnClick)
+                attachmentChip.onLongClick(attachmentOnLongClick)
                 attachmentLayout.addView(attachmentChip)
 
                 val attachmentProgress = ProgressBar(attachmentLayout.context)
@@ -338,10 +352,10 @@ class MessageFragment : Fragment(), CoroutineScope {
         }
     }
 
-    private fun downloadAttachment(index: Int) {
+    private fun downloadAttachment(index: Int, forceDownload: Boolean = false) {
         val attachment = attachmentList[index]
 
-        if (attachment.downloaded != null) {
+        if (!forceDownload && attachment.downloaded != null) {
             Utils.openFile(activity, File(attachment.downloaded))
             return
         }

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeFragment.kt

@@ -438,7 +438,7 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
         if (b.textLayout.counterMaxLength != -1 && b.text.length() > b.textLayout.counterMaxLength)
             return
 
-        var textHtml = if (app.profile.loginStoreType != LoginStore.LOGIN_TYPE_VULCAN && app.profile.loginStoreType != LoginStore.LOGIN_TYPE_IDZIENNIK) {
+        var textHtml = if (app.profile.loginStoreType != LoginStore.LOGIN_TYPE_VULCAN) {
             HtmlCompat.toHtml(SpannableString(text), HtmlCompat.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL)
                     .replace("\n", "")
                     .replace(" dir=\"ltr\"", "")