Merge branch 'release/1.6.4'

* Extract intent utils to separate file

* Add add to calendar button in exam details dialog

* Set 8:00-8:45 start/end time

.editorconfig

@@ -0,0 +1,12 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=4
+
+[*.json]
+indent_size=2
+
+[*.{kt,kts}]
+disabled_rules=import-ordering,no-wildcard-imports

.idea/codeStyles/Project.xml

@@ -2,14 +2,6 @@
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
@@ -126,13 +118,6 @@
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
     </codeStyleSettings>
   </code_scheme>
 </component>

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Wulkanowy
+   Copyright 2022 Wulkanowy
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

app/build.gradle

@@ -22,8 +22,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 101
-        versionName "1.4.3"
+        versionCode 108
+        versionName "1.6.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -73,6 +73,8 @@ android {
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
         }
         debug {
+            minifyEnabled false
+            shrinkResources false
             resValue "string", "app_name", "Wulkanowy DEV"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
@@ -130,7 +132,7 @@ android {
 
     kotlinOptions {
         jvmTarget = "11"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
+        freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
@@ -149,8 +151,10 @@ kapt {
 
 play {
     defaultToAppBundles = false
-    track = 'beta'
-    updatePriority = 1
+    track = 'production'
+    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
+    userFraction = 0.50d
+    updatePriority = 3
     enabled.set(false)
 }
 
@@ -167,34 +171,34 @@ huaweiPublish {
 ext {
     work_manager = "2.7.1"
     android_hilt = "1.0.0"
-    room = "2.3.0"
+    room = "2.4.2"
     chucker = "3.5.2"
-    mockk = "1.12.1"
-    coroutines = "1.5.2"
+    mockk = "1.12.4"
+    coroutines = "1.6.1"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.4.3"
+    implementation "io.github.wulkanowy:sdk:1.6.4"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.7.0"
-    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
     implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.appcompat:appcompat:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.4.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
+    implementation "androidx.fragment:fragment-ktx:1.4.1"
     implementation "androidx.annotation:annotation:1.3.0"
 
-    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.preference:preference-ktx:1.2.0"
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.4.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
+    implementation "com.google.android.material:material:1.5.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.2.0'
@@ -202,7 +206,7 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -224,33 +228,34 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:1.4.0"
+    implementation "io.coil-kt:coil:2.0.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
-    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
-    implementation 'com.fredporciuncula:flow-preferences:1.6.0'
+    implementation 'me.xdrop:fuzzywuzzy:1.4.0'
+    implementation 'com.fredporciuncula:flow-preferences:1.7.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:29.0.0')
+    playImplementation platform('com.google.firebase:firebase-bom:30.0.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
-    playImplementation 'com.google.android.play:core:1.10.2'
+    playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:20.5.0'
+    playImplementation 'com.google.android.gms:play-services-ads:20.6.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.3.2.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.2.200'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.5.0.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.6.200'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
     debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
     debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.6'
+    debugImplementation 'com.github.haroldadmin:WhatTheStack:1.0.0-alpha04'
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.7.2'
+    testImplementation 'org.robolectric:robolectric:4.8.1'
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation "androidx.test:core:1.4.0"

app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt

@@ -6,6 +6,7 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import javax.inject.Singleton
 import javax.inject.Inject
 
+@Suppress("UNUSED_PARAMETER", "unused")
 @Singleton
 class InAppReviewHelper @Inject constructor(
     @ApplicationContext private val context: Context

app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt

@@ -7,6 +7,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
+@Suppress("UNUSED_PARAMETER", "unused")
 class InAppReviewHelper @Inject constructor(
     @ApplicationContext private val context: Context
 )  {
@@ -14,4 +15,4 @@ class InAppReviewHelper @Inject constructor(
     fun showInAppReview(activity: MainActivity) {
         // do nothing
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -114,7 +114,6 @@
             </intent-filter>
         </service>
 
-
         <receiver
             android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
             android:exported="true"

app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt

@@ -1,10 +1,7 @@
 package io.github.wulkanowy
 
 import android.app.Application
-import android.util.Log.DEBUG
-import android.util.Log.INFO
-import android.util.Log.VERBOSE
-import android.webkit.WebView
+import android.util.Log.*
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.yariksoffice.lingver.Lingver
@@ -12,12 +9,7 @@ import dagger.hilt.android.HiltAndroidApp
 import fr.bipi.tressence.file.FileLoggerTree
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.base.ThemeManager
-import io.github.wulkanowy.utils.ActivityLifecycleLogger
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.CrashLogExceptionTree
-import io.github.wulkanowy.utils.CrashLogTree
-import io.github.wulkanowy.utils.DebugLogTree
+import io.github.wulkanowy.utils.*
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -44,7 +36,6 @@ class WulkanowyApp : Application(), Configuration.Provider {
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
         initLogging()
-        fixWebViewLocale()
     }
 
     private fun initLogging() {
@@ -76,15 +67,6 @@ class WulkanowyApp : Application(), Configuration.Provider {
         }
     }
 
-    private fun fixWebViewLocale() {
-        //https://stackoverflow.com/questions/40398528/android-webview-language-changes-abruptly-on-android-7-0-and-above
-        try {
-            WebView(this).destroy()
-        } catch (e: Throwable) {
-            //Ignore exceptions
-        }
-    }
-
     override fun getWorkManagerConfiguration() = Configuration.Builder()
         .setWorkerFactory(workerFactory)
         .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)

app/src/main/java/io/github/wulkanowy/data/Resource.kt

@@ -1,23 +1,173 @@
 package io.github.wulkanowy.data
 
-data class Resource<T>(val status: Status, val data: T?, val error: Throwable?) {
-    companion object {
-        fun <T> success(data: T?): Resource<T> {
-            return Resource(Status.SUCCESS, data, null)
-        }
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import timber.log.Timber
 
-        fun <T> error(error: Throwable?, data: T? = null): Resource<T> {
-            return Resource(Status.ERROR, data, error)
-        }
+sealed class Resource<T> {
 
-        fun <T> loading(data: T? = null): Resource<T> {
-            return Resource(Status.LOADING, data, null)
-        }
+    open class Loading<T> : Resource<T>()
+
+    data class Intermediate<T>(val data: T) : Loading<T>()
+
+    data class Success<T>(val data: T) : Resource<T>()
+
+    data class Error<T>(val error: Throwable) : Resource<T>()
+}
+
+val <T> Resource<T>.dataOrNull: T?
+    get() = when (this) {
+        is Resource.Success -> this.data
+        is Resource.Intermediate -> this.data
+        is Resource.Loading -> null
+        is Resource.Error -> null
+    }
+
+val <T> Resource<T>.errorOrNull: Throwable?
+    get() = when (this) {
+        is Resource.Error -> this.error
+        else -> null
+    }
+
+fun <T> resourceFlow(block: suspend () -> T) = flow {
+    emit(Resource.Loading())
+    emit(Resource.Success(block()))
+}.catch { emit(Resource.Error(it)) }
+
+fun <T> flatResourceFlow(block: suspend () -> Flow<Resource<T>>) = flow {
+    emit(Resource.Loading())
+    emitAll(block().filter { it is Resource.Intermediate || it !is Resource.Loading })
+}.catch { emit(Resource.Error(it)) }
+
+fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
+    is Resource.Success -> Resource.Success(block(this.data))
+    is Resource.Intermediate -> Resource.Intermediate(block(this.data))
+    is Resource.Loading -> Resource.Loading()
+    is Resource.Error -> Resource.Error(this.error)
+}
+
+fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = false) = onEach {
+    val description = when (it) {
+        is Resource.Loading -> "started"
+        is Resource.Intermediate -> "intermediate data received" + if (showData) " (data: `${it.data}`)" else ""
+        is Resource.Success -> "success" + if (showData) " (data: `${it.data}`)" else ""
+        is Resource.Error -> "exception occurred: ${it.error}"
+    }
+    Timber.i("$name: $description")
+}
+
+fun <T, U> Flow<Resource<T>>.mapResourceData(block: (T) -> U) = map {
+    it.mapData(block)
+}
+
+fun <T> Flow<Resource<T>>.onResourceData(block: suspend (T) -> Unit) = onEach {
+    when (it) {
+        is Resource.Success -> block(it.data)
+        is Resource.Intermediate -> block(it.data)
+        is Resource.Error,
+        is Resource.Loading -> Unit
     }
 }
 
-enum class Status {
-    LOADING,
-    SUCCESS,
-    ERROR
+fun <T> Flow<Resource<T>>.onResourceLoading(block: suspend () -> Unit) = onEach {
+    if (it is Resource.Loading) {
+        block()
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceIntermediate(block: suspend (T) -> Unit) = onEach {
+    if (it is Resource.Intermediate) {
+        block(it.data)
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceSuccess(block: suspend (T) -> Unit) = onEach {
+    if (it is Resource.Success) {
+        block(it.data)
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceError(block: (Throwable) -> Unit) = onEach {
+    if (it is Resource.Error) {
+        block(it.error)
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceNotLoading(block: () -> Unit) = onEach {
+    if (it !is Resource.Loading) {
+        block()
+    }
+}
+
+suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it !is Resource.Loading }.first()
+
+suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it is Resource.Loading }.collect()
+
+inline fun <ResultType, RequestType> networkBoundResource(
+    mutex: Mutex = Mutex(),
+    showSavedOnLoading: Boolean = true,
+    crossinline isResultEmpty: (ResultType) -> Boolean,
+    crossinline query: () -> Flow<ResultType>,
+    crossinline fetch: suspend (ResultType) -> RequestType,
+    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
+    crossinline onFetchFailed: (Throwable) -> Unit = { },
+    crossinline shouldFetch: (ResultType) -> Boolean = { true },
+    crossinline filterResult: (ResultType) -> ResultType = { it }
+) = flow {
+    emit(Resource.Loading())
+
+    val data = query().first()
+    emitAll(if (shouldFetch(data)) {
+        val filteredResult = filterResult(data)
+
+        if (showSavedOnLoading && !isResultEmpty(filteredResult)) {
+            emit(Resource.Intermediate(filteredResult))
+        }
+
+        try {
+            val newData = fetch(data)
+            mutex.withLock { saveFetchResult(query().first(), newData) }
+            query().map { Resource.Success(filterResult(it)) }
+        } catch (throwable: Throwable) {
+            onFetchFailed(throwable)
+            query().map { Resource.Error(throwable) }
+        }
+    } else {
+        query().map { Resource.Success(filterResult(it)) }
+    })
+}
+
+@JvmName("networkBoundResourceWithMap")
+inline fun <ResultType, RequestType, T> networkBoundResource(
+    mutex: Mutex = Mutex(),
+    showSavedOnLoading: Boolean = true,
+    crossinline isResultEmpty: (T) -> Boolean,
+    crossinline query: () -> Flow<ResultType>,
+    crossinline fetch: suspend (ResultType) -> RequestType,
+    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
+    crossinline onFetchFailed: (Throwable) -> Unit = { },
+    crossinline shouldFetch: (ResultType) -> Boolean = { true },
+    crossinline mapResult: (ResultType) -> T
+) = flow {
+    emit(Resource.Loading())
+
+    val data = query().first()
+    emitAll(if (shouldFetch(data)) {
+        val mappedResult = mapResult(data)
+
+        if (showSavedOnLoading && !isResultEmpty(mappedResult)) {
+            emit(Resource.Intermediate(mappedResult))
+        }
+        try {
+            val newData = fetch(data)
+            mutex.withLock { saveFetchResult(query().first(), newData) }
+            query().map { Resource.Success(mapResult(it)) }
+        } catch (throwable: Throwable) {
+            onFetchFailed(throwable)
+            query().map { Resource.Error(throwable) }
+        }
+    } else {
+        query().map { Resource.Success(mapResult(it)) }
+    })
 }

app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt

@@ -1,114 +1,11 @@
 package io.github.wulkanowy.data.db
 
 import android.content.Context
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
+import androidx.room.*
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
-import androidx.room.TypeConverters
-import io.github.wulkanowy.data.db.dao.AdminMessageDao
-import io.github.wulkanowy.data.db.dao.AttendanceDao
-import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
-import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
-import io.github.wulkanowy.data.db.dao.ConferenceDao
-import io.github.wulkanowy.data.db.dao.ExamDao
-import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.dao.HomeworkDao
-import io.github.wulkanowy.data.db.dao.LuckyNumberDao
-import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
-import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.dao.MobileDeviceDao
-import io.github.wulkanowy.data.db.dao.NoteDao
-import io.github.wulkanowy.data.db.dao.NotificationDao
-import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.dao.ReportingUnitDao
-import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
-import io.github.wulkanowy.data.db.dao.SchoolDao
-import io.github.wulkanowy.data.db.dao.SemesterDao
-import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.data.db.dao.StudentInfoDao
-import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.dao.TeacherDao
-import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
-import io.github.wulkanowy.data.db.dao.TimetableDao
-import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
-import io.github.wulkanowy.data.db.entities.AdminMessage
-import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.db.entities.Conference
-import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradePartialStatistics
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Notification
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentInfo
-import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.data.db.entities.TimetableHeader
-import io.github.wulkanowy.data.db.migrations.Migration10
-import io.github.wulkanowy.data.db.migrations.Migration11
-import io.github.wulkanowy.data.db.migrations.Migration12
-import io.github.wulkanowy.data.db.migrations.Migration13
-import io.github.wulkanowy.data.db.migrations.Migration14
-import io.github.wulkanowy.data.db.migrations.Migration15
-import io.github.wulkanowy.data.db.migrations.Migration16
-import io.github.wulkanowy.data.db.migrations.Migration17
-import io.github.wulkanowy.data.db.migrations.Migration18
-import io.github.wulkanowy.data.db.migrations.Migration19
-import io.github.wulkanowy.data.db.migrations.Migration2
-import io.github.wulkanowy.data.db.migrations.Migration20
-import io.github.wulkanowy.data.db.migrations.Migration21
-import io.github.wulkanowy.data.db.migrations.Migration22
-import io.github.wulkanowy.data.db.migrations.Migration23
-import io.github.wulkanowy.data.db.migrations.Migration24
-import io.github.wulkanowy.data.db.migrations.Migration25
-import io.github.wulkanowy.data.db.migrations.Migration26
-import io.github.wulkanowy.data.db.migrations.Migration27
-import io.github.wulkanowy.data.db.migrations.Migration28
-import io.github.wulkanowy.data.db.migrations.Migration29
-import io.github.wulkanowy.data.db.migrations.Migration3
-import io.github.wulkanowy.data.db.migrations.Migration30
-import io.github.wulkanowy.data.db.migrations.Migration31
-import io.github.wulkanowy.data.db.migrations.Migration32
-import io.github.wulkanowy.data.db.migrations.Migration33
-import io.github.wulkanowy.data.db.migrations.Migration34
-import io.github.wulkanowy.data.db.migrations.Migration35
-import io.github.wulkanowy.data.db.migrations.Migration36
-import io.github.wulkanowy.data.db.migrations.Migration37
-import io.github.wulkanowy.data.db.migrations.Migration38
-import io.github.wulkanowy.data.db.migrations.Migration39
-import io.github.wulkanowy.data.db.migrations.Migration4
-import io.github.wulkanowy.data.db.migrations.Migration40
-import io.github.wulkanowy.data.db.migrations.Migration41
-import io.github.wulkanowy.data.db.migrations.Migration42
-import io.github.wulkanowy.data.db.migrations.Migration43
-import io.github.wulkanowy.data.db.migrations.Migration44
-import io.github.wulkanowy.data.db.migrations.Migration5
-import io.github.wulkanowy.data.db.migrations.Migration6
-import io.github.wulkanowy.data.db.migrations.Migration7
-import io.github.wulkanowy.data.db.migrations.Migration8
-import io.github.wulkanowy.data.db.migrations.Migration9
+import io.github.wulkanowy.data.db.dao.*
+import io.github.wulkanowy.data.db.entities.*
+import io.github.wulkanowy.data.db.migrations.*
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Singleton
 
@@ -146,6 +43,11 @@ import javax.inject.Singleton
         Notification::class,
         AdminMessage::class
     ],
+    autoMigrations = [
+        AutoMigration(from = 44, to = 45),
+        AutoMigration(from = 46, to = 47),
+        AutoMigration(from = 47, to = 48),
+    ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
 )
@@ -153,7 +55,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 44
+        const val VERSION_SCHEMA = 48
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -198,7 +100,8 @@ abstract class AppDatabase : RoomDatabase() {
             Migration41(sharedPrefProvider),
             Migration42(),
             Migration43(),
-            Migration44()
+            Migration44(),
+            Migration46(),
         )
 
         fun newInstance(

app/src/main/java/io/github/wulkanowy/data/db/Converters.kt

@@ -1,40 +1,36 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
+import io.github.wulkanowy.ui.modules.Destination
+import io.github.wulkanowy.utils.toTimestamp
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import java.time.*
+import java.util.*
 import java.time.Instant
 import java.time.LocalDate
-import java.time.LocalDateTime
 import java.time.Month
 import java.time.ZoneOffset
-import java.util.Date
+import java.util.*
 
 class Converters {
 
     private val json = Json
 
     @TypeConverter
-    fun timestampToDate(value: Long?): LocalDate? = value?.run {
-        Date(value).toInstant().atZone(ZoneOffset.UTC).toLocalDate()
-    }
+    fun timestampToLocalDate(value: Long?): LocalDate? =
+        value?.let(::Date)?.toInstant()?.atZone(ZoneOffset.UTC)?.toLocalDate()
 
     @TypeConverter
-    fun dateToTimestamp(date: LocalDate?): Long? {
-        return date?.atStartOfDay()?.toInstant(ZoneOffset.UTC)?.toEpochMilli()
-    }
+    fun dateToTimestamp(date: LocalDate?): Long? = date?.toTimestamp()
 
     @TypeConverter
-    fun timestampToTime(value: Long?): LocalDateTime? = value?.let {
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(value), ZoneOffset.UTC)
-    }
+    fun instantToTimestamp(instant: Instant?): Long? = instant?.toEpochMilli()
 
     @TypeConverter
-    fun timeToTimestamp(date: LocalDateTime?): Long? {
-        return date?.atZone(ZoneOffset.UTC)?.toInstant()?.toEpochMilli()
-    }
+    fun timestampToInstant(timestamp: Long?): Instant? = timestamp?.let(Instant::ofEpochMilli)
 
     @TypeConverter
     fun monthToInt(month: Month?) = month?.value
@@ -65,4 +61,11 @@ class Converters {
             emptyList() // handle errors from old gson Pair serialized data
         }
     }
+
+    @TypeConverter
+    fun destinationToString(destination: Destination) = json.encodeToString(destination)
+
+    @TypeConverter
+    fun stringToDestination(destination: String): Destination = json.decodeFromString(destination)
+
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt

@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Conference
 import kotlinx.coroutines.flow.Flow
-import java.time.LocalDateTime
+import java.time.Instant
 import javax.inject.Singleton
 
 @Dao
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface ConferenceDao : BaseDao<Conference> {
 
     @Query("SELECT * FROM Conferences WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :startDate")
-    fun loadAll(diaryId: Int, studentId: Int, startDate: LocalDateTime): Flow<List<Conference>>
+    fun loadAll(diaryId: Int, studentId: Int, startDate: Instant): Flow<List<Conference>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt

@@ -10,6 +10,6 @@ import javax.inject.Singleton
 @Singleton
 interface SchoolAnnouncementDao : BaseDao<SchoolAnnouncement> {
 
-    @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId")
+    @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId ORDER BY date DESC")
     fun loadAll(studentId: Int): Flow<List<SchoolAnnouncement>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt

@@ -1,12 +1,7 @@
 package io.github.wulkanowy.data.db.dao
 
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
+import androidx.room.*
 import androidx.room.OnConflictStrategy.ABORT
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
@@ -38,6 +33,10 @@ abstract class StudentDao {
     @Query("SELECT * FROM Students")
     abstract suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
 
+    @Transaction
+    @Query("SELECT * FROM Students WHERE id = :id")
+    abstract suspend fun loadStudentWithSemestersById(id: Long): StudentWithSemesters?
+
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
     abstract suspend fun updateCurrent(id: Long)
 

app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableAdditionalDao.kt

@@ -5,6 +5,7 @@ import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
 import kotlinx.coroutines.flow.Flow
 import java.time.LocalDate
+import java.util.UUID
 import javax.inject.Singleton
 
 @Dao
@@ -12,5 +13,13 @@ import javax.inject.Singleton
 interface TimetableAdditionalDao : BaseDao<TimetableAdditional> {
 
     @Query("SELECT * FROM TimetableAdditional WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<TimetableAdditional>>
+    fun loadAll(
+        diaryId: Int,
+        studentId: Int,
+        from: LocalDate,
+        end: LocalDate
+    ): Flow<List<TimetableAdditional>>
+
+    @Query("DELETE FROM TimetableAdditional WHERE repeat_id = :repeatId")
+    suspend fun deleteAllByRepeatId(repeatId: UUID)
 }

app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt

@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import java.io.Serializable
-import java.time.LocalDateTime
+import java.time.Instant
 
 @Entity(tableName = "Conferences")
 data class Conference(
@@ -27,7 +27,7 @@ data class Conference(
     @ColumnInfo(name = "conference_id")
     val conferenceId: Int,
 
-    val date: LocalDateTime
+    val date: Instant,
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSemesterStatistics.kt

@@ -24,5 +24,8 @@ data class GradeSemesterStatistics(
     var id: Long = 0
 
     @Transient
-    var average: String = ""
+    var classAverage: String = ""
+
+    @Transient
+    var studentAverage: String = ""
 }

app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt

@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.time.LocalDateTime
+import java.time.Instant
 
 @Entity(tableName = "GradesSummary")
 data class GradeSummary(
@@ -45,8 +45,8 @@ data class GradeSummary(
     var isFinalGradeNotified: Boolean = true
 
     @ColumnInfo(name = "predicted_grade_last_change")
-    var predictedGradeLastChange: LocalDateTime = LocalDateTime.now()
+    var predictedGradeLastChange: Instant = Instant.now()
 
     @ColumnInfo(name = "final_grade_last_change")
-    var finalGradeLastChange: LocalDateTime = LocalDateTime.now()
+    var finalGradeLastChange: Instant = Instant.now()
 }

app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt

@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import java.io.Serializable
-import java.time.LocalDateTime
+import java.time.Instant
 
 @Entity(tableName = "Messages")
 data class Message(
@@ -29,7 +29,7 @@ data class Message(
 
     val subject: String,
 
-    val date: LocalDateTime,
+    val date: Instant,
 
     @ColumnInfo(name = "folder_id")
     val folderId: Int,

app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt

@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import java.io.Serializable
-import java.time.LocalDateTime
+import java.time.Instant
 
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
@@ -17,7 +17,7 @@ data class MobileDevice(
 
     val name: String,
 
-    val date: LocalDateTime
+    val date: Instant,
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/entities/Notification.kt

@@ -4,7 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import io.github.wulkanowy.services.sync.notifications.NotificationType
-import java.time.LocalDateTime
+import io.github.wulkanowy.ui.modules.Destination
+import java.time.Instant
 
 @Entity(tableName = "Notifications")
 data class Notification(
@@ -18,7 +19,10 @@ data class Notification(
 
     val type: NotificationType,
 
-    val date: LocalDateTime,
+    @ColumnInfo(defaultValue = "{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}")
+    val destination: Destination,
+
+    val date: Instant,
 
     val data: String? = null
 ) {

app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt

@@ -7,7 +7,12 @@ import androidx.room.PrimaryKey
 import java.io.Serializable
 import java.time.LocalDate
 
-@Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
+@Entity(
+    tableName = "Semesters", indices = [Index(
+        value = ["student_id", "diary_id", "kindergarten_diary_id", "semester_id"],
+        unique = true
+    )]
+)
 data class Semester(
 
     @ColumnInfo(name = "student_id")
@@ -16,6 +21,9 @@ data class Semester(
     @ColumnInfo(name = "diary_id")
     val diaryId: Int,
 
+    @ColumnInfo(name = "kindergarten_diary_id", defaultValue = "0")
+    val kindergartenDiaryId: Int,
+
     @ColumnInfo(name = "diary_name")
     val diaryName: String,
 
@@ -37,12 +45,11 @@ data class Semester(
 
     @ColumnInfo(name = "unit_id")
     val unitId: Int
-): Serializable {
+) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
 
-
     @ColumnInfo(name = "is_current")
     var current: Boolean = false
 }

app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt

@@ -5,7 +5,7 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import java.io.Serializable
-import java.time.LocalDateTime
+import java.time.Instant
 
 @Entity(
     tableName = "Students",
@@ -74,7 +74,7 @@ data class Student(
     val isCurrent: Boolean,
 
     @ColumnInfo(name = "registration_date")
-    val registrationDate: LocalDateTime
+    val registrationDate: Instant,
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt

@@ -4,8 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import java.io.Serializable
+import java.time.Instant
 import java.time.LocalDate
-import java.time.LocalDateTime
 
 @Entity(tableName = "Timetable")
 data class Timetable(
@@ -18,9 +18,9 @@ data class Timetable(
 
     val number: Int,
 
-    val start: LocalDateTime,
+    val start: Instant,
 
-    val end: LocalDateTime,
+    val end: Instant,
 
     val date: LocalDate,
 

app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableAdditional.kt

@@ -4,8 +4,9 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import java.io.Serializable
+import java.time.Instant
 import java.time.LocalDate
-import java.time.LocalDateTime
+import java.util.*
 
 @Entity(tableName = "TimetableAdditional")
 data class TimetableAdditional(
@@ -16,9 +17,9 @@ data class TimetableAdditional(
     @ColumnInfo(name = "diary_id")
     val diaryId: Int,
 
-    val start: LocalDateTime,
+    val start: Instant,
 
-    val end: LocalDateTime,
+    val end: Instant,
 
     val date: LocalDate,
 
@@ -27,4 +28,10 @@ data class TimetableAdditional(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "repeat_id", defaultValue = "NULL")
+    var repeatId: UUID? = null
+
+    @ColumnInfo(name = "is_added_by_user", defaultValue = "0")
+    var isAddedByUser: Boolean = false
 }

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration12.kt

@@ -43,12 +43,14 @@ class Migration12 : Migration(11, 12) {
 
     private fun getStudentsIds(database: SupportSQLiteDatabase): List<Int> {
         val students = mutableListOf<Int>()
-        val studentsCursor = database.query("SELECT student_id FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0))
-            } while (studentsCursor.moveToNext())
+        database.query("SELECT student_id FROM Students").use {
+            if (it.moveToFirst()) {
+                do {
+                    students.add(it.getInt(0))
+                } while (it.moveToNext())
+            }
         }
+
         return students
     }
 

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration13.kt

@@ -25,12 +25,14 @@ class Migration13 : Migration(12, 13) {
 
     private fun getStudentsIds(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
         val students = mutableListOf<Pair<Int, String>>()
-        val studentsCursor = database.query("SELECT id, school_name FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0) to studentsCursor.getString(1))
-            } while (studentsCursor.moveToNext())
+        database.query("SELECT id, school_name FROM Students").use {
+            if (it.moveToFirst()) {
+                do {
+                    students.add(it.getInt(0) to it.getString(1))
+                } while (it.moveToNext())
+            }
         }
+
         return students
     }
 
@@ -42,12 +44,14 @@ class Migration13 : Migration(12, 13) {
 
     private fun getStudentsAndClassIds(database: SupportSQLiteDatabase): List<Pair<Int, Int>> {
         val students = mutableListOf<Pair<Int, Int>>()
-        val studentsCursor = database.query("SELECT student_id, class_id FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0) to studentsCursor.getInt(1))
-            } while (studentsCursor.moveToNext())
+        database.query("SELECT student_id, class_id FROM Students").use {
+            if (it.moveToFirst()) {
+                do {
+                    students.add(it.getInt(0) to it.getInt(1))
+                } while (it.moveToNext())
+            }
         }
+
         return students
     }
 

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt

@@ -22,24 +22,28 @@ class Migration27 : Migration(26, 27) {
 
     private fun getStudentsIdsAndNames(database: SupportSQLiteDatabase): MutableList<Triple<Long, Int, String>> {
         val students = mutableListOf<Triple<Long, Int, String>>()
-        val studentsCursor = database.query("SELECT id, user_login_id, student_name FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(Triple(studentsCursor.getLong(0), studentsCursor.getInt(1), studentsCursor.getString(2)))
-            } while (studentsCursor.moveToNext())
+        database.query("SELECT id, user_login_id, student_name FROM Students").use {
+            if (it.moveToFirst()) {
+                do {
+                    students.add(Triple(it.getLong(0), it.getInt(1), it.getString(2)))
+                } while (it.moveToNext())
+            }
         }
+
         return students
     }
 
     private fun getReportingUnits(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
         val units = mutableListOf<Pair<Int, String>>()
-        val unitsCursor = database.query("SELECT sender_id, sender_name FROM ReportingUnits")
-        if (unitsCursor.moveToFirst()) {
-            do {
-                units.add(unitsCursor.getInt(0) to unitsCursor.getString(1))
-            } while (unitsCursor.moveToNext())
+        database.query("SELECT sender_id, sender_name FROM ReportingUnits").use {
+            if (it.moveToFirst()) {
+                do {
+                    units.add(it.getInt(0) to it.getString(1))
+                } while (it.moveToNext())
+            }
         }
 
+
         return units
     }
 }

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration35.kt

@@ -10,15 +10,17 @@ class Migration35(private val appInfo: AppInfo) : Migration(34, 35) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("ALTER TABLE Students ADD COLUMN `avatar_color` INTEGER NOT NULL DEFAULT 0")
 
-        val studentsCursor = database.query("SELECT * FROM Students")
-
-        while (studentsCursor.moveToNext()) {
-            val studentId = studentsCursor.getLongOrNull(0)
-            database.execSQL(
-                """UPDATE Students 
-                SET avatar_color = ${appInfo.defaultColorsForAvatar.random()} 
-                WHERE id = $studentId"""
-            )
+        database.query("SELECT * FROM Students").use {
+            while (it.moveToNext()) {
+                val studentId = it.getLongOrNull(0)
+                database.execSQL(
+                    """
+                        UPDATE Students
+                        SET avatar_color = ${appInfo.defaultColorsForAvatar.random()}
+                        WHERE id = $studentId
+                    """
+                )
+            }
         }
     }
 }

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration41.kt

@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.migrations
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.ui.modules.grade.GradeExpandMode
+import io.github.wulkanowy.data.enums.GradeExpandMode
 
 class Migration41(private val sharedPrefProvider: SharedPrefProvider) : Migration(40, 41) {
 

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration46.kt

@@ -0,0 +1,102 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import java.time.Instant
+import java.time.ZoneId
+import java.time.ZoneOffset
+
+class Migration46 : Migration(45, 46) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        migrateConferences(database)
+        migrateMessages(database)
+        migrateMobileDevices(database)
+        migrateNotifications(database)
+        migrateTimetable(database)
+        migrateTimetableAdditional(database)
+    }
+
+    private fun migrateConferences(database: SupportSQLiteDatabase) {
+        database.query("SELECT * FROM Conferences").use {
+            while (it.moveToNext()) {
+                val id = it.getLong(it.getColumnIndexOrThrow("id"))
+                val timestampLocal = it.getLong(it.getColumnIndexOrThrow("date"))
+                val timestampUtc = timestampLocal.timestampLocalToUTC()
+
+                database.execSQL("UPDATE Conferences SET date = $timestampUtc WHERE id = $id")
+            }
+        }
+    }
+
+    private fun migrateMessages(database: SupportSQLiteDatabase) {
+        database.query("SELECT * FROM Messages").use {
+            while (it.moveToNext()) {
+                val id = it.getLong(it.getColumnIndexOrThrow("id"))
+                val timestampLocal = it.getLong(it.getColumnIndexOrThrow("date"))
+                val timestampUtc = timestampLocal.timestampLocalToUTC()
+
+                database.execSQL("UPDATE Messages SET date = $timestampUtc WHERE id = $id")
+            }
+        }
+    }
+
+    private fun migrateMobileDevices(database: SupportSQLiteDatabase) {
+        database.query("SELECT * FROM MobileDevices").use {
+            while (it.moveToNext()) {
+                val id = it.getLong(it.getColumnIndexOrThrow("id"))
+                val timestampLocal = it.getLong(it.getColumnIndexOrThrow("date"))
+                val timestampUtc = timestampLocal.timestampLocalToUTC()
+
+                database.execSQL("UPDATE MobileDevices SET date = $timestampUtc WHERE id = $id")
+            }
+        }
+    }
+
+    private fun migrateNotifications(database: SupportSQLiteDatabase) {
+        database.query("SELECT * FROM Notifications").use {
+            while (it.moveToNext()) {
+                val id = it.getLong(it.getColumnIndexOrThrow("id"))
+                val timestampLocal = it.getLong(it.getColumnIndexOrThrow("date"))
+                val timestampUtc = timestampLocal.timestampLocalToUTC()
+
+                database.execSQL("UPDATE Notifications SET date = $timestampUtc WHERE id = $id")
+            }
+        }
+    }
+
+    private fun migrateTimetable(database: SupportSQLiteDatabase) {
+        database.query("SELECT * FROM Timetable").use {
+            while (it.moveToNext()) {
+                val id = it.getLong(it.getColumnIndexOrThrow("id"))
+                val timestampLocalStart = it.getLong(it.getColumnIndexOrThrow("start"))
+                val timestampLocalEnd = it.getLong(it.getColumnIndexOrThrow("end"))
+                val timestampUtcStart = timestampLocalStart.timestampLocalToUTC()
+                val timestampUtcEnd = timestampLocalEnd.timestampLocalToUTC()
+
+                database.execSQL("UPDATE Timetable SET start = $timestampUtcStart, end = $timestampUtcEnd WHERE id = $id")
+            }
+        }
+    }
+
+    private fun migrateTimetableAdditional(database: SupportSQLiteDatabase) {
+        database.query("SELECT * FROM TimetableAdditional").use {
+            while (it.moveToNext()) {
+                val id = it.getLong(it.getColumnIndexOrThrow("id"))
+                val timestampLocalStart = it.getLong(it.getColumnIndexOrThrow("start"))
+                val timestampLocalEnd = it.getLong(it.getColumnIndexOrThrow("end"))
+                val timestampUtcStart = timestampLocalStart.timestampLocalToUTC()
+                val timestampUtcEnd = timestampLocalEnd.timestampLocalToUTC()
+
+                database.execSQL("UPDATE TimetableAdditional SET start = $timestampUtcStart, end = $timestampUtcEnd WHERE id = $id")
+            }
+        }
+    }
+
+    private fun Long.timestampLocalToUTC(): Long = Instant.ofEpochMilli(this)
+        .atZone(ZoneOffset.UTC)
+        .withZoneSameLocal(ZoneId.of("Europe/Warsaw"))
+        .withZoneSameInstant(ZoneId.systemDefault())
+        .toInstant()
+        .toEpochMilli()
+}

app/src/main/java/io/github/wulkanowy/data/enums/AppTheme.kt

@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.enums
+
+enum class AppTheme(val value: String) {
+    SYSTEM("system"),
+    LIGHT("light"),
+    DARK("dark"),
+    BLACK("black");
+
+    companion object {
+        fun getByValue(value: String) = values().find { it.value == value } ?: LIGHT
+    }
+}

app/src/main/java/io/github/wulkanowy/data/enums/GradeColorTheme.kt

@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.enums
+
+import java.io.Serializable
+
+enum class GradeColorTheme(val value: String) : Serializable {
+    VULCAN("vulcan"),
+    MATERIAL("material"),
+    GRADE_COLOR("grade_color");
+
+    companion object {
+        fun getByValue(value: String) = values().find { it.value == value } ?: VULCAN
+    }
+}

app/src/main/java/io/github/wulkanowy/data/enums/GradeExpandMode.kt

@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.enums
+
+enum class GradeExpandMode(val value: String) {
+    ONE("one"),
+    UNLIMITED("any"),
+    ALWAYS_EXPANDED("always");
+
+    companion object {
+        fun getByValue(value: String) = values().find { it.value == value } ?: ONE
+    }
+}

app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt

@@ -0,0 +1,10 @@
+package io.github.wulkanowy.data.enums
+
+enum class GradeSortingMode(val value: String) {
+    ALPHABETIC("alphabetic"),
+    DATE("date");
+
+    companion object {
+        fun getByValue(value: String) = values().find { it.value == value } ?: ALPHABETIC
+    }
+}

app/src/main/java/io/github/wulkanowy/data/enums/TimetableMode.kt

@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.enums
+
+enum class TimetableMode(val value: String) {
+    WHOLE_PLAN("yes"),
+    ONLY_CURRENT_GROUP("no"),
+    SMALL_OTHER_GROUP("small");
+
+    companion object {
+        fun getByValue(value: String) = values().find { it.value == value } ?: ONLY_CURRENT_GROUP
+    }
+}

app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt

@@ -10,7 +10,7 @@ fun List<SdkConference>.mapToEntities(semester: Semester) = map {
         diaryId = semester.diaryId,
         agenda = it.agenda,
         conferenceId = it.id,
-        date = it.date,
+        date = it.dateZoned.toInstant(),
         presentOnConference = it.presentOnConference,
         subject = it.subject,
         title = it.title

app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt

@@ -6,7 +6,7 @@ import io.github.wulkanowy.sdk.pojo.DirectorInformation as SdkDirectorInformatio
 
 fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
     SchoolAnnouncement(
-        studentId = student.studentId,
+        studentId = student.userLoginId,
         date = it.date,
         subject = it.subject,
         content = it.content,

app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt

@@ -4,7 +4,7 @@ import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Student
-import java.time.LocalDateTime
+import java.time.Instant
 import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
 import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -18,7 +18,7 @@ fun List<SdkMessage>.mapToEntities(student: Student) = map {
         senderId = it.sender?.loginId ?: 0,
         recipient = it.recipients.singleOrNull()?.name ?: "Wielu adresatów",
         subject = it.subject.trim(),
-        date = it.date ?: LocalDateTime.now(),
+        date = it.dateZoned?.toInstant() ?: Instant.now(),
         folderId = it.folderId,
         unread = it.unread ?: false,
         removed = it.removed,

app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt

@@ -3,13 +3,13 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.sdk.pojo.Token as SdkToken
 import io.github.wulkanowy.sdk.pojo.Device as SdkDevice
+import io.github.wulkanowy.sdk.pojo.Token as SdkToken
 
 fun List<SdkDevice>.mapToEntities(semester: Semester) = map {
     MobileDevice(
         userLoginId = semester.studentId,
-        date = it.createDate,
+        date = it.createDateZoned.toInstant(),
         deviceId = it.id,
         name = it.name
     )

app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt

@@ -7,6 +7,7 @@ fun List<SdkSemester>.mapToEntities(studentId: Int) = map {
     Semester(
         studentId = studentId,
         diaryId = it.diaryId,
+        kindergartenDiaryId = it.kindergartenDiaryId,
         diaryName = it.diaryName,
         schoolYear = it.schoolYear,
         semesterId = it.semesterId,

app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt

@@ -2,7 +2,7 @@ package io.github.wulkanowy.data.mappers
 
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import java.time.LocalDateTime
+import java.time.Instant
 import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
 
 fun List<SdkStudent>.mapToEntities(password: String = "", colors: List<Long>) = map {
@@ -24,7 +24,7 @@ fun List<SdkStudent>.mapToEntities(password: String = "", colors: List<Long>) =
             scrapperBaseUrl = it.scrapperBaseUrl,
             loginType = it.loginType.name,
             isCurrent = false,
-            registrationDate = LocalDateTime.now(),
+            registrationDate = Instant.now(),
             mobileBaseUrl = it.mobileBaseUrl,
             privateKey = it.privateKey,
             certificateKey = it.certificateKey,

app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt

@@ -21,8 +21,8 @@ fun List<SdkTimetable>.mapToEntities(semester: Semester) = map {
         studentId = semester.studentId,
         diaryId = semester.diaryId,
         number = it.number,
-        start = it.start,
-        end = it.end,
+        start = it.startZoned.toInstant(),
+        end = it.endZoned.toInstant(),
         date = it.date,
         subject = it.subject,
         subjectOld = it.subjectOld,
@@ -45,8 +45,8 @@ fun List<SdkTimetableAdditional>.mapToEntities(semester: Semester) = map {
         diaryId = semester.diaryId,
         subject = it.subject,
         date = it.date,
-        start = it.start,
-        end = it.end
+        start = it.startZoned.toInstant(),
+        end = it.endZoned.toInstant(),
     )
 }
 

app/src/main/java/io/github/wulkanowy/data/pojos/NotificationData.kt

@@ -1,10 +1,10 @@
 package io.github.wulkanowy.data.pojos
 
-import android.content.Intent
 import io.github.wulkanowy.services.sync.notifications.NotificationType
+import io.github.wulkanowy.ui.modules.Destination
 
 data class NotificationData(
-    val intentToStart: Intent,
+    val destination: Destination,
     val title: String,
     val content: String
 )
@@ -13,7 +13,7 @@ data class GroupNotificationData(
     val notificationDataList: List<NotificationData>,
     val title: String,
     val content: String,
-    val intentToStart: Intent,
+    val destination: Destination,
     val type: NotificationType
 )
 

app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt

@@ -3,9 +3,8 @@ package io.github.wulkanowy.data.repositories
 import io.github.wulkanowy.data.api.AdminMessageService
 import io.github.wulkanowy.data.db.dao.AdminMessageDao
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.networkBoundResource
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -14,23 +13,18 @@ import javax.inject.Singleton
 class AdminMessageRepository @Inject constructor(
     private val adminMessageService: AdminMessageService,
     private val adminMessageDao: AdminMessageDao,
-    private val appInfo: AppInfo,
-    private val refreshHelper: AutoRefreshHelper,
+    private val appInfo: AppInfo
 ) {
     private val saveFetchResultMutex = Mutex()
 
-    private val cacheKey = "admin_messages"
-
-    suspend fun getAdminMessages(student: Student, forceRefresh: Boolean) = networkBoundResource(
+    suspend fun getAdminMessages(student: Student) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it == null },
         query = { adminMessageDao.loadAll() },
         fetch = { adminMessageService.getAdminMessages() },
-        shouldFetch = {
-            refreshHelper.shouldBeRefreshed(cacheKey) || forceRefresh
-        },
+        shouldFetch = { true },
         saveFetchResult = { oldItems, newItems ->
             adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
-            refreshHelper.updateLastRefreshTimestamp(cacheKey)
         },
         showSavedOnLoading = false,
         mapResult = { adminMessages ->

app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt

@@ -5,15 +5,10 @@ import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Absent
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
@@ -42,6 +37,7 @@ class AttendanceRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, semester, start, end)
@@ -52,7 +48,8 @@ class AttendanceRepository @Inject constructor(
             attendanceDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
         },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getAttendance(start.monday, end.sunday, semester.semesterId)
                 .mapToEntities(semester)
         },
@@ -90,7 +87,8 @@ class AttendanceRepository @Inject constructor(
                 timeId = attendance.timeId
             )
         }
-        sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+        sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .excuseForAbsence(items, reason)
     }
 }

app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt

@@ -4,11 +4,11 @@ import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -32,13 +32,15 @@ class AttendanceSummaryRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, semester))
             it.isEmpty() || forceRefresh || isExpired
         },
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getAttendanceSummary(subjectId)
                 .mapToEntities(semester, subjectId)
         },

app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt

@@ -4,14 +4,9 @@ import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
@@ -36,6 +31,7 @@ class CompletedLessonsRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, semester, start, end)
@@ -51,7 +47,8 @@ class CompletedLessonsRepository @Inject constructor(
             )
         },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getCompletedLessons(start.monday, end.sunday)
                 .mapToEntities(semester)
         },

app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt

@@ -5,17 +5,15 @@ import io.github.wulkanowy.data.db.entities.Conference
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import java.time.Instant
-import java.time.LocalDateTime
-import java.time.ZoneOffset
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -35,9 +33,10 @@ class ConferenceRepository @Inject constructor(
         semester: Semester,
         forceRefresh: Boolean,
         notify: Boolean = false,
-        startDate: LocalDateTime = LocalDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC),
+        startDate: Instant = Instant.EPOCH,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, semester))
             it.isEmpty() || forceRefresh || isExpired
@@ -46,7 +45,8 @@ class ConferenceRepository @Inject constructor(
             conferenceDb.loadAll(semester.diaryId, student.studentId, startDate)
         },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getConferences()
                 .mapToEntities(semester)
                 .filter { it.date >= startDate }
@@ -66,7 +66,7 @@ class ConferenceRepository @Inject constructor(
         conferenceDb.loadAll(
             diaryId = semester.diaryId,
             studentId = semester.studentId,
-            startDate = LocalDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC)
+            startDate = Instant.EPOCH,
         )
 
     suspend fun updateConference(conference: List<Conference>) = conferenceDb.updateAll(conference)

app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt

@@ -5,14 +5,9 @@ import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.endExamsDay
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.startExamsDay
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
@@ -39,6 +34,7 @@ class ExamRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, semester, start, end)
@@ -54,7 +50,8 @@ class ExamRepository @Inject constructor(
             )
         },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getExams(start.startExamsDay, start.endExamsDay, semester.semesterId)
                 .mapToEntities(semester)
         },

app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt

@@ -7,17 +7,14 @@ import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
-import java.time.LocalDateTime
+import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -40,6 +37,10 @@ class GradeRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = {
+            //When details is empty and summary is not, app will not use summary cache - edge case
+            it.first.isEmpty()
+        },
         shouldFetch = { (details, summaries) ->
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, semester))
             details.isEmpty() || summaries.isEmpty() || forceRefresh || isExpired
@@ -51,7 +52,7 @@ class GradeRepository @Inject constructor(
         },
         fetch = {
             val (details, summary) = sdk.init(student)
-                .switchDiary(semester.diaryId, semester.schoolYear)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGrades(semester.semesterId)
 
             details.mapToEntities(semester) to summary.mapToEntities(semester)
@@ -70,8 +71,8 @@ class GradeRepository @Inject constructor(
         newDetails: List<Grade>,
         notify: Boolean
     ) {
-        val notifyBreakDate = oldGrades.maxByOrNull {it.date }
-            ?.date ?: student.registrationDate.toLocalDate()
+        val notifyBreakDate = oldGrades.maxByOrNull { it.date }?.date
+            ?: student.registrationDate.toLocalDate()
         gradeDb.deleteAll(oldGrades uniqueSubtract newDetails)
         gradeDb.insertAll((newDetails uniqueSubtract oldGrades).onEach {
             if (it.date >= notifyBreakDate) it.apply {
@@ -101,13 +102,13 @@ class GradeRepository @Inject constructor(
             }
 
             summary.predictedGradeLastChange = when {
-                oldSummary == null -> LocalDateTime.now()
-                summary.predictedGrade != oldSummary.predictedGrade -> LocalDateTime.now()
+                oldSummary == null -> Instant.now()
+                summary.predictedGrade != oldSummary.predictedGrade -> Instant.now()
                 else -> oldSummary.predictedGradeLastChange
             }
             summary.finalGradeLastChange = when {
-                oldSummary == null -> LocalDateTime.now()
-                summary.finalGrade != oldSummary.finalGrade -> LocalDateTime.now()
+                oldSummary == null -> Instant.now()
+                summary.finalGrade != oldSummary.finalGrade -> Instant.now()
                 else -> oldSummary.finalGradeLastChange
             }
         })

app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt

@@ -11,14 +11,14 @@ import io.github.wulkanowy.data.mappers.mapPartialToStatisticItems
 import io.github.wulkanowy.data.mappers.mapPointsToStatisticsItems
 import io.github.wulkanowy.data.mappers.mapSemesterToStatisticItems
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
-import java.util.Locale
+import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -46,6 +46,7 @@ class GradeStatisticsRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = partialMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(partialCacheKey, semester)
@@ -54,7 +55,8 @@ class GradeStatisticsRepository @Inject constructor(
         },
         query = { gradePartialStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesPartialStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
@@ -66,20 +68,16 @@ class GradeStatisticsRepository @Inject constructor(
         mapResult = { items ->
             when (subjectName) {
                 "Wszystkie" -> {
-                    val numerator = items.map {
-                        it.classAverage.replace(",", ".").toDoubleOrNull() ?: .0
-                    }.filterNot { it == .0 }
-                    (items.reversed() + GradePartialStatistics(
+                    val summaryItem = GradePartialStatistics(
                         studentId = semester.studentId,
                         semesterId = semester.semesterId,
                         subject = subjectName,
-                        classAverage = if (numerator.isEmpty()) "" else numerator.average().let {
-                            "%.2f".format(Locale.FRANCE, it)
-                        },
-                        studentAverage = "",
+                        classAverage = items.map { it.classAverage }.getSummaryAverage(),
+                        studentAverage = items.map { it.studentAverage }.getSummaryAverage(),
                         classAmounts = items.map { it.classAmounts }.sumGradeAmounts(),
                         studentAmounts = items.map { it.studentAmounts }.sumGradeAmounts()
-                    )).reversed()
+                    )
+                    listOf(summaryItem) + items
                 }
                 else -> items.filter { it.subject == subjectName }
             }.mapPartialToStatisticItems()
@@ -93,6 +91,7 @@ class GradeStatisticsRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = semesterMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(semesterCacheKey, semester)
@@ -101,7 +100,8 @@ class GradeStatisticsRepository @Inject constructor(
         },
         query = { gradeSemesterStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesSemesterStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
@@ -114,29 +114,29 @@ class GradeStatisticsRepository @Inject constructor(
             val itemsWithAverage = items.map { item ->
                 item.copy().apply {
                     val denominator = item.amounts.sum()
-                    average = if (denominator == 0) "" else {
+                    classAverage = if (denominator == 0) "" else {
                         (item.amounts.mapIndexed { gradeValue, amount ->
                             (gradeValue + 1) * amount
-                        }.sum().toDouble() / denominator).let {
-                            "%.2f".format(Locale.FRANCE, it)
-                        }
+                        }.sum().toDouble() / denominator).asAverageString()
                     }
                 }
             }
             when (subjectName) {
-                "Wszystkie" -> (itemsWithAverage.reversed() + GradeSemesterStatistics(
-                    studentId = semester.studentId,
-                    semesterId = semester.semesterId,
-                    subject = subjectName,
-                    amounts = itemsWithAverage.map { it.amounts }.sumGradeAmounts(),
-                    studentGrade = 0
-                ).apply {
-                    average = itemsWithAverage.mapNotNull {
-                        it.average.replace(",", ".").toDoubleOrNull()
-                    }.average().let {
-                        "%.2f".format(Locale.FRANCE, it)
+                "Wszystkie" -> {
+                    val summaryItem = GradeSemesterStatistics(
+                        studentId = semester.studentId,
+                        semesterId = semester.semesterId,
+                        subject = subjectName,
+                        amounts = itemsWithAverage.map { it.amounts }.sumGradeAmounts(),
+                        studentGrade = 0,
+                    ).apply {
+                        classAverage = itemsWithAverage.map { it.classAverage }.getSummaryAverage()
+                        studentAverage = items
+                            .mapNotNull { summary -> summary.studentGrade.takeIf { it != 0 } }
+                            .average().asAverageString()
                     }
-                }).reversed()
+                    listOf(summaryItem) + itemsWithAverage
+                }
                 else -> itemsWithAverage.filter { it.subject == subjectName }
             }.mapSemesterToStatisticItems()
         }
@@ -149,13 +149,15 @@ class GradeStatisticsRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = pointsMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(pointsCacheKey, semester))
             it.isEmpty() || forceRefresh || isExpired
         },
         query = { gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesPointsStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
@@ -172,6 +174,19 @@ class GradeStatisticsRepository @Inject constructor(
         }
     )
 
+    private fun List<String>.getSummaryAverage(): String {
+        val averages = mapNotNull {
+            it.replace(",", ".").toDoubleOrNull()
+        }
+
+        return averages.average()
+            .asAverageString()
+            .takeIf { averages.isNotEmpty() }
+            .orEmpty()
+    }
+
+    private fun Double.asAverageString(): String = "%.2f".format(Locale.FRANCE, this)
+
     private fun List<List<Int>>.sumGradeAmounts(): List<Int> {
         val result = mutableListOf(0, 0, 0, 0, 0, 0)
         forEach {

app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt

@@ -5,14 +5,9 @@ import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
@@ -38,6 +33,7 @@ class HomeworkRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, semester, start, end)
@@ -53,7 +49,8 @@ class HomeworkRepository @Inject constructor(
             )
         },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getHomework(start.monday, end.sunday)
                 .mapToEntities(semester)
         },

app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt

@@ -4,9 +4,9 @@ import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
@@ -29,6 +29,7 @@ class LuckyNumberRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it == null },
         shouldFetch = { it == null || forceRefresh },
         query = { luckyNumberDb.load(student.studentId, now()) },
         fetch = {

app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt

@@ -7,15 +7,12 @@ import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.MessageDraft
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
@@ -23,7 +20,6 @@ import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -59,6 +55,7 @@ class MessageRepository @Inject constructor(
         notify: Boolean = false,
     ): Flow<Resource<List<Message>>> = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, student, folder)
@@ -106,8 +103,9 @@ class MessageRepository @Inject constructor(
         message: Message,
         markAsRead: Boolean = false,
     ): Flow<Resource<MessageWithAttachment?>> = networkBoundResource(
+        isResultEmpty = { it?.message?.content.isNullOrBlank() },
         shouldFetch = {
-            checkNotNull(it, { "This message no longer exist!" })
+            checkNotNull(it) { "This message no longer exist!" }
             Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
             it.message.unread || it.message.content.isEmpty()
         },
@@ -123,7 +121,7 @@ class MessageRepository @Inject constructor(
             }
         },
         saveFetchResult = { old, (downloadedMessage, attachments) ->
-            checkNotNull(old, { "Fetched message no longer exist!" })
+            checkNotNull(old) { "Fetched message no longer exist!" }
             messagesDb.updateAll(listOf(old.message.apply {
                 id = old.message.id
                 unread = !markAsRead
@@ -153,20 +151,27 @@ class MessageRepository @Inject constructor(
         recipients = recipients.mapFromEntities()
     )
 
-    suspend fun deleteMessage(student: Student, message: Message) {
-        val isDeleted = sdk.init(student).deleteMessages(
-            messages = listOf(message.messageId), message.folderId
-        )
+    suspend fun deleteMessages(student: Student, messages: List<Message>) {
+        val folderId = messages.first().folderId
+        val isDeleted = sdk.init(student)
+            .deleteMessages(messages = messages.map { it.messageId }, folderId = folderId)
 
-        if (message.folderId != MessageFolder.TRASHED.id && isDeleted) {
-            val deletedMessage = message.copy(folderId = MessageFolder.TRASHED.id).apply {
-                id = message.id
-                content = message.content
+        if (folderId != MessageFolder.TRASHED.id && isDeleted) {
+            val deletedMessages = messages.map {
+                it.copy(folderId = MessageFolder.TRASHED.id)
+                    .apply {
+                        id = it.id
+                        content = it.content
+                    }
             }
-            messagesDb.updateAll(listOf(deletedMessage))
-        } else messagesDb.deleteAll(listOf(message))
+
+            messagesDb.updateAll(deletedMessages)
+        } else messagesDb.deleteAll(messages)
     }
 
+    suspend fun deleteMessage(student: Student, message: Message) =
+        deleteMessages(student, listOf(message))
+
     var draftMessage: MessageDraft?
         get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_send_draft))
             ?.let { json.decodeFromString(it) }

app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt

@@ -6,12 +6,12 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.mappers.mapToMobileDeviceToken
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -34,13 +34,15 @@ class MobileDeviceRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
             it.isEmpty() || forceRefresh || isExpired
         },
         query = { mobileDb.loadAll(student.userLoginId.takeIf { it != 0 } ?: student.studentId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getRegisteredDevices()
                 .mapToEntities(semester)
         },
@@ -53,14 +55,16 @@ class MobileDeviceRepository @Inject constructor(
     )
 
     suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
-        sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+        sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .unregisterDevice(device.deviceId)
 
         mobileDb.deleteAll(listOf(device))
     }
 
     suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+        return sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .getToken()
             .mapToMobileDeviceToken()
     }

app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt

@@ -5,12 +5,9 @@ import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -34,6 +31,7 @@ class NoteRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 getRefreshKey(cacheKey, semester)
@@ -42,7 +40,8 @@ class NoteRepository @Inject constructor(
         },
         query = { noteDb.loadAll(student.studentId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getNotes(semester.semesterId)
                 .mapToEntities(semester)
         },

app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt

@@ -7,21 +7,16 @@ import com.fredporciuncula.flow.preferences.FlowSharedPreferences
 import com.fredporciuncula.flow.preferences.Preference
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.sdk.toLocalDate
+import io.github.wulkanowy.data.enums.*
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
-import io.github.wulkanowy.ui.modules.grade.GradeExpandMode
-import io.github.wulkanowy.ui.modules.grade.GradeSortingMode
-import io.github.wulkanowy.utils.toLocalDateTime
-import io.github.wulkanowy.utils.toTimestamp
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import java.time.LocalDate
-import java.time.LocalDateTime
+import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -72,13 +67,15 @@ class PreferencesRepository @Inject constructor(
         )
 
     val appThemeKey = context.getString(R.string.pref_key_app_theme)
-    val appTheme: String
-        get() = getString(appThemeKey, R.string.pref_default_app_theme)
+    val appTheme: AppTheme
+        get() = AppTheme.getByValue(getString(appThemeKey, R.string.pref_default_app_theme))
 
-    val gradeColorTheme: String
-        get() = getString(
-            R.string.pref_key_grade_color_scheme,
-            R.string.pref_default_grade_color_scheme
+    val gradeColorTheme: GradeColorTheme
+        get() = GradeColorTheme.getByValue(
+            getString(
+                R.string.pref_key_grade_color_scheme,
+                R.string.pref_default_grade_color_scheme
+            )
         )
 
     val appLanguageKey = context.getString(R.string.pref_key_app_language)
@@ -128,6 +125,12 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_notification_piggyback
         )
 
+    val isNotificationPiggybackRemoveOriginalEnabled: Boolean
+        get() = getBoolean(
+            R.string.pref_key_notifications_piggyback_cancel_original,
+            R.bool.pref_default_notification_piggyback_cancel_original
+        )
+
     val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
         get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
@@ -156,10 +159,12 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_timetable_show_groups
         )
 
-    val showWholeClassPlan: String
-        get() = getString(
-            R.string.pref_key_timetable_show_whole_class,
-            R.string.pref_default_timetable_show_whole_class
+    val showWholeClassPlan: TimetableMode
+        get() = TimetableMode.getByValue(
+            getString(
+                R.string.pref_key_timetable_show_whole_class,
+                R.string.pref_default_timetable_show_whole_class
+            )
         )
 
     val gradeSortingMode: GradeSortingMode
@@ -195,10 +200,10 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_optional_arithmetic_average
         )
 
-    var lasSyncDate: LocalDateTime
+    var lasSyncDate: Instant?
         get() = getLong(R.string.pref_key_last_sync_date, R.string.pref_default_last_sync_date)
-            .toLocalDateTime()
-        set(value) = sharedPref.edit().putLong("last_sync_date", value.toTimestamp()).apply()
+            .takeIf { it != 0L }?.let(Instant::ofEpochMilli)
+        set(value) = sharedPref.edit().putLong("last_sync_date", value?.toEpochMilli() ?: 0).apply()
 
     var dashboardItemsPosition: Map<DashboardItem.Type, Int>?
         get() {
@@ -257,11 +262,12 @@ class PreferencesRepository @Inject constructor(
         get() = sharedPref.getInt(PREF_KEY_IN_APP_REVIEW_COUNT, 0)
         set(value) = sharedPref.edit().putInt(PREF_KEY_IN_APP_REVIEW_COUNT, value).apply()
 
-    var inAppReviewDate: LocalDate?
+    var inAppReviewDate: Instant?
         get() = sharedPref.getLong(PREF_KEY_IN_APP_REVIEW_DATE, 0).takeIf { it != 0L }
-            ?.toLocalDate()
-        set(value) = sharedPref.edit().putLong(PREF_KEY_IN_APP_REVIEW_DATE, value!!.toTimestamp())
-            .apply()
+            ?.let(Instant::ofEpochMilli)
+        set(value) = sharedPref.edit {
+            putLong(PREF_KEY_IN_APP_REVIEW_DATE, value?.toEpochMilli() ?: 0)
+        }
 
     var isAppReviewDone: Boolean
         get() = sharedPref.getBoolean(PREF_KEY_IN_APP_REVIEW_DONE, false)

app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt

@@ -4,11 +4,11 @@ import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -31,6 +31,7 @@ class SchoolAnnouncementRepository @Inject constructor(
         forceRefresh: Boolean, notify: Boolean = false
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
             it.isEmpty() || forceRefresh || isExpired

app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt

@@ -4,11 +4,11 @@ import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -30,6 +30,7 @@ class SchoolRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it == null },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, student)
@@ -38,7 +39,9 @@ class SchoolRepository @Inject constructor(
         },
         query = { schoolDb.load(semester.studentId, semester.classId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).getSchool()
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .getSchool()
                 .mapToEntity(semester)
         },
         saveFetchResult = { old, new ->

app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt

@@ -5,11 +5,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.getCurrentOrLast
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.isCurrent
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
@@ -43,10 +39,14 @@ class SemesterRepository @Inject constructor(
     ): Boolean {
         val isNoSemesters = semesters.isEmpty()
 
-        val isRefreshOnModeChangeRequired =
-            if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-                semesters.firstOrNull { it.isCurrent }?.diaryId == 0
-            } else false
+        val isRefreshOnModeChangeRequired = when {
+            Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> {
+                semesters.firstOrNull { it.isCurrent }?.let {
+                    0 == it.diaryId && 0 == it.kindergartenDiaryId
+                } == true
+            }
+            else -> false
+        }
 
         val isRefreshOnNoCurrentAppropriate =
             refreshOnNoCurrent && !semesters.any { semester -> semester.isCurrent }

app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt

@@ -4,9 +4,9 @@ import io.github.wulkanowy.data.db.dao.StudentInfoDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -25,10 +25,12 @@ class StudentInfoRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it == null },
         shouldFetch = { it == null || forceRefresh },
         query = { studentInfoDao.loadStudentInfo(student.studentId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getStudentInfo().mapToEntity(semester)
         },
         saveFetchResult = { old, new ->

app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt

@@ -73,6 +73,15 @@ class StudentRepository @Inject constructor(
                 }
             }
 
+    suspend fun getSavedStudentById(id: Long, decryptPass: Boolean = true) =
+        studentDb.loadStudentWithSemestersById(id)?.apply {
+            if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+                student.password = withContext(dispatchers.io) {
+                    decrypt(student.password)
+                }
+            }
+        }
+
     suspend fun getStudentById(id: Long, decryptPass: Boolean = true): Student {
         val student = studentDb.loadById(id) ?: throw NoCurrentStudentException()
 
@@ -128,4 +137,7 @@ class StudentRepository @Inject constructor(
 
     suspend fun updateStudentNickAndAvatar(studentNickAndAvatar: StudentNickAndAvatar) =
         studentDb.update(studentNickAndAvatar)
+
+    suspend fun isOneUniqueStudent() = getSavedStudents(false)
+        .distinctBy { it.student.studentName }.size == 1
 }

app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt

@@ -4,11 +4,11 @@ import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -31,13 +31,15 @@ class SubjectRepository @Inject constructor(
         forceRefresh: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, semester))
             it.isEmpty() || forceRefresh || isExpired
         },
         query = { subjectDao.loadAll(semester.diaryId, semester.studentId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getSubjects().mapToEntities(semester)
         },
         saveFetchResult = { old, new ->

app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt

@@ -4,11 +4,11 @@ import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -31,13 +31,15 @@ class TeacherRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, semester))
             it.isEmpty() || forceRefresh || isExpired
         },
         query = { teacherDb.loadAll(semester.studentId, semester.classId) },
         fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getTeachers(semester.semesterId)
                 .mapToEntities(semester)
         },

app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt

@@ -3,22 +3,13 @@ package io.github.wulkanowy.data.repositories
 import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.data.db.entities.TimetableHeader
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.TimetableFull
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.sync.Mutex
@@ -40,6 +31,10 @@ class TimetableRepository @Inject constructor(
 
     private val cacheKey = "timetable"
 
+    enum class TimetableType {
+        NORMAL, ADDITIONAL
+    }
+
     fun getTimetable(
         student: Student,
         semester: Semester,
@@ -47,9 +42,16 @@ class TimetableRepository @Inject constructor(
         end: LocalDate,
         forceRefresh: Boolean,
         refreshAdditional: Boolean = false,
-        notify: Boolean = false
+        notify: Boolean = false,
+        timetableType: TimetableType = TimetableType.NORMAL
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = {
+            when (timetableType) {
+                TimetableType.NORMAL -> it.lessons.isEmpty()
+                TimetableType.ADDITIONAL -> it.additional.isEmpty()
+            }
+        },
         shouldFetch = { (timetable, additional, headers) ->
             val refreshKey = getRefreshKey(cacheKey, semester, start, end)
             val isExpired = refreshHelper.shouldBeRefreshed(refreshKey)
@@ -62,7 +64,7 @@ class TimetableRepository @Inject constructor(
         query = { getFullTimetableFromDatabase(student, semester, start, end) },
         fetch = {
             val timetableFull = sdk.init(student)
-                .switchDiary(semester.diaryId, semester.schoolYear)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getTimetableFull(start.monday, end.sunday)
 
             timetableFull.mapToEntities(semester)
@@ -152,7 +154,8 @@ class TimetableRepository @Inject constructor(
         old: List<TimetableAdditional>,
         new: List<TimetableAdditional>
     ) {
-        timetableAdditionalDb.deleteAll(old uniqueSubtract new)
+        val oldFiltered = old.filter { !it.isAddedByUser }
+        timetableAdditionalDb.deleteAll(oldFiltered uniqueSubtract new)
         timetableAdditionalDb.insertAll(new uniqueSubtract old)
     }
 
@@ -160,4 +163,14 @@ class TimetableRepository @Inject constructor(
         timetableHeaderDb.deleteAll(old uniqueSubtract new)
         timetableHeaderDb.insertAll(new uniqueSubtract old)
     }
+
+    suspend fun saveAdditionalList(additionalList: List<TimetableAdditional>) =
+        timetableAdditionalDb.insertAll(additionalList)
+
+    suspend fun deleteAdditional(additional: TimetableAdditional, deleteSeries: Boolean) =
+        if (deleteSeries) {
+            timetableAdditionalDb.deleteAllByRepeatId(additional.repeatId!!)
+        } else {
+            timetableAdditionalDb.deleteAll(listOf(additional))
+        }
 }

app/src/main/java/io/github/wulkanowy/data/serializers/LocalDateSerializer.kt

@@ -0,0 +1,32 @@
+package io.github.wulkanowy.data.serializers
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.nullable
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import java.time.LocalDate
+
+@OptIn(ExperimentalSerializationApi::class)
+object LocalDateSerializer : KSerializer<LocalDate?> {
+
+    override val descriptor = PrimitiveSerialDescriptor("LocalDate", PrimitiveKind.LONG).nullable
+
+    override fun serialize(encoder: Encoder, value: LocalDate?) {
+        if (value == null) {
+            encoder.encodeNull()
+        } else {
+            encoder.encodeNotNullMark()
+            encoder.encodeLong(value.toEpochDay())
+        }
+    }
+
+    override fun deserialize(decoder: Decoder): LocalDate? =
+        if (decoder.decodeNotNullMark()) {
+            LocalDate.ofEpochDay(decoder.decodeLong())
+        } else {
+            decoder.decodeNull()
+        }
+}

app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt

@@ -1,9 +0,0 @@
-package io.github.wulkanowy.services
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-
-abstract class HiltBroadcastReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {}
-}

app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt

@@ -1,6 +1,7 @@
 package io.github.wulkanowy.services.alarm
 
 import android.app.PendingIntent
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Build
@@ -9,26 +10,23 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.services.HiltBroadcastReceiver
+import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel.Companion.CHANNEL_ID
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
 import io.github.wulkanowy.utils.PendingIntentCompat
-import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.toLocalDateTime
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class TimetableNotificationReceiver : HiltBroadcastReceiver() {
+class TimetableNotificationReceiver : BroadcastReceiver() {
 
     @Inject
     lateinit var studentRepository: StudentRepository
@@ -41,6 +39,8 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() {
         const val NOTIFICATION_TYPE_UPCOMING = 2
         const val NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION = 3
 
+        // FIXME only shows one notification even if there are multiple students.
+        //       Probably want to fix after #721 is merged.
         const val NOTIFICATION_ID = 2137
 
         const val STUDENT_NAME = "student_name"
@@ -56,20 +56,24 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() {
 
     @OptIn(DelicateCoroutinesApi::class)
     override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
         Timber.d("Receiving intent... ${intent.toUri(0)}")
 
-        flowWithResource {
+        resourceFlow {
+            val showStudentName = !studentRepository.isOneUniqueStudent()
             val student = studentRepository.getCurrentStudent(false)
             val studentId = intent.getIntExtra(STUDENT_ID, 0)
-            if (student.studentId == studentId) prepareNotification(context, intent)
-            else Timber.d("Notification studentId($studentId) differs from current(${student.studentId})")
-        }.onEach {
-            if (it.status == Status.ERROR) Timber.e(it.error!!)
-        }.launchIn(GlobalScope)
+
+            if (student.studentId == studentId) {
+                prepareNotification(context, intent, showStudentName)
+            } else {
+                Timber.d("Notification studentId($studentId) differs from current(${student.studentId})")
+            }
+        }
+            .onResourceError { Timber.e(it) }
+            .launchIn(GlobalScope)
     }
 
-    private fun prepareNotification(context: Context, intent: Intent) {
+    private fun prepareNotification(context: Context, intent: Intent, showStudentName: Boolean) {
         val type = intent.getIntExtra(LESSON_TYPE, 0)
         val isPersistent = preferencesRepository.isUpcomingLessonsNotificationsPersistent
 
@@ -78,7 +82,7 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() {
         }
 
         val studentId = intent.getIntExtra(STUDENT_ID, 0)
-        val studentName = intent.getStringExtra(STUDENT_NAME)
+        val studentName = intent.getStringExtra(STUDENT_NAME).takeIf { showStudentName }
 
         val subject = intent.getStringExtra(LESSON_TITLE)
         val room = intent.getStringExtra(LESSON_ROOM)
@@ -89,21 +93,28 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() {
         val nextSubject = intent.getStringExtra(LESSON_NEXT_TITLE)
         val nextRoom = intent.getStringExtra(LESSON_NEXT_ROOM)
 
-        Timber.d("TimetableNotification receive: type: $type, subject: $subject, start: ${start.toLocalDateTime()}, student: $studentId")
+        Timber.d("TimetableNotification receive: type: $type, subject: $subject, start: $start, student: $studentId")
+
+        val notificationTitleResId =
+            if (type == NOTIFICATION_TYPE_CURRENT) R.string.timetable_now else R.string.timetable_next
+        val notificationTitle =
+            context.getString(notificationTitleResId, "($room) $subject".removePrefix("()"))
+
+        val nextLessonText = nextSubject?.let {
+            context.getString(
+                R.string.timetable_later,
+                "($nextRoom) $nextSubject".removePrefix("()")
+            )
+        }
 
         showNotification(
-            context, isPersistent, studentName,
-            if (type == NOTIFICATION_TYPE_CURRENT) end else start, end - start,
-            context.getString(
-                if (type == NOTIFICATION_TYPE_CURRENT) R.string.timetable_now else R.string.timetable_next,
-                "($room) $subject".removePrefix("()")
-            ),
-            nextSubject?.let {
-                context.getString(
-                    R.string.timetable_later,
-                    "($nextRoom) $nextSubject".removePrefix("()")
-                )
-            }
+            context = context,
+            isPersistent = isPersistent,
+            studentName = studentName,
+            countDown = if (type == NOTIFICATION_TYPE_CURRENT) end else start,
+            timeout = end - start,
+            title = notificationTitle,
+            next = nextLessonText
         )
     }
 
@@ -130,10 +141,11 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() {
                 .setTimeoutAfter(timeout)
                 .setSmallIcon(R.drawable.ic_stat_timetable)
                 .setColor(context.getCompatColor(R.color.colorPrimary))
-                .setStyle(NotificationCompat.InboxStyle().also {
-                    it.setSummaryText(studentName)
-                    it.addLine(next)
-                })
+                .setStyle(NotificationCompat.InboxStyle()
+                    .addLine(next)
+                    .also { inboxStyle ->
+                        studentName?.let { inboxStyle.setSummaryText(it) }
+                    })
                 .setContentIntent(
                     PendingIntent.getActivity(
                         context,

app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt

@@ -28,12 +28,12 @@ import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companio
 import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.PendingIntentCompat
 import io.github.wulkanowy.utils.nickOrName
-import io.github.wulkanowy.utils.toTimestamp
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.time.Duration.ofMinutes
+import java.time.Instant
+import java.time.Instant.now
 import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
 import javax.inject.Inject
 
 class TimetableNotificationSchedulerHelper @Inject constructor(
@@ -43,14 +43,14 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
     private val dispatchersProvider: DispatchersProvider,
 ) {
 
-    private fun getRequestCode(time: LocalDateTime, studentId: Int) =
-        (time.toTimestamp() * studentId).toInt()
+    private fun getRequestCode(time: Instant, studentId: Int): Int =
+        (time.toEpochMilli() * studentId).toInt()
 
     private fun getUpcomingLessonTime(
         index: Int,
         day: List<Timetable>,
         lesson: Timetable
-    ) = day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
+    ): Instant = day.getOrNull(index - 1)?.end ?: lesson.start.minus(ofMinutes(30))
 
     suspend fun cancelScheduled(lessons: List<Timetable>, student: Student) {
         val studentId = student.studentId
@@ -71,7 +71,7 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
         }
     }
 
-    private fun cancelScheduledTo(range: ClosedRange<LocalDateTime>, requestCode: Int) {
+    private fun cancelScheduledTo(range: ClosedRange<Instant>, requestCode: Int) {
         if (now() in range) cancelNotification()
 
         alarmManager.cancel(
@@ -150,8 +150,8 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
             putExtra(STUDENT_ID, student.studentId)
             putExtra(STUDENT_NAME, student.nickOrName)
             putExtra(LESSON_ROOM, lesson.room)
-            putExtra(LESSON_START, lesson.start.toTimestamp())
-            putExtra(LESSON_END, lesson.end.toTimestamp())
+            putExtra(LESSON_START, lesson.start.toEpochMilli())
+            putExtra(LESSON_END, lesson.end.toEpochMilli())
             putExtra(LESSON_TITLE, lesson.subject)
             putExtra(LESSON_NEXT_TITLE, nextLesson?.subject)
             putExtra(LESSON_NEXT_ROOM, nextLesson?.room)
@@ -162,11 +162,11 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
         intent: Intent,
         studentId: Int,
         notificationType: Int,
-        time: LocalDateTime
+        time: Instant
     ) {
         try {
             AlarmManagerCompat.setExactAndAllowWhileIdle(
-                alarmManager, RTC_WAKEUP, time.toTimestamp(),
+                alarmManager, RTC_WAKEUP, time.toEpochMilli(),
                 PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
                     it.putExtra(LESSON_TYPE, notificationType)
                 }, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE)

app/src/main/java/io/github/wulkanowy/services/piggyback/VulcanNotificationListenerService.kt

@@ -19,6 +19,9 @@ class VulcanNotificationListenerService : NotificationListenerService() {
     override fun onNotificationPosted(statusBarNotification: StatusBarNotification?) {
         if (statusBarNotification?.packageName == "pl.edu.vulcan.hebe" && preferenceRepository.isNotificationPiggybackEnabled) {
             syncManager.startOneTimeSyncWorker()
+            if (preferenceRepository.isNotificationPiggybackRemoveOriginalEnabled) {
+                cancelNotification(statusBarNotification.key)
+            }
         }
     }
 }

app/src/main/java/io/github/wulkanowy/services/shortcuts/ShortcutsHelper.kt

@@ -15,76 +15,41 @@ import javax.inject.Singleton
 @Singleton
 class ShortcutsHelper @Inject constructor(@ApplicationContext private val context: Context) {
 
-    private val destinations = mapOf(
-        "grade" to Destination.Grade,
-        "attendance" to Destination.Attendance,
-        "exam" to Destination.Exam,
-        "timetable" to Destination.Timetable()
-    )
-
-    init {
-        initializeShortcuts()
-    }
-
-    fun getDestination(intent: Intent) =
-        destinations[intent.getStringExtra(EXTRA_SHORTCUT_DESTINATION_ID)]
-
-    private fun initializeShortcuts() {
+    fun initializeShortcuts() {
         val shortcutsInfo = listOf(
             ShortcutInfoCompat.Builder(context, "grade_shortcut")
                 .setShortLabel(context.getString(R.string.grade_title))
                 .setLongLabel(context.getString(R.string.grade_title))
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_shortcut_grade))
-                .setIntent(SplashActivity.getStartIntent(context)
-                    .apply {
-                        action = Intent.ACTION_VIEW
-                        putExtra(EXTRA_SHORTCUT_DESTINATION_ID, "grade")
-                    }
-                )
+                .setIntent(SplashActivity.getStartIntent(context, Destination.Grade)
+                    .apply { action = Intent.ACTION_VIEW })
                 .build(),
 
             ShortcutInfoCompat.Builder(context, "attendance_shortcut")
                 .setShortLabel(context.getString(R.string.attendance_title))
                 .setLongLabel(context.getString(R.string.attendance_title))
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_shortcut_attendance))
-                .setIntent(SplashActivity.getStartIntent(context)
-                    .apply {
-                        action = Intent.ACTION_VIEW
-                        putExtra(EXTRA_SHORTCUT_DESTINATION_ID, "attendance")
-                    }
-                )
+                .setIntent(SplashActivity.getStartIntent(context, Destination.Attendance)
+                    .apply { action = Intent.ACTION_VIEW })
                 .build(),
 
             ShortcutInfoCompat.Builder(context, "exam_shortcut")
                 .setShortLabel(context.getString(R.string.exam_title))
                 .setLongLabel(context.getString(R.string.exam_title))
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_shortcut_exam))
-                .setIntent(SplashActivity.getStartIntent(context)
-                    .apply {
-                        action = Intent.ACTION_VIEW
-                        putExtra(EXTRA_SHORTCUT_DESTINATION_ID, "exam")
-                    }
-                )
+                .setIntent(SplashActivity.getStartIntent(context, Destination.Exam)
+                    .apply { action = Intent.ACTION_VIEW })
                 .build(),
 
             ShortcutInfoCompat.Builder(context, "timetable_shortcut")
                 .setShortLabel(context.getString(R.string.timetable_title))
                 .setLongLabel(context.getString(R.string.timetable_title))
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_shortcut_timetable))
-                .setIntent(SplashActivity.getStartIntent(context)
-                    .apply {
-                        action = Intent.ACTION_VIEW
-                        putExtra(EXTRA_SHORTCUT_DESTINATION_ID, "timetable")
-                    }
-                )
+                .setIntent(SplashActivity.getStartIntent(context, Destination.Timetable())
+                    .apply { action = Intent.ACTION_VIEW })
                 .build()
         )
 
         shortcutsInfo.forEach { ShortcutManagerCompat.pushDynamicShortcut(context, it) }
     }
-
-    private companion object {
-
-        private const val EXTRA_SHORTCUT_DESTINATION_ID = "shortcut_destination_id"
-    }
-}
+}

app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt

@@ -74,10 +74,12 @@ class SyncManager @Inject constructor(
         }
     }
 
-    fun startOneTimeSyncWorker(): Flow<WorkInfo?> {
+    // if quiet, no notifications will be sent
+    fun startOneTimeSyncWorker(quiet: Boolean = false): Flow<WorkInfo?> {
         val work = OneTimeWorkRequestBuilder<SyncWorker>()
             .setInputData(
                 Data.Builder()
+                    .putBoolean("quiet", quiet)
                     .putBoolean("one_time", true)
                     .build()
             )

app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt

@@ -23,7 +23,7 @@ import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.getCompatColor
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.time.LocalDateTime
+import java.time.Instant
 import kotlin.random.Random
 
 @HiltWorker
@@ -38,18 +38,23 @@ class SyncWorker @AssistedInject constructor(
     private val dispatchersProvider: DispatchersProvider
 ) : CoroutineWorker(appContext, workerParameters) {
 
-    override suspend fun doWork() = withContext(dispatchersProvider.io) {
+    override suspend fun doWork(): Result = withContext(dispatchersProvider.io) {
         Timber.i("SyncWorker is starting")
 
         if (!studentRepository.isCurrentStudentSet()) return@withContext Result.failure()
 
-        val student = studentRepository.getCurrentStudent()
-        val semester = semesterRepository.getCurrentSemester(student, true)
+        val (student, semester) = try {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student, true)
+            student to semester
+        } catch (e: Throwable) {
+            return@withContext getResultFromErrors(listOf(e))
+        }
 
         val exceptions = works.mapNotNull { work ->
             try {
                 Timber.i("${work::class.java.simpleName} is starting")
-                work.doWork(student, semester)
+                work.doWork(student, semester, isNotificationsEnabled())
                 Timber.i("${work::class.java.simpleName} result: Success")
                 null
             } catch (e: Throwable) {
@@ -62,20 +67,7 @@ class SyncWorker @AssistedInject constructor(
                 }
             }
         }
-        val result = when {
-            exceptions.isNotEmpty() && inputData.getBoolean("one_time", false) -> {
-                Result.failure(
-                    Data.Builder()
-                        .putString("error", exceptions.map { it.stackTraceToString() }.toString())
-                        .build()
-                )
-            }
-            exceptions.isNotEmpty() -> Result.retry()
-            else -> {
-                preferencesRepository.lasSyncDate = LocalDateTime.now()
-                Result.success()
-            }
-        }
+        val result = getResultFromErrors(exceptions)
 
         if (preferencesRepository.isDebugNotificationEnable) notify(result)
         Timber.i("SyncWorker result: $result")
@@ -83,6 +75,27 @@ class SyncWorker @AssistedInject constructor(
         return@withContext result
     }
 
+    private fun isNotificationsEnabled(): Boolean {
+        val quiet = inputData.getBoolean("quiet", false)
+        return preferencesRepository.isNotificationsEnable && !quiet
+    }
+
+    private fun getResultFromErrors(errors: List<Throwable>): Result = when {
+        errors.isNotEmpty() && inputData.getBoolean("one_time", false) -> {
+            Result.failure(
+                Data.Builder()
+                    .putString("error_message", errors.joinToString { it.message.toString() })
+                    .putString("error_stack", errors.map { it.stackTraceToString() }.toString())
+                    .build()
+            )
+        }
+        errors.isNotEmpty() -> Result.retry()
+        else -> {
+            preferencesRepository.lasSyncDate = Instant.now()
+            Result.success()
+        }
+    }
+
     private fun notify(result: Result) {
         notificationManager.notify(
             Random.nextInt(Int.MAX_VALUE),

app/src/main/java/io/github/wulkanowy/services/sync/notifications/AppNotificationManager.kt

@@ -14,11 +14,12 @@ import io.github.wulkanowy.data.pojos.GroupNotificationData
 import io.github.wulkanowy.data.pojos.NotificationData
 import io.github.wulkanowy.data.repositories.NotificationRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.ui.modules.splash.SplashActivity
 import io.github.wulkanowy.utils.PendingIntentCompat
 import io.github.wulkanowy.utils.getCompatBitmap
 import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.nickOrName
-import java.time.LocalDateTime
+import java.time.Instant
 import javax.inject.Inject
 import kotlin.random.Random
 
@@ -47,7 +48,7 @@ class AppNotificationManager @Inject constructor(
                 PendingIntent.getActivity(
                     context,
                     Random.nextInt(),
-                    notificationData.intentToStart,
+                    SplashActivity.getStartIntent(context, notificationData.destination),
                     PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                 )
             )
@@ -57,7 +58,7 @@ class AppNotificationManager @Inject constructor(
                 NotificationCompat.BigTextStyle()
                     .bigText(notificationData.content)
                     .also { builder ->
-                        if (shouldShowStudentName()) {
+                        if (!studentRepository.isOneUniqueStudent()) {
                             builder.setSummaryText(student.nickOrName)
                         }
                     }
@@ -74,7 +75,7 @@ class AppNotificationManager @Inject constructor(
         student: Student
     ) {
         val notificationType = groupNotificationData.type
-        val groupType = notificationType.group ?: return
+        val groupType = notificationType.channel
         val group = "${groupType}_${student.id}"
 
         sendSummaryNotification(groupNotificationData, group, student)
@@ -92,7 +93,7 @@ class AppNotificationManager @Inject constructor(
                     PendingIntent.getActivity(
                         context,
                         Random.nextInt(),
-                        notificationData.intentToStart,
+                        SplashActivity.getStartIntent(context, notificationData.destination),
                         PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                     )
                 )
@@ -102,7 +103,7 @@ class AppNotificationManager @Inject constructor(
                     NotificationCompat.BigTextStyle()
                         .bigText(notificationData.content)
                         .also { builder ->
-                            if (shouldShowStudentName()) {
+                            if (!studentRepository.isOneUniqueStudent()) {
                                 builder.setSummaryText(student.nickOrName)
                             }
                         }
@@ -134,7 +135,7 @@ class AppNotificationManager @Inject constructor(
                 .setStyle(
                     NotificationCompat.InboxStyle()
                         .also { builder ->
-                            if (shouldShowStudentName()) {
+                            if (!studentRepository.isOneUniqueStudent()) {
                                 builder.setSummaryText(student.nickOrName)
                             }
                             groupNotificationData.notificationDataList.forEach {
@@ -146,7 +147,7 @@ class AppNotificationManager @Inject constructor(
                     PendingIntent.getActivity(
                         context,
                         Random.nextInt(),
-                        groupNotificationData.intentToStart,
+                        SplashActivity.getStartIntent(context, groupNotificationData.destination),
                         PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                     )
                 )
@@ -168,13 +169,11 @@ class AppNotificationManager @Inject constructor(
             studentId = student.id,
             title = notificationData.title,
             content = notificationData.content,
+            destination = notificationData.destination,
             type = notificationType,
-            date = LocalDateTime.now()
+            date = Instant.now(),
         )
 
         notificationRepository.saveNotification(notificationEntity)
     }
-
-    private suspend fun shouldShowStudentName(): Boolean =
-        studentRepository.getSavedStudents(decryptPass = false).size > 1
 }

app/src/main/java/io/github/wulkanowy/services/sync/notifications/ChangeTimetableNotification.kt

@@ -8,11 +8,10 @@ import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.pojos.GroupNotificationData
 import io.github.wulkanowy.data.pojos.NotificationData
 import io.github.wulkanowy.ui.modules.Destination
-import io.github.wulkanowy.ui.modules.splash.SplashActivity
 import io.github.wulkanowy.utils.getPlural
 import io.github.wulkanowy.utils.toFormattedString
+import java.time.Instant
 import java.time.LocalDate
-import java.time.LocalDateTime
 import javax.inject.Inject
 
 class ChangeTimetableNotification @Inject constructor(
@@ -21,10 +20,11 @@ class ChangeTimetableNotification @Inject constructor(
 ) {
 
     suspend fun notify(items: List<Timetable>, student: Student) {
-        val currentTime = LocalDateTime.now()
+        val currentTime = Instant.now()
         val changedLessons = items.filter { (it.canceled || it.changes) && it.start > currentTime }
-        val notificationDataList = changedLessons.groupBy { it.date }
-            .map { (date, lessons) ->
+        val lessonsByDate = changedLessons.groupBy { it.date }
+        val notificationDataList = lessonsByDate
+            .flatMap { (date, lessons) ->
                 getNotificationContents(date, lessons).map {
                     NotificationData(
                         title = context.getPlural(
@@ -32,14 +32,10 @@ class ChangeTimetableNotification @Inject constructor(
                             1
                         ),
                         content = it,
-                        intentToStart = SplashActivity.getStartIntent(
-                            context = context,
-                            destination = Destination.Timetable(date)
-                        )
+                        destination = Destination.Timetable(date)
                     )
                 }
             }
-            .flatten()
             .ifEmpty { return }
 
         val groupNotificationData = GroupNotificationData(
@@ -53,7 +49,7 @@ class ChangeTimetableNotification @Inject constructor(
                 changedLessons.size,
                 changedLessons.size
             ),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Timetable()),
+            destination = Destination.Timetable(lessonsByDate.toSortedMap().firstKey()),
             type = NotificationType.CHANGE_TIMETABLE
         )
 

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewAttendanceNotification.kt

@@ -31,7 +31,7 @@ class NewAttendanceNotification @Inject constructor(
             NotificationData(
                 title = context.getPlural(R.plurals.attendance_notify_new_items_title, 1),
                 content = it,
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Attendance)
+                destination = Destination.Attendance
             )
         }
 
@@ -46,7 +46,7 @@ class NewAttendanceNotification @Inject constructor(
                 notificationDataList.size,
                 notificationDataList.size
             ),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Attendance),
+            destination = Destination.Attendance,
             type = NotificationType.NEW_ATTENDANCE
         )
 

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt

@@ -11,7 +11,7 @@ import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
 import io.github.wulkanowy.utils.getPlural
 import io.github.wulkanowy.utils.toFormattedString
-import java.time.LocalDateTime
+import java.time.Instant
 import javax.inject.Inject
 
 class NewConferenceNotification @Inject constructor(
@@ -20,7 +20,7 @@ class NewConferenceNotification @Inject constructor(
 ) {
 
     suspend fun notify(items: List<Conference>, student: Student) {
-        val today = LocalDateTime.now()
+        val today = Instant.now()
         val lines = items.filter { !it.date.isBefore(today) }
             .map {
                 "${it.date.toFormattedString("dd.MM")} - ${it.title}: ${it.subject}"
@@ -31,7 +31,7 @@ class NewConferenceNotification @Inject constructor(
             NotificationData(
                 title = context.getPlural(R.plurals.conference_notify_new_item_title, 1),
                 content = it,
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Conference)
+                destination = Destination.Conference
             )
         }
 
@@ -43,7 +43,7 @@ class NewConferenceNotification @Inject constructor(
                 lines.size,
                 lines.size
             ),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Conference),
+            destination = Destination.Conference,
             type = NotificationType.NEW_CONFERENCE
         )
 

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt

@@ -31,7 +31,7 @@ class NewExamNotification @Inject constructor(
             NotificationData(
                 title = context.getPlural(R.plurals.exam_notify_new_item_title, 1),
                 content = it,
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Exam),
+                destination = Destination.Exam,
             )
         }
 
@@ -43,7 +43,7 @@ class NewExamNotification @Inject constructor(
                 lines.size,
                 lines.size
             ),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Exam),
+            destination = Destination.Exam,
             type = NotificationType.NEW_EXAM
         )
 

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt

@@ -22,8 +22,11 @@ class NewGradeNotification @Inject constructor(
         val notificationDataList = items.map {
             NotificationData(
                 title = context.getPlural(R.plurals.grade_new_items, 1),
-                content = "${it.subject}: ${it.entry}",
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Grade),
+                content = buildString {
+                    append("${it.subject}: ${it.entry}")
+                    if (it.comment.isNotBlank()) append(" (${it.comment})")
+                },
+                destination = Destination.Grade,
             )
         }
 
@@ -31,7 +34,7 @@ class NewGradeNotification @Inject constructor(
             notificationDataList = notificationDataList,
             title = context.getPlural(R.plurals.grade_new_items, items.size),
             content = context.getPlural(R.plurals.grade_notify_new_items, items.size, items.size),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Grade),
+            destination = Destination.Grade,
             type = NotificationType.NEW_GRADE_DETAILS
         )
 
@@ -43,7 +46,7 @@ class NewGradeNotification @Inject constructor(
             NotificationData(
                 title = context.getPlural(R.plurals.grade_new_items_predicted, 1),
                 content = "${it.subject}: ${it.predictedGrade}",
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Grade),
+                destination = Destination.Grade,
             )
         }
 
@@ -55,7 +58,7 @@ class NewGradeNotification @Inject constructor(
                 items.size,
                 items.size
             ),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Grade),
+            destination = Destination.Grade,
             type = NotificationType.NEW_GRADE_PREDICTED
         )
 
@@ -67,7 +70,7 @@ class NewGradeNotification @Inject constructor(
             NotificationData(
                 title = context.getPlural(R.plurals.grade_new_items_final, 1),
                 content = "${it.subject}: ${it.finalGrade}",
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Grade),
+                destination = Destination.Grade,
             )
         }
 
@@ -79,7 +82,7 @@ class NewGradeNotification @Inject constructor(
                 items.size,
                 items.size
             ),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Grade),
+            destination = Destination.Grade,
             type = NotificationType.NEW_GRADE_FINAL
         )
 

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt

@@ -31,7 +31,7 @@ class NewHomeworkNotification @Inject constructor(
             NotificationData(
                 title = context.getPlural(R.plurals.homework_notify_new_item_title, 1),
                 content = it,
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Homework),
+                destination = Destination.Homework,
             )
         }
 
@@ -42,7 +42,7 @@ class NewHomeworkNotification @Inject constructor(
                 lines.size,
                 lines.size
             ),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Homework),
+            destination = Destination.Homework,
             type = NotificationType.NEW_HOMEWORK,
             notificationDataList = notificationDataList
         )

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewLuckyNumberNotification.kt

@@ -22,7 +22,7 @@ class NewLuckyNumberNotification @Inject constructor(
                 R.string.lucky_number_notify_new_item,
                 item.luckyNumber.toString()
             ),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.LuckyNumber)
+            destination = Destination.LuckyNumber
         )
 
         appNotificationManager.sendSingleNotification(

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt

@@ -22,7 +22,7 @@ class NewMessageNotification @Inject constructor(
             NotificationData(
                 title = context.getPlural(R.plurals.message_new_items, 1),
                 content = "${it.sender}: ${it.subject}",
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Message),
+                destination = Destination.Message,
             )
         }
 
@@ -30,7 +30,7 @@ class NewMessageNotification @Inject constructor(
             notificationDataList = notificationDataList,
             title = context.getPlural(R.plurals.message_new_items, items.size),
             content = context.getPlural(R.plurals.message_notify_new_items, items.size, items.size),
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Message),
+            destination = Destination.Message,
             type = NotificationType.NEW_MESSAGE
         )
 

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewNoteNotification.kt

@@ -29,13 +29,13 @@ class NewNoteNotification @Inject constructor(
             NotificationData(
                 title = context.getPlural(titleRes, 1),
                 content = "${it.teacher}: ${it.category}",
-                intentToStart = SplashActivity.getStartIntent(context, Destination.Note),
+                destination = Destination.Note,
             )
         }
 
         val groupNotificationData = GroupNotificationData(
             notificationDataList = notificationDataList,
-            intentToStart = SplashActivity.getStartIntent(context, Destination.Note),
+            destination = Destination.Note,
             title = context.getPlural(R.plurals.note_new_items, items.size),
             content = context.getPlural(R.plurals.note_notify_new_items, items.size, items.size),
             type = NotificationType.NEW_NOTE

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewSchoolAnnouncementNotification.kt

@@ -1,6 +1,7 @@
 package io.github.wulkanowy.services.sync.notifications
 
 import android.content.Context
+import androidx.core.text.parseAsHtml
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
@@ -20,23 +21,17 @@ class NewSchoolAnnouncementNotification @Inject constructor(
     suspend fun notify(items: List<SchoolAnnouncement>, student: Student) {
         val notificationDataList = items.map {
             NotificationData(
-                intentToStart = SplashActivity.getStartIntent(
-                    context = context,
-                    destination = Destination.SchoolAnnouncement
-                ),
+                destination = Destination.SchoolAnnouncement,
                 title = context.getPlural(
                     R.plurals.school_announcement_notify_new_item_title,
                     1
                 ),
-                content = "${it.subject}: ${it.content}"
+                content = "${it.subject}: ${it.content.parseAsHtml()}"
             )
         }
         val groupNotificationData = GroupNotificationData(
             type = NotificationType.NEW_ANNOUNCEMENT,
-            intentToStart = SplashActivity.getStartIntent(
-                context = context,
-                destination = Destination.SchoolAnnouncement
-            ),
+            destination = Destination.SchoolAnnouncement,
             title = context.getPlural(
                 R.plurals.school_announcement_notify_new_item_title,
                 items.size

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NotificationType.kt

@@ -14,72 +14,58 @@ import io.github.wulkanowy.services.sync.channels.PushChannel
 import io.github.wulkanowy.services.sync.channels.TimetableChangeChannel
 
 enum class NotificationType(
-    val group: String?,
     val channel: String,
     val icon: Int
 ) {
     NEW_CONFERENCE(
-        group = "new_conferences_group",
         channel = NewConferencesChannel.CHANNEL_ID,
         icon = R.drawable.ic_more_conferences,
     ),
     NEW_EXAM(
-        group = "new_exam_group",
         channel = NewExamChannel.CHANNEL_ID,
         icon = R.drawable.ic_main_exam
     ),
     NEW_GRADE_DETAILS(
-        group = "new_grade_details_group",
         channel = NewGradesChannel.CHANNEL_ID,
         icon = R.drawable.ic_stat_grade,
     ),
     NEW_GRADE_PREDICTED(
-        group = "new_grade_predicted_group",
         channel = NewGradesChannel.CHANNEL_ID,
         icon = R.drawable.ic_stat_grade,
     ),
     NEW_GRADE_FINAL(
-        group = "new_grade_final_group",
         channel = NewGradesChannel.CHANNEL_ID,
         icon = R.drawable.ic_stat_grade,
     ),
     NEW_HOMEWORK(
-        group = "new_homework_group",
         channel = NewHomeworkChannel.CHANNEL_ID,
         icon = R.drawable.ic_more_homework,
     ),
     NEW_LUCKY_NUMBER(
-        group = null,
         channel = LuckyNumberChannel.CHANNEL_ID,
         icon = R.drawable.ic_stat_luckynumber,
     ),
     NEW_MESSAGE(
-        group = "new_message_group",
         channel = NewMessagesChannel.CHANNEL_ID,
         icon = R.drawable.ic_stat_message,
     ),
     NEW_NOTE(
-        group = "new_notes_group",
         channel = NewNotesChannel.CHANNEL_ID,
         icon = R.drawable.ic_stat_note
     ),
     NEW_ANNOUNCEMENT(
-        group = "new_school_announcements_group",
         channel = NewSchoolAnnouncementsChannel.CHANNEL_ID,
         icon = R.drawable.ic_all_about
     ),
     CHANGE_TIMETABLE(
-        group = "change_timetable_group",
         channel = TimetableChangeChannel.CHANNEL_ID,
         icon = R.drawable.ic_main_timetable
     ),
     NEW_ATTENDANCE(
-        group = "new_attendance_group",
         channel = NewAttendanceChannel.CHANNEL_ID,
         icon = R.drawable.ic_main_attendance
     ),
     PUSH(
-        group = null,
         channel = PushChannel.CHANNEL_ID,
         icon = R.drawable.ic_stat_all
     )

app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt

@@ -3,14 +3,19 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.github.wulkanowy.data.waitForResult
 import javax.inject.Inject
 
 class AttendanceSummaryWork @Inject constructor(
     private val attendanceSummaryRepository: AttendanceSummaryRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).waitForResult()
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
+        attendanceSummaryRepository.getAttendanceSummary(
+            student = student,
+            semester = semester,
+            subjectId = -1,
+            forceRefresh = true,
+        ).waitForResult()
     }
 }

app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt

@@ -3,10 +3,9 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.AttendanceRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewAttendanceNotification
 import io.github.wulkanowy.utils.previousOrSameSchoolDay
-import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
@@ -14,17 +13,16 @@ import javax.inject.Inject
 class AttendanceWork @Inject constructor(
     private val attendanceRepository: AttendanceRepository,
     private val newAttendanceNotification: NewAttendanceNotification,
-    private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
         attendanceRepository.getAttendance(
             student = student,
             semester = semester,
             start = now().previousOrSameSchoolDay,
             end = now().previousOrSameSchoolDay,
             forceRefresh = true,
-            notify = preferencesRepository.isNotificationsEnable
+            notify = notify,
         )
             .waitForResult()
 

app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt

@@ -3,9 +3,9 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.CompletedLessonsRepository
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
 import java.time.LocalDate.now
 import javax.inject.Inject
 
@@ -13,7 +13,13 @@ class CompletedLessonWork @Inject constructor(
     private val completedLessonsRepository: CompletedLessonsRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().sunday, true).waitForResult()
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
+        completedLessonsRepository.getCompletedLessons(
+            student = student,
+            semester = semester,
+            start = now().monday,
+            end = now().sunday,
+            forceRefresh = true,
+        ).waitForResult()
     }
 }

app/src/main/java/io/github/wulkanowy/services/sync/works/ConferenceWork.kt

@@ -3,24 +3,22 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.ConferenceRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewConferenceNotification
-import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
 class ConferenceWork @Inject constructor(
     private val conferenceRepository: ConferenceRepository,
-    private val preferencesRepository: PreferencesRepository,
     private val newConferenceNotification: NewConferenceNotification,
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
         conferenceRepository.getConferences(
             student = student,
             semester = semester,
             forceRefresh = true,
-            notify = preferencesRepository.isNotificationsEnable
+            notify = notify
         ).waitForResult()
 
         conferenceRepository.getConferenceFromDatabase(semester).first()

app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt

@@ -3,27 +3,25 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.ExamRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewExamNotification
-import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
 
 class ExamWork @Inject constructor(
     private val examRepository: ExamRepository,
-    private val preferencesRepository: PreferencesRepository,
     private val newExamNotification: NewExamNotification,
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
         examRepository.getExams(
             student = student,
             semester = semester,
             start = now(),
             end = now(),
             forceRefresh = true,
-            notify = preferencesRepository.isNotificationsEnable
+            notify = notify,
         ).waitForResult()
 
         examRepository.getExamsFromDatabase(semester, now()).first()

app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt

@@ -3,14 +3,15 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.GradeStatisticsRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.github.wulkanowy.data.waitForResult
+
 import javax.inject.Inject
 
 class GradeStatisticsWork @Inject constructor(
     private val gradeStatisticsRepository: GradeStatisticsRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
         with(gradeStatisticsRepository) {
             getGradesPartialStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
             getGradesSemesterStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()

app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt

@@ -3,24 +3,22 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewGradeNotification
-import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
 class GradeWork @Inject constructor(
     private val gradeRepository: GradeRepository,
-    private val preferencesRepository: PreferencesRepository,
     private val newGradeNotification: NewGradeNotification,
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
         gradeRepository.getGrades(
             student = student,
             semester = semester,
             forceRefresh = true,
-            notify = preferencesRepository.isNotificationsEnable
+            notify = notify,
         ).waitForResult()
 
         gradeRepository.getGradesFromDatabase(semester).first()

app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt

@@ -3,28 +3,26 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.HomeworkRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewHomeworkNotification
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
 
 class HomeworkWork @Inject constructor(
     private val homeworkRepository: HomeworkRepository,
-    private val preferencesRepository: PreferencesRepository,
     private val newHomeworkNotification: NewHomeworkNotification,
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
         homeworkRepository.getHomework(
             student = student,
             semester = semester,
             start = now().nextOrSameSchoolDay,
             end = now().nextOrSameSchoolDay,
             forceRefresh = true,
-            notify = preferencesRepository.isNotificationsEnable
+            notify = notify,
         ).waitForResult()
 
         homeworkRepository.getHomeworkFromDatabase(semester, now(), now().plusDays(7)).first()

app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt

@@ -3,22 +3,20 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewLuckyNumberNotification
-import io.github.wulkanowy.utils.waitForResult
 import javax.inject.Inject
 
 class LuckyNumberWork @Inject constructor(
     private val luckyNumberRepository: LuckyNumberRepository,
-    private val preferencesRepository: PreferencesRepository,
     private val newLuckyNumberNotification: NewLuckyNumberNotification,
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
         luckyNumberRepository.getLuckyNumber(
             student = student,
             forceRefresh = true,
-            notify = preferencesRepository.isNotificationsEnable
+            notify = notify,
         ).waitForResult()
 
         luckyNumberRepository.getNotNotifiedLuckyNumber(student)?.let {

app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt

@@ -4,25 +4,23 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.MessageRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewMessageNotification
-import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
 class MessageWork @Inject constructor(
     private val messageRepository: MessageRepository,
-    private val preferencesRepository: PreferencesRepository,
     private val newMessageNotification: NewMessageNotification,
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
+    override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
         messageRepository.getMessages(
             student = student,
             semester = semester,
             folder = RECEIVED,
             forceRefresh = true,
-            notify = preferencesRepository.isNotificationsEnable
+            notify = notify
         ).waitForResult()
 
         messageRepository.getMessagesFromDatabase(student).first()