Merge branch 'develop' into feature/update-colors

---------

Co-authored-by: Faierbel <RafalBO99@outlook.com>

.circleci/config.yml

@@ -162,7 +162,7 @@ jobs:
             openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Publish release
-          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
 
 workflows:
   version: 2

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: wulkanowy
+custom: https://www.paypal.com/paypalme/wulkanowy

.github/workflows/deploy-store.yml

@@ -40,7 +40,7 @@ jobs:
           SINGLE_SUPPORT_AD_ID: ${{ secrets.SINGLE_SUPPORT_AD_ID }}
           DASHBOARD_TILE_AD_ID: ${{ secrets.DASHBOARD_TILE_AD_ID }}
           SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
-        run: ./gradlew publishPlayReleaseApps -PenableFirebase --stacktrace;
+        run: ./gradlew publishPlayReleaseApps --stacktrace;
 
   deploy-app-gallery:
     name: AppGallery

.github/workflows/deploy-test.yml

@@ -36,8 +36,7 @@ jobs:
       - name: Prepare build configuration
         run: |
           sed -i -e "s#applicationIdSuffix \".dev\"#applicationIdSuffix \".${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/build.gradle
-          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/google-services.json
-          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/agconnect-services.json
+          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/google-services.json
           sed -i -e '/versionNameSuffix/d' app/build.gradle
       - name: Add signing config
         run: |
@@ -131,7 +130,7 @@ jobs:
           BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
           BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
           BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-        run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
+        run: ./gradlew assemblePlayDebug --stacktrace
       - name: Upload apk to github artifacts
         uses: actions/upload-artifact@v3
         with:

.gitignore

@@ -65,6 +65,12 @@ captures/
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
 .idea/discord.xml
+.idea/migrations.xml
+.idea/androidTestResultsUserPreferences.xml
+.idea/copilot
+.idea/deploymentTargetDropDown.xml
+.idea/deploymentTargetSelector.xml
+.idea/kotlinc.xml
 
 # Keystore files
 *.jks
@@ -111,12 +117,13 @@ Thumbs.db
 *.ear
 
 ### AndroidStudio Patch ###
-
 !/gradle/wrapper/gradle-wrapper.jar
 .idea/jarRepositories.xml
 
+### Services config files
+agconnect-services.json
+agconnect-credentials.json
+google-services.json
+!app/google-services.json
+
 
-app/src/release/agconnect-services.json
-app/src/release/agconnect-credentials.json
-.idea/deploymentTargetDropDown.xml
-.idea/kotlinc.xml

.travis.yml

@@ -61,7 +61,7 @@ script:
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
+      ./gradlew publishPlayRelease --stacktrace;
     fi
 
 after_success:

app/build.gradle

@@ -27,15 +27,12 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 136
-        versionName "2.2.4"
+        versionCode 150
+        versionName "2.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
-        manifestPlaceholders = [
-            firebase_enabled: project.hasProperty("enableFirebase"),
-            admob_project_id: ""
-        ]
+        manifestPlaceholders = [admob_project_id: ""]
 
         buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
         buildConfigField "String", "DASHBOARD_TILE_AD_ID", "null"
@@ -76,7 +73,6 @@ android {
             resValue "string", "app_name", "Wulkanowy DEV"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            ext.enableCrashlytics = project.hasProperty("enableFirebase")
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
             buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
@@ -113,6 +109,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     bundle {
@@ -141,7 +138,9 @@ android {
     packagingOptions {
         resources {
             excludes += ['META-INF/library_release.kotlin_module',
-                         'META-INF/library-core_release.kotlin_module']
+                         'META-INF/library-core_release.kotlin_module',
+                         'META-INF/LICENSE.md',
+                         'META-INF/LICENSE-notice.md']
         }
     }
 
@@ -161,8 +160,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
-    userFraction = 0.01d
-    updatePriority = 0
+    userFraction = 0.50d
+    updatePriority = 1
     enabled.set(false)
 }
 
@@ -183,28 +182,28 @@ huaweiPublish {
 }
 
 ext {
-    work_manager = "2.8.1"
-    android_hilt = "1.0.0"
-    room = "2.6.0"
-    chucker = "3.5.2"
-    mockk = "1.13.8"
-    coroutines = "1.7.3"
+    work_manager = "2.9.0"
+    android_hilt = "1.2.0"
+    room = "2.6.1"
+    chucker = "4.0.0"
+    mockk = "1.13.10"
+    coroutines = "1.8.0"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.2.4'
+    implementation 'io.github.wulkanowy:sdk:2.5.1'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation "androidx.activity:activity-ktx:1.8.0"
+    implementation "androidx.activity:activity-ktx:1.8.2"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.6.1"
-    implementation "androidx.annotation:annotation:1.7.0"
+    implementation "androidx.fragment:fragment-ktx:1.6.2"
+    implementation "androidx.annotation:annotation:1.7.1"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
@@ -217,10 +216,10 @@ dependencies {
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.3.0'
 
-    implementation "androidx.work:work-runtime-ktx:$work_manager"
+    implementation "androidx.work:work-runtime:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -237,33 +236,36 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
     implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
+    implementation "com.squareup.okhttp3:okhttp-urlconnection:4.12.0"
 
     implementation "com.jakewharton.timber:timber:5.0.1"
-    implementation "at.favre.lib:slf4j-timber:1.0.1"
+    implementation 'com.github.Faierbel:slf4j-timber:2.0'
     implementation 'com.github.bastienpaulfr:Treessence:1.1.2'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:2.4.0"
+    implementation 'io.coil-kt:coil:2.6.0'
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
-    implementation 'org.apache.commons:commons-text:1.10.0'
+    implementation 'org.apache.commons:commons-text:1.11.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.4.0')
-    playImplementation 'com.google.firebase:firebase-analytics-ktx'
-    playImplementation 'com.google.firebase:firebase-messaging:'
+    playImplementation platform('com.google.firebase:firebase-bom:32.7.4')
+    playImplementation 'com.google.firebase:firebase-analytics'
+    playImplementation 'com.google.firebase:firebase-messaging'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
-    playImplementation 'com.google.firebase:firebase-config-ktx'
-    playImplementation 'com.google.android.gms:play-services-ads:22.4.0'
-    playImplementation "com.google.android.play:integrity:1.2.0"
+    playImplementation 'com.google.firebase:firebase-config'
+
+    playImplementation 'com.google.android.gms:play-services-ads:23.0.0'
+    playImplementation "com.google.android.play:integrity:1.3.0"
     playImplementation 'com.google.android.play:app-update-ktx:2.1.0'
     playImplementation 'com.google.android.play:review-ktx:2.0.1'
+    playImplementation "com.google.android.ump:user-messaging-platform:2.1.0"
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.12.0.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.301'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.12.0.301'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.303'
 
-    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
+    releaseImplementation "com.github.chuckerteam.chucker:library-no-op:$chucker"
 
-    debugImplementation "com.github.ChuckerTeam.Chucker:library:$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'
 
@@ -272,7 +274,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'org.robolectric:robolectric:4.11.1'
     testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"

app/jacoco.gradle

@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.10"
+    toolVersion "0.8.11"
     reportsDirectory.set(file("$buildDir/reports"))
 }
 

app/play-publish-lint.sh

@@ -1,7 +1,8 @@
 #!/bin/bash -
 
 content=$(cat < "app/src/main/play/release-notes/pl-PL/default.txt") || exit
-if [[ "${#content}" -gt 500 ]]; then
+content2=echo "$content" | dos2unix
+if [[ "${#content2}" -gt 500 ]]; then
     echo >&2 "Release notes content has reached the limit of 500 characters"
     exit 1
 fi

app/src/androidTest/java/io/github/wulkanowy/utils/security/ScramblerTest.kt

@@ -14,34 +14,37 @@ import kotlin.test.assertFailsWith
 @RunWith(AndroidJUnit4::class)
 class ScramblerTest {
 
+    private val scrambler = Scrambler(ApplicationProvider.getApplicationContext())
+
     @Test
     fun encryptDecryptTest() {
-        assertEquals("TEST", decrypt(encrypt("TEST",
-                ApplicationProvider.getApplicationContext())))
+        assertEquals(
+            "TEST", scrambler.decrypt(scrambler.encrypt("TEST"))
+        )
     }
 
     @Test
     fun emptyTextEncryptTest() {
         assertFailsWith<ScramblerException> {
-            decrypt("")
+            scrambler.decrypt("")
         }
 
         assertFailsWith<ScramblerException> {
-            encrypt("", ApplicationProvider.getApplicationContext())
+            scrambler.encrypt("")
         }
     }
 
     @Test
     @SdkSuppress(minSdkVersion = 18)
     fun emptyKeyStoreTest() {
-        val text = encrypt("test", ApplicationProvider.getApplicationContext())
+        val text = scrambler.encrypt("test")
 
         val keyStore = KeyStore.getInstance("AndroidKeyStore")
         keyStore.load(null)
         keyStore.deleteEntry("wulkanowy_password")
 
         assertFailsWith<ScramblerException> {
-            decrypt(text)
+            scrambler.decrypt(text)
         }
     }
 }

app/src/debug/agconnect-services.json

@@ -1,92 +0,0 @@
-{
-  "agcgw": {
-    "backurl": "connect-dre.hispace.hicloud.com",
-    "url": "connect-dre.dbankcloud.cn",
-    "websocketbackurl": "connect-ws-dre.hispace.dbankcloud.com",
-    "websocketurl": "connect-ws-dre.hispace.dbankcloud.cn"
-  },
-  "agcgw_all": {
-    "CN": "connect-drcn.dbankcloud.cn",
-    "CN_back": "connect-drcn.hispace.hicloud.com",
-    "DE": "connect-dre.dbankcloud.cn",
-    "DE_back": "connect-dre.hispace.hicloud.com",
-    "RU": "connect-drru.hispace.dbankcloud.ru",
-    "RU_back": "connect-drru.hispace.dbankcloud.cn",
-    "SG": "connect-dra.dbankcloud.cn",
-    "SG_back": "connect-dra.hispace.hicloud.com"
-  },
-  "websocketgw_all": {
-    "CN": "connect-ws-drcn.hispace.dbankcloud.cn",
-    "CN_back": "connect-ws-drcn.hispace.dbankcloud.com",
-    "DE": "connect-ws-dre.hispace.dbankcloud.cn",
-    "DE_back": "connect-ws-dre.hispace.dbankcloud.com",
-    "RU": "connect-ws-drru.hispace.dbankcloud.ru",
-    "RU_back": "connect-ws-drru.hispace.dbankcloud.cn",
-    "SG": "connect-ws-dra.hispace.dbankcloud.cn",
-    "SG_back": "connect-ws-dra.hispace.dbankcloud.com"
-  },
-  "client": {
-    "cp_id": "890048000024105546",
-    "product_id": "736430079244736562",
-    "client_id": "514530959291319360",
-    "client_secret": "C42522DBF17D3D4BBE9D9C1783A54484B7E6844B388B7A67502D36A633A4186B",
-    "project_id": "736430079244736562",
-    "app_id": "106552551",
-    "api_key": "CgB6e3x9BUNiq+r8ebCHNojjjYsMT4pJSjjNDOkm9owtBb6rVI6LjnASoZBRxbjjhObcrV5gANo99fI/eKZDTbWS",
-    "package_name": "io.github.wulkanowy.dev"
-  },
-  "oauth_client": {
-    "client_id": "106552551",
-    "client_type": 1
-  },
-  "app_info": {
-    "app_id": "106552551",
-    "package_name": "io.github.wulkanowy.dev"
-  },
-  "service": {
-    "analytics": {
-      "collector_url": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-      "collector_url_ru": "datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
-      "collector_url_sg": "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
-      "collector_url_de": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-      "collector_url_cn": "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
-      "resource_id": "p1",
-      "channel_id": ""
-    },
-		"search":{
-			"url":"https://search-dre.cloud.huawei.com"
-		},
-		"cloudstorage": {
-      "storage_url_sg_back": "https://agc-storage-dra.cloud.huawei.asia",
-      "storage_url_ru_back": "https://agc-storage-drru.cloud.huawei.ru",
-      "storage_url_ru": "https://agc-storage-drru.cloud.huawei.ru",
-      "storage_url_de_back": "https://agc-storage-dre.cloud.huawei.eu",
-      "storage_url_de": "https://ops-dre.agcstorage.link",
-      "storage_url": "https://agc-storage-drcn.platform.dbankcloud.cn",
-      "storage_url_sg": "https://ops-dra.agcstorage.link",
-      "storage_url_cn_back": "https://agc-storage-drcn.cloud.huawei.com.cn",
-      "storage_url_cn": "https://agc-storage-drcn.platform.dbankcloud.cn"
-    },
-    "ml": {
-      "mlservice_url": "ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
-    }
-  },
-  "region": "DE",
-  "configuration_version": "3.0",
-  "appInfos": [
-    {
-      "package_name": "io.github.wulkanowy.dev",
-      "client": {
-        "app_id": "106552551"
-      },
-      "app_info": {
-        "package_name": "io.github.wulkanowy.dev",
-        "app_id": "106552551"
-      },
-      "oauth_client": {
-        "client_type": 1,
-        "client_id": "106552551"
-      }
-    }
-  ]
-}

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

@@ -5,6 +5,7 @@ import android.view.View
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import kotlinx.coroutines.flow.MutableStateFlow
 import javax.inject.Inject
 
 @Suppress("unused")
@@ -13,9 +14,11 @@ class AdsHelper @Inject constructor(
     private val preferencesRepository: PreferencesRepository
 ) {
 
+    val isMobileAdsSdkInitialized = MutableStateFlow(false)
+    val canShowAd = false
+
     fun initialize() {
         preferencesRepository.isAdsEnabled = false
-        preferencesRepository.isAgreeToProcessData = false
         preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
     }
 

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

@@ -5,6 +5,7 @@ import android.view.View
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import kotlinx.coroutines.flow.MutableStateFlow
 import javax.inject.Inject
 
 @Suppress("unused")
@@ -12,10 +13,11 @@ class AdsHelper @Inject constructor(
     @ApplicationContext private val context: Context,
     private val preferencesRepository: PreferencesRepository
 ) {
+    val isMobileAdsSdkInitialized = MutableStateFlow(false)
+    val canShowAd = false
 
     fun initialize() {
         preferencesRepository.isAdsEnabled = false
-        preferencesRepository.isAgreeToProcessData = false
         preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
     }
 

app/src/main/AndroidManifest.xml

@@ -44,6 +44,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
+        android:resizeableActivity="true"
         tools:ignore="DataExtractionRules,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
@@ -154,33 +155,9 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
-        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
-        <provider
-            android:name="com.google.firebase.provider.FirebaseInitProvider"
-            android:authorities="${applicationId}.firebaseinitprovider"
-            android:enabled="${firebase_enabled}"
-            android:exported="false"
-            tools:ignore="MissingClass" />
-
         <meta-data
             android:name="install_channel"
             android:value="${install_channel}" />
-        <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="google_analytics_adid_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="firebase_crashlytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="firebase_messaging_auto_init_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
-            android:value="${firebase_enabled}" />
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/ic_stat_all" />

app/src/main/assets/contributors.json

@@ -54,5 +54,9 @@
   {
     "displayName": "Antoni Paduch",
     "githubUsername": "janAte1"
+  },
+  {
+    "displayName": "Kamil Wąsik",
+    "githubUsername": "JestemKamil"
   }
 ]

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

@@ -1,7 +1,9 @@
 package io.github.wulkanowy
 
 import android.app.Application
-import android.util.Log.*
+import android.util.Log.DEBUG
+import android.util.Log.INFO
+import android.util.Log.VERBOSE
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.yariksoffice.lingver.Lingver
@@ -9,16 +11,19 @@ import dagger.hilt.android.HiltAndroidApp
 import fr.bipi.treessence.file.FileLoggerTree
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.base.ThemeManager
-import io.github.wulkanowy.utils.*
+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.RemoteConfigHelper
 import timber.log.Timber
 import javax.inject.Inject
 
 @HiltAndroidApp
 class WulkanowyApp : Application(), Configuration.Provider {
 
-    @Inject
-    lateinit var workerFactory: HiltWorkerFactory
-
     @Inject
     lateinit var themeManager: ThemeManager
 
@@ -32,16 +37,21 @@ class WulkanowyApp : Application(), Configuration.Provider {
     lateinit var analyticsHelper: AnalyticsHelper
 
     @Inject
-    lateinit var adsHelper: AdsHelper
+    lateinit var remoteConfigHelper: RemoteConfigHelper
 
     @Inject
-    lateinit var remoteConfigHelper: RemoteConfigHelper
+    lateinit var workerFactory: HiltWorkerFactory
+
+    override val workManagerConfiguration: Configuration
+        get() = Configuration.Builder()
+            .setWorkerFactory(workerFactory)
+            .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
+            .build()
 
     override fun onCreate() {
         super.onCreate()
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
-        adsHelper.initialize()
         remoteConfigHelper.initialize()
         initLogging()
     }
@@ -74,9 +84,4 @@ class WulkanowyApp : Application(), Configuration.Provider {
             analyticsHelper.logEvent("language", "startup" to preferencesRepository.appLanguage)
         }
     }
-
-    override fun getWorkManagerConfiguration() = Configuration.Builder()
-        .setWorkerFactory(workerFactory)
-        .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
-        .build()
 }

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

@@ -18,16 +18,13 @@ import io.github.wulkanowy.data.api.SchoolsService
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.RemoteConfigHelper
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.create
-import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
 
@@ -35,19 +32,6 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 internal class DataModule {
 
-    @Singleton
-    @Provides
-    fun provideSdk(chuckerInterceptor: ChuckerInterceptor, remoteConfig: RemoteConfigHelper) =
-        Sdk().apply {
-            androidVersion = android.os.Build.VERSION.RELEASE
-            buildTag = android.os.Build.MODEL
-            userAgentTemplate = remoteConfig.userAgentTemplate
-            setSimpleHttpLogger { Timber.d(it) }
-
-            // for debug only
-            addInterceptor(chuckerInterceptor, network = true)
-        }
-
     @Singleton
     @Provides
     fun provideChuckerCollector(
@@ -251,4 +235,12 @@ internal class DataModule {
     @Singleton
     @Provides
     fun provideAdminMessageDao(database: AppDatabase) = database.adminMessagesDao
+
+    @Singleton
+    @Provides
+    fun provideMutesDao(database: AppDatabase) = database.mutedMessageSendersDao
+
+    @Singleton
+    @Provides
+    fun provideGradeDescriptiveDao(database: AppDatabase) = database.gradeDescriptiveDao
 }

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

@@ -1,27 +1,73 @@
 package io.github.wulkanowy.data
 
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
-sealed class Resource<T> {
-
-    open class Loading<T> : Resource<T>()
+sealed interface Resource<out T> {
+    /**
+     * The initial value of a resource flow. Indicates no data that is currently available to be shown,
+     * however with the expectation that the state will transition to another one soon.
+     */
+    open class Loading<T> : Resource<T>
 
+    /**
+     * A semi-loading state with some data available to be displayed (usually cached data loaded from
+     * the database). Still not the target state and it's expected to transition into another one soon.
+     */
     data class Intermediate<T>(val data: T) : Loading<T>()
 
-    data class Success<T>(val data: T) : Resource<T>()
+    /**
+     * The happy-path target state. Data can either be:
+     * - loaded from the database - while it may seem like this case is already handled by the
+     *   Intermediate state, the difference here is semantic. Cached data is returned as Intermediate
+     *   when there's a API request in progress (or soon expected to be), however when there is no
+     *   intention of immediately querying the API, the cached data is returned as a Success.
+     * - fetched from the API.
+     */
+    data class Success<T>(val data: T) : Resource<T>
 
-    data class Error<T>(val error: Throwable) : Resource<T>()
+    /**
+     * Something bad happened and we were unable to get the requested data. This can be caused by
+     * a database error, a network error, or really just any other error. Upon receiving this state
+     * the UI can either: display a full screen error, or, when it has received any data previously,
+     * display a snack bar informing of the problem.
+     */
+    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
+        else -> null
+    }
+
+val <T> Resource<T>.dataOrThrow: T
+    get() = when (this) {
+        is Resource.Success -> this.data
+        is Resource.Intermediate -> this.data
+        is Resource.Loading -> throw IllegalStateException("Resource is in loading state")
+        is Resource.Error -> throw this.error
     }
 
 val <T> Resource<T>.errorOrNull: Throwable?
@@ -47,6 +93,22 @@ fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
     is Resource.Error -> Resource.Error(this.error)
 }
 
+/**
+ * Injects another flow into this flow's resource data.
+ */
+inline fun <T1, T2, R> Flow<Resource<T1>>.combineWithResourceData(
+    flow: Flow<T2>,
+    crossinline block: suspend (T1, T2) -> R
+): Flow<Resource<R>> =
+    combine(flow) { resource, inject ->
+        when (resource) {
+            is Resource.Success -> Resource.Success(block(resource.data, inject))
+            is Resource.Intermediate -> Resource.Intermediate(block(resource.data, inject))
+            is Resource.Loading -> Resource.Loading()
+            is Resource.Error -> Resource.Error(resource.error)
+        }
+    }
+
 fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = false) = onEach {
     val description = when (it) {
         is Resource.Intermediate -> "intermediate data received" + if (showData) " (data: `${it.data}`)" else ""
@@ -57,8 +119,29 @@ fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = fa
     Timber.i("$name: $description")
 }
 
-fun <T, U> Flow<Resource<T>>.mapResourceData(block: (T) -> U) = map {
-    it.mapData(block)
+inline fun <T, U> Flow<Resource<T>>.mapResourceData(crossinline block: suspend (T) -> U) = map {
+    when (it) {
+        is Resource.Success -> Resource.Success(block(it.data))
+        is Resource.Intermediate -> Resource.Intermediate(block(it.data))
+        is Resource.Loading -> Resource.Loading()
+        is Resource.Error -> Resource.Error(it.error)
+    }
+}
+
+@OptIn(ExperimentalCoroutinesApi::class)
+fun <T, U> Flow<Resource<T>>.flatMapResourceData(
+    inheritIntermediate: Boolean = true, block: suspend (T) -> Flow<Resource<U>>
+) = flatMapLatest {
+    when (it) {
+        is Resource.Success -> block(it.data)
+        is Resource.Intermediate -> block(it.data).map { newRes ->
+            if (inheritIntermediate && newRes is Resource.Success) Resource.Intermediate(newRes.data)
+            else newRes
+        }
+
+        is Resource.Loading -> flowOf(Resource.Loading())
+        is Resource.Error -> flowOf(Resource.Error(it.error))
+    }
 }
 
 fun <T> Flow<Resource<T>>.onResourceData(block: suspend (T) -> Unit) = onEach {
@@ -88,13 +171,13 @@ fun <T> Flow<Resource<T>>.onResourceSuccess(block: suspend (T) -> Unit) = onEach
     }
 }
 
-fun <T> Flow<Resource<T>>.onResourceError(block: (Throwable) -> Unit) = onEach {
+fun <T> Flow<Resource<T>>.onResourceError(block: suspend (Throwable) -> Unit) = onEach {
     if (it is Resource.Error) {
         block(it.error)
     }
 }
 
-fun <T> Flow<Resource<T>>.onResourceNotLoading(block: () -> Unit) = onEach {
+fun <T> Flow<Resource<T>>.onResourceNotLoading(block: suspend () -> Unit) = onEach {
     if (it !is Resource.Loading) {
         block()
     }
@@ -104,70 +187,99 @@ suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it !is Resource.Loa
 
 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())
+// Can cause excessive amounts of `Resource.Intermediate` to be emitted. Unless that is desired,
+// use `debounceIntermediates` to alleviate this behavior.
+inline fun <reified T> combineResourceFlows(flows: Iterable<Flow<Resource<T>>>): Flow<Resource<List<T>>> =
+    combine(flows) { items ->
+        var isIntermediate = false
+        val data = mutableListOf<T>()
+        for (item in items) {
+            when (item) {
+                is Resource.Success -> data.add(item.data)
+                is Resource.Intermediate -> {
+                    isIntermediate = true
+                    data.add(item.data)
+                }
 
-    val data = query().first()
-    emitAll(if (shouldFetch(data)) {
-        val filteredResult = filterResult(data)
-
-        if (showSavedOnLoading && !isResultEmpty(filteredResult)) {
-            emit(Resource.Intermediate(filteredResult))
+                is Resource.Loading -> return@combine Resource.Loading()
+                is Resource.Error -> continue
+            }
         }
-
-        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) }
+        if (data.isEmpty()) {
+            // All items have to be errors for this to happen, so just return the first one.
+            // mapData is functionally useless and exists only to satisfy the type checker
+            items.first().mapData { listOf(it) }
+        } else if (isIntermediate) {
+            Resource.Intermediate(data)
+        } else {
+            Resource.Success(data)
+        }
+    }
+
+@OptIn(FlowPreview::class)
+fun <T> Flow<Resource<T>>.debounceIntermediates(timeout: Duration = 5.seconds) = flow {
+    var wasIntermediate = false
+
+    emitAll(this@debounceIntermediates.debounce {
+        if (it is Resource.Intermediate) {
+            if (!wasIntermediate) {
+                wasIntermediate = true
+                Duration.ZERO
+            } else {
+                timeout
+            }
+        } else {
+            wasIntermediate = false
+            Duration.ZERO
         }
-    } else {
-        query().map { Resource.Success(filterResult(it)) }
     })
 }
 
+
+inline fun <OutputType, ApiType> networkBoundResource(
+    mutex: Mutex = Mutex(),
+    crossinline isResultEmpty: (OutputType) -> Boolean,
+    crossinline query: () -> Flow<OutputType>,
+    crossinline fetch: suspend () -> ApiType,
+    crossinline saveFetchResult: suspend (old: OutputType, new: ApiType) -> Unit,
+    crossinline shouldFetch: (OutputType) -> Boolean = { true },
+    crossinline filterResult: (OutputType) -> OutputType = { it }
+) = networkBoundResource(
+    mutex = mutex,
+    isResultEmpty = isResultEmpty,
+    query = query,
+    fetch = fetch,
+    saveFetchResult = saveFetchResult,
+    shouldFetch = shouldFetch,
+    mapResult = filterResult
+)
+
 @JvmName("networkBoundResourceWithMap")
-inline fun <ResultType, RequestType, T> networkBoundResource(
+inline fun <DatabaseType, ApiType, OutputType> 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,
+    crossinline isResultEmpty: (OutputType) -> Boolean,
+    crossinline query: () -> Flow<DatabaseType>,
+    crossinline fetch: suspend () -> ApiType,
+    crossinline saveFetchResult: suspend (old: DatabaseType, new: ApiType) -> Unit,
+    crossinline shouldFetch: (DatabaseType) -> Boolean = { true },
+    crossinline mapResult: (DatabaseType) -> OutputType,
 ) = flow {
     emit(Resource.Loading())
 
     val data = query().first()
-    emitAll(if (shouldFetch(data)) {
-        val mappedResult = mapResult(data)
+    if (shouldFetch(data)) {
+        emit(Resource.Intermediate(data))
 
-        if (showSavedOnLoading && !isResultEmpty(mappedResult)) {
-            emit(Resource.Intermediate(mappedResult))
-        }
         try {
-            val newData = fetch(data)
+            val newData = fetch()
             mutex.withLock { saveFetchResult(query().first(), newData) }
-            query().map { Resource.Success(mapResult(it)) }
         } catch (throwable: Throwable) {
-            onFetchFailed(throwable)
-            query().map { Resource.Error(throwable) }
+            emit(Resource.Error(throwable))
+            return@flow
         }
-    } else {
-        query().map { Resource.Success(mapResult(it)) }
-    })
+    }
+
+    emitAll(query().map { Resource.Success(it) })
 }
+    .mapResourceData { mapResult(it) }
+    .filterNot { it is Resource.Intermediate && isResultEmpty(it.data) }

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

@@ -0,0 +1,64 @@
+package io.github.wulkanowy.data
+
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.RemoteConfigHelper
+import io.github.wulkanowy.utils.WebkitCookieManagerProxy
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WulkanowySdkFactory @Inject constructor(
+    private val chuckerInterceptor: ChuckerInterceptor,
+    private val remoteConfig: RemoteConfigHelper,
+    private val webkitCookieManagerProxy: WebkitCookieManagerProxy
+) {
+
+    private val sdk = Sdk().apply {
+        androidVersion = android.os.Build.VERSION.RELEASE
+        buildTag = android.os.Build.MODEL
+        userAgentTemplate = remoteConfig.userAgentTemplate
+        setSimpleHttpLogger { Timber.d(it) }
+        setAdditionalCookieManager(webkitCookieManagerProxy)
+
+        // for debug only
+        addInterceptor(chuckerInterceptor, network = true)
+    }
+
+    fun create() = sdk
+
+    fun create(student: Student, semester: Semester? = null): Sdk {
+        return create().apply {
+            email = student.email
+            password = student.password
+            symbol = student.symbol
+            schoolSymbol = student.schoolSymbol
+            studentId = student.studentId
+            classId = student.classId
+            emptyCookieJarInterceptor = true
+
+            if (Sdk.Mode.valueOf(student.loginMode) == Sdk.Mode.HEBE) {
+                mobileBaseUrl = student.mobileBaseUrl
+            } else {
+                scrapperBaseUrl = student.scrapperBaseUrl
+                domainSuffix = student.scrapperDomainSuffix
+                loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
+            }
+
+            mode = Sdk.Mode.valueOf(student.loginMode)
+            mobileBaseUrl = student.mobileBaseUrl
+            keyId = student.certificateKey
+            privatePem = student.privateKey
+
+            if (semester != null) {
+                diaryId = semester.diaryId
+                kindergartenDiaryId = semester.kindergartenDiaryId
+                schoolYear = semester.schoolYear
+                unitId = semester.unitId
+            }
+        }
+    }
+}

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

@@ -1,11 +1,128 @@
 package io.github.wulkanowy.data.db
 
 import android.content.Context
-import androidx.room.*
+import androidx.room.AutoMigration
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
-import io.github.wulkanowy.data.db.dao.*
-import io.github.wulkanowy.data.db.entities.*
-import io.github.wulkanowy.data.db.migrations.*
+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.GradeDescriptiveDao
+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.MailboxDao
+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.MutedMessageSendersDao
+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.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.GradeDescriptive
+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.Mailbox
+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.MutedMessageSender
+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.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.Migration46
+import io.github.wulkanowy.data.db.migrations.Migration49
+import io.github.wulkanowy.data.db.migrations.Migration5
+import io.github.wulkanowy.data.db.migrations.Migration50
+import io.github.wulkanowy.data.db.migrations.Migration51
+import io.github.wulkanowy.data.db.migrations.Migration53
+import io.github.wulkanowy.data.db.migrations.Migration54
+import io.github.wulkanowy.data.db.migrations.Migration55
+import io.github.wulkanowy.data.db.migrations.Migration57
+import io.github.wulkanowy.data.db.migrations.Migration58
+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.utils.AppInfo
 import javax.inject.Singleton
 
@@ -41,7 +158,9 @@ import javax.inject.Singleton
         TimetableHeader::class,
         SchoolAnnouncement::class,
         Notification::class,
-        AdminMessage::class
+        AdminMessage::class,
+        MutedMessageSender::class,
+        GradeDescriptive::class,
     ],
     autoMigrations = [
         AutoMigration(from = 44, to = 45),
@@ -51,6 +170,10 @@ import javax.inject.Singleton
         AutoMigration(from = 54, to = 55, spec = Migration55::class),
         AutoMigration(from = 55, to = 56),
         AutoMigration(from = 56, to = 57, spec = Migration57::class),
+        AutoMigration(from = 57, to = 58, spec = Migration58::class),
+        AutoMigration(from = 58, to = 59),
+        AutoMigration(from = 59, to = 60),
+        AutoMigration(from = 60, to = 61),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -59,7 +182,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 57
+        const val VERSION_SCHEMA = 61
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -184,4 +307,8 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val notificationDao: NotificationDao
 
     abstract val adminMessagesDao: AdminMessageDao
+
+    abstract val mutedMessageSendersDao: MutedMessageSendersDao
+  
+    abstract val gradeDescriptiveDao: GradeDescriptiveDao
 }

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

@@ -2,24 +2,14 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Query
-import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
 @Dao
-abstract class AdminMessageDao : BaseDao<AdminMessage> {
+interface AdminMessageDao : BaseDao<AdminMessage> {
 
     @Query("SELECT * FROM AdminMessages")
-    abstract fun loadAll(): Flow<List<AdminMessage>>
-
-    @Transaction
-    open suspend fun removeOldAndSaveNew(
-        oldMessages: List<AdminMessage>,
-        newMessages: List<AdminMessage>
-    ) {
-        deleteAll(oldMessages)
-        insertAll(newMessages)
-    }
+    fun loadAll(): Flow<List<AdminMessage>>
 }

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
+import androidx.room.Transaction
 import androidx.room.Update
 
 interface BaseDao<T> {
@@ -15,4 +16,10 @@ interface BaseDao<T> {
 
     @Delete
     suspend fun deleteAll(items: List<T>)
+
+    @Transaction
+    suspend fun removeOldAndSaveNew(oldItems: List<T>, newItems: List<T>) {
+        deleteAll(oldItems)
+        insertAll(newItems)
+    }
 }

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

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.GradeDescriptive
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface GradeDescriptiveDao : BaseDao<GradeDescriptive> {
+
+    @Query("SELECT * FROM GradesDescriptive WHERE semester_id = :semesterId AND student_id = :studentId")
+    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradeDescriptive>>
+}

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

@@ -5,15 +5,23 @@ import androidx.room.Query
 import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.MessageWithMutedAuthor
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
-
     @Transaction
     @Query("SELECT * FROM Messages WHERE message_global_key = :messageGlobalKey")
     fun loadMessageWithAttachment(messageGlobalKey: String): Flow<MessageWithAttachment?>
 
+    @Transaction
+    @Query("SELECT * FROM Messages WHERE mailbox_key = :mailboxKey AND folder_id = :folder ORDER BY date DESC")
+    fun loadMessagesWithMutedAuthor(mailboxKey: String, folder: Int): Flow<List<MessageWithMutedAuthor>>
+
+    @Transaction
+    @Query("SELECT * FROM Messages WHERE email = :email AND folder_id = :folder ORDER BY date DESC")
+    fun loadMessagesWithMutedAuthor(folder: Int, email: String): Flow<List<MessageWithMutedAuthor>>
+
     @Query("SELECT * FROM Messages WHERE mailbox_key = :mailboxKey AND folder_id = :folder ORDER BY date DESC")
     fun loadAll(mailboxKey: String, folder: Int): Flow<List<Message>>
 

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

@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.MutedMessageSender
+
+@Dao
+interface MutedMessageSendersDao : BaseDao<MutedMessageSender> {
+
+    @Query("SELECT COUNT(*) FROM MutedMessageSenders WHERE author = :author")
+    suspend fun checkMute(author: String): Boolean
+
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    suspend fun insertMute(mute: MutedMessageSender): Long
+
+    @Query("DELETE FROM MutedMessageSenders WHERE author = :author")
+    suspend fun deleteMute(author: String)
+}

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

@@ -1,11 +1,16 @@
 package io.github.wulkanowy.data.db.dao
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import javax.inject.Singleton
 
 @Singleton
@@ -47,6 +52,9 @@ abstract class StudentDao {
     @Query("UPDATE Students SET is_current = 0")
     abstract suspend fun resetCurrent()
 
+    @Query("DELETE FROM Students WHERE email = :email AND user_name = :userName")
+    abstract suspend fun deleteByEmailAndUserName(email: String, userName: String)
+
     @Transaction
     open suspend fun switchCurrent(id: Long) {
         resetCurrent()

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

@@ -15,5 +15,5 @@ interface TimetableDao : BaseDao<Timetable> {
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Timetable>>
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun load(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): List<Timetable>
+    suspend fun load(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): List<Timetable>
 }

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

@@ -37,6 +37,9 @@ data class AdminMessage(
     @ColumnInfo(name = "types", defaultValue = "[]")
     val types: List<MessageType> = emptyList(),
 
-    @ColumnInfo(name = "is_dismissible")
-    val isDismissible: Boolean = false
+    @ColumnInfo(name = "is_ok_visible", defaultValue = "0")
+    val isOkVisible: Boolean = false,
+
+    @ColumnInfo(name = "is_x_visible", defaultValue = "0")
+    val isXVisible: Boolean = false
 )

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

@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity(tableName = "GradesDescriptive")
+data class GradeDescriptive(
+
+    @ColumnInfo(name = "semester_id")
+    val semesterId: Int,
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    val subject: String,
+
+    val description: String,
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
+}

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

@@ -2,11 +2,15 @@ package io.github.wulkanowy.data.db.entities
 
 import androidx.room.Embedded
 import androidx.room.Relation
+import java.io.Serializable
 
 data class MessageWithAttachment(
     @Embedded
     val message: Message,
 
     @Relation(parentColumn = "message_global_key", entityColumn = "message_global_key")
-    val attachments: List<MessageAttachment>
-)
+    val attachments: List<MessageAttachment>,
+
+    @Relation(parentColumn = "correspondents", entityColumn = "author")
+    val mutedMessageSender: MutedMessageSender?,
+) : Serializable

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

@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+data class MessageWithMutedAuthor(
+    @Embedded
+    val message: Message,
+
+    @Relation(parentColumn = "correspondents", entityColumn = "author")
+    val mutedMessageSender: MutedMessageSender?,
+)

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

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity(tableName = "MutedMessageSenders")
+data class MutedMessageSender(
+    @ColumnInfo(name = "author")
+    val author: String,
+) : Serializable {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

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

@@ -16,7 +16,9 @@ data class SchoolAnnouncement(
 
     val subject: String,
 
-    val content: String
+    val content: String,
+
+    val author: String? = null,
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration10 : Migration(9, 10) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Grades_Summary RENAME TO GradesSummary")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Grades_Summary RENAME TO GradesSummary")
     }
 }

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration11 : Migration(10, 11) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Grades_temp (
                 id INTEGER PRIMARY KEY NOT NULL,
                 is_read INTEGER NOT NULL,
@@ -26,9 +27,10 @@ class Migration11 : Migration(10, 11) {
                 date INTEGER NOT NULL,
                 teacher TEXT NOT NULL
             )
-        """)
-        database.execSQL("INSERT INTO Grades_temp SELECT * FROM Grades")
-        database.execSQL("DROP TABLE Grades")
-        database.execSQL("ALTER TABLE Grades_temp RENAME TO Grades")
+        """
+        )
+        db.execSQL("INSERT INTO Grades_temp SELECT * FROM Grades")
+        db.execSQL("DROP TABLE Grades")
+        db.execSQL("ALTER TABLE Grades_temp RENAME TO Grades")
     }
 }

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

@@ -5,16 +5,17 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration12 : Migration(11, 12) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createTempStudentsTable(database)
-        replaceStudentTable(database)
-        updateStudentsWithClassId(database, getStudentsIds(database))
-        removeStudentsWithNoClassId(database)
-        ensureThereIsOnlyOneCurrentStudent(database)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        createTempStudentsTable(db)
+        replaceStudentTable(db)
+        updateStudentsWithClassId(db, getStudentsIds(db))
+        removeStudentsWithNoClassId(db)
+        ensureThereIsOnlyOneCurrentStudent(db)
     }
 
-    private fun createTempStudentsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    private fun createTempStudentsTable(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Students_tmp (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 endpoint TEXT NOT NULL,
@@ -30,15 +31,16 @@ class Migration12 : Migration(11, 12) {
                 registration_date INTEGER NOT NULL,
                 class_id INTEGER NOT NULL
             )
-        """)
-        database.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students_tmp (email, symbol, student_id, school_id, class_id)")
+        """
+        )
+        db.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students_tmp (email, symbol, student_id, school_id, class_id)")
     }
 
-    private fun replaceStudentTable(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("INSERT INTO Students_tmp SELECT * FROM Students")
-        database.execSQL("DROP TABLE Students")
-        database.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
+    private fun replaceStudentTable(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Students ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
+        db.execSQL("INSERT INTO Students_tmp SELECT * FROM Students")
+        db.execSQL("DROP TABLE Students")
+        db.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
     }
 
     private fun getStudentsIds(database: SupportSQLiteDatabase): List<Int> {
@@ -54,18 +56,18 @@ class Migration12 : Migration(11, 12) {
         return students
     }
 
-    private fun updateStudentsWithClassId(database: SupportSQLiteDatabase, students: List<Int>) {
+    private fun updateStudentsWithClassId(db: SupportSQLiteDatabase, students: List<Int>) {
         students.forEach {
-            database.execSQL("UPDATE Students SET class_id = IFNULL((SELECT class_id FROM Semesters WHERE student_id = $it), 0) WHERE student_id = $it")
+            db.execSQL("UPDATE Students SET class_id = IFNULL((SELECT class_id FROM Semesters WHERE student_id = $it), 0) WHERE student_id = $it")
         }
     }
 
-    private fun removeStudentsWithNoClassId(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Students WHERE class_id = 0")
+    private fun removeStudentsWithNoClassId(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM Students WHERE class_id = 0")
     }
 
-    private fun ensureThereIsOnlyOneCurrentStudent(database: SupportSQLiteDatabase) {
-        database.execSQL("UPDATE Students SET is_current = 0")
-        database.execSQL("UPDATE Students SET is_current = 1 WHERE id = (SELECT MAX(id) FROM Students)")
+    private fun ensureThereIsOnlyOneCurrentStudent(db: SupportSQLiteDatabase) {
+        db.execSQL("UPDATE Students SET is_current = 0")
+        db.execSQL("UPDATE Students SET is_current = 1 WHERE id = (SELECT MAX(id) FROM Students)")
     }
 }

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

@@ -5,27 +5,30 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration13 : Migration(12, 13) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        addClassNameToStudents(database, getStudentsIds(database))
-        updateSemestersTable(database)
-        markAtLeastAndOnlyOneSemesterAtCurrent(database, getStudentsAndClassIds(database))
-        clearMessagesTable(database)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        addClassNameToStudents(db, getStudentsIds(db))
+        updateSemestersTable(db)
+        markAtLeastAndOnlyOneSemesterAtCurrent(db, getStudentsAndClassIds(db))
+        clearMessagesTable(db)
     }
 
-    private fun addClassNameToStudents(database: SupportSQLiteDatabase, students: List<Pair<Int, String>>) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN class_name TEXT DEFAULT \"\" NOT NULL")
+    private fun addClassNameToStudents(
+        db: SupportSQLiteDatabase,
+        students: List<Pair<Int, String>>
+    ) {
+        db.execSQL("ALTER TABLE Students ADD COLUMN class_name TEXT DEFAULT \"\" NOT NULL")
 
         students.forEach { (id, name) ->
             val schoolName = name.substringAfter(" - ")
             val className = name.substringBefore(" - ", "").replace("Klasa ", "")
-            database.execSQL("UPDATE Students SET class_name = '$className' WHERE id = '$id'")
-            database.execSQL("UPDATE Students SET school_name = '$schoolName' WHERE id = '$id'")
+            db.execSQL("UPDATE Students SET class_name = '$className' WHERE id = '$id'")
+            db.execSQL("UPDATE Students SET school_name = '$schoolName' WHERE id = '$id'")
         }
     }
 
-    private fun getStudentsIds(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
+    private fun getStudentsIds(db: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
         val students = mutableListOf<Pair<Int, String>>()
-        database.query("SELECT id, school_name FROM Students").use {
+        db.query("SELECT id, school_name FROM Students").use {
             if (it.moveToFirst()) {
                 do {
                     students.add(it.getInt(0) to it.getString(1))
@@ -36,15 +39,15 @@ class Migration13 : Migration(12, 13) {
         return students
     }
 
-    private fun updateSemestersTable(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN school_year INTEGER DEFAULT 1970 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN start INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN `end` INTEGER DEFAULT 0 NOT NULL")
+    private fun updateSemestersTable(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Semesters ADD COLUMN school_year INTEGER DEFAULT 1970 NOT NULL")
+        db.execSQL("ALTER TABLE Semesters ADD COLUMN start INTEGER DEFAULT 0 NOT NULL")
+        db.execSQL("ALTER TABLE Semesters ADD COLUMN `end` INTEGER DEFAULT 0 NOT NULL")
     }
 
-    private fun getStudentsAndClassIds(database: SupportSQLiteDatabase): List<Pair<Int, Int>> {
+    private fun getStudentsAndClassIds(db: SupportSQLiteDatabase): List<Pair<Int, Int>> {
         val students = mutableListOf<Pair<Int, Int>>()
-        database.query("SELECT student_id, class_id FROM Students").use {
+        db.query("SELECT student_id, class_id FROM Students").use {
             if (it.moveToFirst()) {
                 do {
                     students.add(it.getInt(0) to it.getInt(1))
@@ -55,14 +58,17 @@ class Migration13 : Migration(12, 13) {
         return students
     }
 
-    private fun markAtLeastAndOnlyOneSemesterAtCurrent(database: SupportSQLiteDatabase, students: List<Pair<Int, Int>>) {
+    private fun markAtLeastAndOnlyOneSemesterAtCurrent(
+        db: SupportSQLiteDatabase,
+        students: List<Pair<Int, Int>>
+    ) {
         students.forEach { (studentId, classId) ->
-            database.execSQL("UPDATE Semesters SET is_current = 0 WHERE student_id = '$studentId' AND class_id = '$classId'")
-            database.execSQL("UPDATE Semesters SET is_current = 1 WHERE id = (SELECT id FROM Semesters WHERE student_id = '$studentId' AND class_id = '$classId' ORDER BY semester_id DESC)")
+            db.execSQL("UPDATE Semesters SET is_current = 0 WHERE student_id = '$studentId' AND class_id = '$classId'")
+            db.execSQL("UPDATE Semesters SET is_current = 1 WHERE id = (SELECT id FROM Semesters WHERE student_id = '$studentId' AND class_id = '$classId' ORDER BY semester_id DESC)")
         }
     }
 
-    private fun clearMessagesTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Messages")
+    private fun clearMessagesTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM Messages")
     }
 }

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

@@ -5,9 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration14 : Migration(13, 14) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS GradesSummary")
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS GradesSummary")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS GradesSummary (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 semester_id INTEGER NOT NULL,

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration15 : Migration(14, 15) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS MobileDevices (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 student_id INTEGER NOT NULL,
@@ -14,6 +15,7 @@ class Migration15 : Migration(14, 15) {
                 name TEXT NOT NULL,
                 date INTEGER NOT NULL
             )
-        """)
+        """
+        )
     }
 }

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration16 : Migration(15, 16) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Teachers (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 student_id INTEGER NOT NULL,
@@ -15,6 +16,7 @@ class Migration16 : Migration(15, 16) {
                 name TEXT NOT NULL,
                 short_name TEXT NOT NULL
             )
-        """)
+        """
+        )
     }
 }

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

@@ -5,13 +5,14 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration17 : Migration(16, 17) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createGradesPointsStatisticsTable(database)
-        truncateSemestersTable(database)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        createGradesPointsStatisticsTable(db)
+        truncateSemestersTable(db)
     }
 
-    private fun createGradesPointsStatisticsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    private fun createGradesPointsStatisticsTable(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS GradesPointsStatistics(
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 student_id INTEGER NOT NULL,
@@ -20,10 +21,11 @@ class Migration17 : Migration(16, 17) {
                 others REAL NOT NULL,
                 student REAL NOT NULL
             )
-        """)
+        """
+        )
     }
 
-    private fun truncateSemestersTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Semesters")
+    private fun truncateSemestersTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM Semesters")
     }
 }

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration18 : Migration(17, 18) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS School (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 student_id INTEGER NOT NULL,

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

@@ -6,16 +6,17 @@ import io.github.wulkanowy.data.db.SharedPrefProvider
 
 class Migration19(private val sharedPrefProvider: SharedPrefProvider) : Migration(18, 19) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        migrateMessages(database)
-        migrateGrades(database)
-        migrateStudents(database)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        migrateMessages(db)
+        migrateGrades(db)
+        migrateStudents(db)
         migrateSharedPreferences()
     }
 
-    private fun migrateMessages(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE Messages")
-        database.execSQL("""
+    private fun migrateMessages(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE Messages")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Messages (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 is_notified INTEGER NOT NULL,
@@ -34,12 +35,14 @@ class Migration19(private val sharedPrefProvider: SharedPrefProvider) : Migratio
                 read_by INTEGER NOT NULL,
                 removed INTEGER NOT NULL
             )
-        """)
+        """
+        )
     }
 
-    private fun migrateGrades(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE Grades")
-        database.execSQL("""
+    private fun migrateGrades(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE Grades")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Grades (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 is_read INTEGER NOT NULL,
@@ -59,11 +62,13 @@ class Migration19(private val sharedPrefProvider: SharedPrefProvider) : Migratio
                 date INTEGER NOT NULL,
                 teacher TEXT NOT NULL
             )
-        """)
+        """
+        )
     }
 
-    private fun migrateStudents(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    private fun migrateStudents(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Students_tmp (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 scrapper_base_url TEXT NOT NULL,
@@ -86,26 +91,29 @@ class Migration19(private val sharedPrefProvider: SharedPrefProvider) : Migratio
                 is_current INTEGER NOT NULL,
                 registration_date INTEGER NOT NULL
             )
-        """)
+        """
+        )
 
-        database.execSQL("ALTER TABLE Students ADD COLUMN scrapperBaseUrl TEXT NOT NULL DEFAULT \"\";")
-        database.execSQL("ALTER TABLE Students ADD COLUMN apiBaseUrl TEXT NOT NULL DEFAULT \"\";")
-        database.execSQL("ALTER TABLE Students ADD COLUMN is_parent INT NOT NULL DEFAULT 0;")
-        database.execSQL("ALTER TABLE Students ADD COLUMN loginMode TEXT NOT NULL DEFAULT \"\";")
-        database.execSQL("ALTER TABLE Students ADD COLUMN certificateKey TEXT NOT NULL DEFAULT \"\";")
-        database.execSQL("ALTER TABLE Students ADD COLUMN privateKey TEXT NOT NULL DEFAULT \"\";")
-        database.execSQL("ALTER TABLE Students ADD COLUMN user_login_id INTEGER NOT NULL DEFAULT 0;")
+        db.execSQL("ALTER TABLE Students ADD COLUMN scrapperBaseUrl TEXT NOT NULL DEFAULT \"\";")
+        db.execSQL("ALTER TABLE Students ADD COLUMN apiBaseUrl TEXT NOT NULL DEFAULT \"\";")
+        db.execSQL("ALTER TABLE Students ADD COLUMN is_parent INT NOT NULL DEFAULT 0;")
+        db.execSQL("ALTER TABLE Students ADD COLUMN loginMode TEXT NOT NULL DEFAULT \"\";")
+        db.execSQL("ALTER TABLE Students ADD COLUMN certificateKey TEXT NOT NULL DEFAULT \"\";")
+        db.execSQL("ALTER TABLE Students ADD COLUMN privateKey TEXT NOT NULL DEFAULT \"\";")
+        db.execSQL("ALTER TABLE Students ADD COLUMN user_login_id INTEGER NOT NULL DEFAULT 0;")
 
-        database.execSQL("""
+        db.execSQL(
+            """
             INSERT INTO Students_tmp(
             id, scrapper_base_url, mobile_base_url, is_parent, login_type, login_mode, certificate_key, private_key, email, password, symbol, student_id, user_login_id, student_name, school_id, school_name, school_id, school_name, class_name, class_id, is_current, registration_date)
             SELECT
             id, endpoint, apiBaseUrl, is_parent, loginType, "SCRAPPER", certificateKey, privateKey, email, password, symbol, student_id, user_login_id, student_name, school_id, school_name, school_id, school_name, class_name, class_id, is_current, registration_date
             FROM Students
-        """)
-        database.execSQL("DROP TABLE Students")
-        database.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
-        database.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students (email, symbol, student_id, school_id, class_id)")
+        """
+        )
+        db.execSQL("DROP TABLE Students")
+        db.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
+        db.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students (email, symbol, student_id, school_id, class_id)")
     }
 
     private fun migrateSharedPreferences() {

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

@@ -5,14 +5,16 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration2 : Migration(1, 2) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS LuckyNumbers (
                 id INTEGER PRIMARY KEY NOT NULL,
                 is_notified INTEGER NOT NULL,
                 student_id INTEGER NOT NULL,
                 date INTEGER NOT NULL,
                 lucky_number INTEGER NOT NULL)
-            """)
+            """
+        )
     }
 }

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

@@ -5,14 +5,15 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration20 : Migration(19, 20) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        migrateTimetable(database)
-        truncateSubjects(database)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        migrateTimetable(db)
+        truncateSubjects(db)
     }
 
-    private fun migrateTimetable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE Timetable")
-        database.execSQL("""
+    private fun migrateTimetable(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE Timetable")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS `Timetable` (
                 `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 `student_id` INTEGER NOT NULL,
@@ -33,10 +34,11 @@ class Migration20 : Migration(19, 20) {
                 `changes` INTEGER NOT NULL,
                 `canceled` INTEGER NOT NULL
             )
-        """)
+        """
+        )
     }
 
-    private fun truncateSubjects(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Subjects")
+    private fun truncateSubjects(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM Subjects")
     }
 }

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

@@ -5,11 +5,11 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration21 : Migration(20, 21) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Attendance ADD COLUMN excusable INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Attendance ADD COLUMN time_id INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Attendance ADD COLUMN excuse_status TEXT DEFAULT NULL")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Attendance ADD COLUMN excusable INTEGER NOT NULL DEFAULT 0")
+        db.execSQL("ALTER TABLE Attendance ADD COLUMN time_id INTEGER NOT NULL DEFAULT 0")
+        db.execSQL("ALTER TABLE Attendance ADD COLUMN excuse_status TEXT DEFAULT NULL")
 
-        database.execSQL("DELETE FROM Semesters")
+        db.execSQL("DELETE FROM Semesters")
     }
 }

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration22 : Migration(21, 22) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN school_short TEXT NOT NULL DEFAULT ''")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Students ADD COLUMN school_short TEXT NOT NULL DEFAULT ''")
     }
 }

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

@@ -5,10 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration23 : Migration(22, 23) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Notes ADD COLUMN teacher_symbol TEXT NOT NULL DEFAULT ''")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN category_type INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN is_points_show INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Notes ADD COLUMN points INTEGER NOT NULL DEFAULT 0")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Notes ADD COLUMN teacher_symbol TEXT NOT NULL DEFAULT ''")
+        db.execSQL("ALTER TABLE Notes ADD COLUMN category_type INTEGER NOT NULL DEFAULT 0")
+        db.execSQL("ALTER TABLE Notes ADD COLUMN is_points_show INTEGER NOT NULL DEFAULT 0")
+        db.execSQL("ALTER TABLE Notes ADD COLUMN points INTEGER NOT NULL DEFAULT 0")
     }
 }

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

@@ -5,9 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration24 : Migration(23, 24) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Messages ADD COLUMN has_attachments INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Messages ADD COLUMN has_attachments INTEGER NOT NULL DEFAULT 0")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS MessageAttachments (
                 real_id INTEGER NOT NULL,
                 message_id INTEGER NOT NULL,
@@ -16,6 +17,7 @@ class Migration24 : Migration(23, 24) {
                 filename TEXT NOT NULL,
                 PRIMARY KEY(real_id)
             )
-        """)
+        """
+        )
     }
 }

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration25 : Migration(24, 25) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Homework ADD COLUMN is_done INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE Homework ADD COLUMN attachments TEXT NOT NULL DEFAULT \"[]\"")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Homework ADD COLUMN is_done INTEGER NOT NULL DEFAULT 0")
+        db.execSQL("ALTER TABLE Homework ADD COLUMN attachments TEXT NOT NULL DEFAULT \"[]\"")
     }
 }

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

@@ -5,10 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration26 : Migration(25, 26) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_predicted_grade_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_final_grade_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN predicted_grade_last_change INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN final_grade_last_change INTEGER NOT NULL DEFAULT 0")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_predicted_grade_notified INTEGER NOT NULL DEFAULT 1")
+        db.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_final_grade_notified INTEGER NOT NULL DEFAULT 1")
+        db.execSQL("ALTER TABLE GradesSummary ADD COLUMN predicted_grade_last_change INTEGER NOT NULL DEFAULT 0")
+        db.execSQL("ALTER TABLE GradesSummary ADD COLUMN final_grade_last_change INTEGER NOT NULL DEFAULT 0")
     }
 }

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

@@ -5,24 +5,25 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration27 : Migration(26, 27) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN user_name TEXT NOT NULL DEFAULT \"\"")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Students ADD COLUMN user_name TEXT NOT NULL DEFAULT \"\"")
 
-        val students = getStudentsIdsAndNames(database)
-        val units = getReportingUnits(database)
+        val students = getStudentsIdsAndNames(db)
+        val units = getReportingUnits(db)
 
         students.forEach { (id, userLoginId, studentName) ->
-            val userNameFromUnits = units.singleOrNull { (senderId, _) -> senderId == userLoginId }?.second
+            val userNameFromUnits =
+                units.singleOrNull { (senderId, _) -> senderId == userLoginId }?.second
             val normalizedStudentName = studentName.split(" ").asReversed().joinToString(" ")
 
             val userName = userNameFromUnits ?: normalizedStudentName
-            database.execSQL("UPDATE Students SET user_name = '$userName' WHERE id = '$id'")
+            db.execSQL("UPDATE Students SET user_name = '$userName' WHERE id = '$id'")
         }
     }
 
-    private fun getStudentsIdsAndNames(database: SupportSQLiteDatabase): MutableList<Triple<Long, Int, String>> {
+    private fun getStudentsIdsAndNames(db: SupportSQLiteDatabase): MutableList<Triple<Long, Int, String>> {
         val students = mutableListOf<Triple<Long, Int, String>>()
-        database.query("SELECT id, user_login_id, student_name FROM Students").use {
+        db.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)))
@@ -33,9 +34,9 @@ class Migration27 : Migration(26, 27) {
         return students
     }
 
-    private fun getReportingUnits(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
+    private fun getReportingUnits(db: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
         val units = mutableListOf<Pair<Int, String>>()
-        database.query("SELECT sender_id, sender_name FROM ReportingUnits").use {
+        db.query("SELECT sender_id, sender_name FROM ReportingUnits").use {
             if (it.moveToFirst()) {
                 do {
                     units.add(it.getInt(0) to it.getString(1))

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration28 : Migration(27, 28) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Conferences (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 student_id INTEGER NOT NULL,

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

@@ -5,9 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration29 : Migration(28, 29) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS GradesStatistics")
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS GradesStatistics")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS GradeSemesterStatistics (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 student_id INTEGER NOT NULL,
@@ -16,8 +17,10 @@ class Migration29 : Migration(28, 29) {
                 amounts TEXT NOT NULL,
                 student_grade INTEGER NOT NULL
             )
-        """)
-        database.execSQL("""
+        """
+        )
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS GradePartialStatistics (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 student_id INTEGER NOT NULL,

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration3 : Migration(2, 3) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS CompletedLesson (
                 id INTEGER PRIMARY KEY NOT NULL,
                 student_id INTEGER NOT NULL,

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration30 : Migration(29, 30) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE TimetableAdditional (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 student_id INTEGER NOT NULL,
@@ -16,6 +17,7 @@ class Migration30 : Migration(29, 30) {
                 date INTEGER NOT NULL,
                 subject TEXT NOT NULL
             )
-        """)
+        """
+        )
     }
 }

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration31 : Migration(30, 31) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL(
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
             """CREATE TABLE IF NOT EXISTS StudentInfo (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
                 student_id INTEGER NOT NULL, 

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration32 : Migration(31, 32) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN nick TEXT NOT NULL DEFAULT \"\"")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Students ADD COLUMN nick TEXT NOT NULL DEFAULT \"\"")
     }
 }
 

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

@@ -5,10 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration33 : Migration(32, 33) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS StudentInfo")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS StudentInfo")
 
-        database.execSQL(
+        db.execSQL(
             """CREATE TABLE IF NOT EXISTS StudentInfo (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
                 student_id INTEGER NOT NULL, 

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

@@ -5,9 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration34 : Migration(33, 34) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM ReportingUnits")
-        database.execSQL("DELETE FROM Recipients")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM ReportingUnits")
+        db.execSQL("DELETE FROM Recipients")
     }
 }
 

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

@@ -7,13 +7,13 @@ import io.github.wulkanowy.utils.AppInfo
 
 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")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Students ADD COLUMN `avatar_color` INTEGER NOT NULL DEFAULT 0")
 
-        database.query("SELECT * FROM Students").use {
+        db.query("SELECT * FROM Students").use {
             while (it.moveToNext()) {
                 val studentId = it.getLongOrNull(0)
-                database.execSQL(
+                db.execSQL(
                     """
                         UPDATE Students
                         SET avatar_color = ${appInfo.defaultColorsForAvatar.random()}

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration36 : Migration(35, 36) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Exams ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE Homework ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Exams ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+        db.execSQL("ALTER TABLE Homework ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
     }
 }

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration37 : Migration(36, 37) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL(
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
             """
             CREATE TABLE IF NOT EXISTS TimetableHeaders (
                 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration38 : Migration(37, 38) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS `SchoolAnnouncements` (
                 `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                 `student_id` INTEGER NOT NULL,
@@ -14,6 +15,7 @@ class Migration38 : Migration(37, 38) {
                 `subject` TEXT NOT NULL,
                 `content` TEXT NOT NULL
             )
-        """)
+        """
+        )
     }
 }

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration39 : Migration(38, 39) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Conferences ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE SchoolAnnouncements ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Conferences ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+        db.execSQL("ALTER TABLE SchoolAnnouncements ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
     }
-}
+}

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

@@ -5,9 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration4 : Migration(3, 4) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Messages")
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS Messages")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Messages (
                 id INTEGER PRIMARY KEY NOT NULL,
                 is_notified INTEGER NOT NULL,

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration40 : Migration(39, 40) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL(
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
             """
             CREATE TABLE IF NOT EXISTS `Notifications` (
                 `student_id` INTEGER NOT NULL, 
@@ -20,4 +20,4 @@ class Migration40 : Migration(39, 40) {
             """
         )
     }
-}
+}

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

@@ -7,9 +7,9 @@ import io.github.wulkanowy.data.enums.GradeExpandMode
 
 class Migration41(private val sharedPrefProvider: SharedPrefProvider) : Migration(40, 41) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
+    override fun migrate(db: SupportSQLiteDatabase) {
         migrateSharedPreferences()
-        database.execSQL("ALTER TABLE Homework ADD COLUMN is_added_by_user INTEGER NOT NULL DEFAULT 0")
+        db.execSQL("ALTER TABLE Homework ADD COLUMN is_added_by_user INTEGER NOT NULL DEFAULT 0")
     }
 
     private fun migrateSharedPreferences() {
@@ -18,4 +18,4 @@ class Migration41(private val sharedPrefProvider: SharedPrefProvider) : Migratio
         }
         sharedPrefProvider.delete("pref_key_expand_grade")
     }
-}
+}

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration42 : Migration(41, 42) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL(
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
             """CREATE TABLE IF NOT EXISTS `AdminMessages` (
             `id` INTEGER NOT NULL, 
             `title` TEXT NOT NULL, 
@@ -21,4 +21,4 @@ class Migration42 : Migration(41, 42) {
             PRIMARY KEY(`id`))"""
         )
     }
-}
+}

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration43 : Migration(42, 43) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Timetable ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE Attendance ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Timetable ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+        db.execSQL("ALTER TABLE Attendance ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
     }
 }

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration44 : Migration(43, 44) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE AdminMessages ADD COLUMN is_dismissible INTEGER NOT NULL DEFAULT 0")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE AdminMessages ADD COLUMN is_dismissible INTEGER NOT NULL DEFAULT 0")
     }
 }

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

@@ -8,65 +8,65 @@ 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)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        migrateConferences(db)
+        migrateMessages(db)
+        migrateMobileDevices(db)
+        migrateNotifications(db)
+        migrateTimetable(db)
+        migrateTimetableAdditional(db)
     }
 
-    private fun migrateConferences(database: SupportSQLiteDatabase) {
-        database.query("SELECT * FROM Conferences").use {
+    private fun migrateConferences(db: SupportSQLiteDatabase) {
+        db.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")
+                db.execSQL("UPDATE Conferences SET date = $timestampUtc WHERE id = $id")
             }
         }
     }
 
-    private fun migrateMessages(database: SupportSQLiteDatabase) {
-        database.query("SELECT * FROM Messages").use {
+    private fun migrateMessages(db: SupportSQLiteDatabase) {
+        db.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")
+                db.execSQL("UPDATE Messages SET date = $timestampUtc WHERE id = $id")
             }
         }
     }
 
-    private fun migrateMobileDevices(database: SupportSQLiteDatabase) {
-        database.query("SELECT * FROM MobileDevices").use {
+    private fun migrateMobileDevices(db: SupportSQLiteDatabase) {
+        db.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")
+                db.execSQL("UPDATE MobileDevices SET date = $timestampUtc WHERE id = $id")
             }
         }
     }
 
-    private fun migrateNotifications(database: SupportSQLiteDatabase) {
-        database.query("SELECT * FROM Notifications").use {
+    private fun migrateNotifications(db: SupportSQLiteDatabase) {
+        db.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")
+                db.execSQL("UPDATE Notifications SET date = $timestampUtc WHERE id = $id")
             }
         }
     }
 
-    private fun migrateTimetable(database: SupportSQLiteDatabase) {
-        database.query("SELECT * FROM Timetable").use {
+    private fun migrateTimetable(db: SupportSQLiteDatabase) {
+        db.query("SELECT * FROM Timetable").use {
             while (it.moveToNext()) {
                 val id = it.getLong(it.getColumnIndexOrThrow("id"))
                 val timestampLocalStart = it.getLong(it.getColumnIndexOrThrow("start"))
@@ -74,13 +74,13 @@ class Migration46 : Migration(45, 46) {
                 val timestampUtcStart = timestampLocalStart.timestampLocalToUTC()
                 val timestampUtcEnd = timestampLocalEnd.timestampLocalToUTC()
 
-                database.execSQL("UPDATE Timetable SET start = $timestampUtcStart, end = $timestampUtcEnd WHERE id = $id")
+                db.execSQL("UPDATE Timetable SET start = $timestampUtcStart, end = $timestampUtcEnd WHERE id = $id")
             }
         }
     }
 
-    private fun migrateTimetableAdditional(database: SupportSQLiteDatabase) {
-        database.query("SELECT * FROM TimetableAdditional").use {
+    private fun migrateTimetableAdditional(db: SupportSQLiteDatabase) {
+        db.query("SELECT * FROM TimetableAdditional").use {
             while (it.moveToNext()) {
                 val id = it.getLong(it.getColumnIndexOrThrow("id"))
                 val timestampLocalStart = it.getLong(it.getColumnIndexOrThrow("start"))
@@ -88,7 +88,7 @@ class Migration46 : Migration(45, 46) {
                 val timestampUtcStart = timestampLocalStart.timestampLocalToUTC()
                 val timestampUtcEnd = timestampLocalEnd.timestampLocalToUTC()
 
-                database.execSQL("UPDATE TimetableAdditional SET start = $timestampUtcStart, end = $timestampUtcEnd WHERE id = $id")
+                db.execSQL("UPDATE TimetableAdditional SET start = $timestampUtcStart, end = $timestampUtcEnd WHERE id = $id")
             }
         }
     }

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

@@ -5,10 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration49 : Migration(48, 49) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS SchoolAnnouncements")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS SchoolAnnouncements")
 
-        database.execSQL(
+        db.execSQL(
             """
             CREATE TABLE IF NOT EXISTS `SchoolAnnouncements` (
             `user_login_id` INTEGER NOT NULL, 

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

@@ -7,11 +7,16 @@ import java.time.ZoneOffset
 
 class Migration5 : Migration(4, 5) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN registration_date INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("UPDATE Students SET registration_date = '${now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()}'")
-        database.execSQL("DROP TABLE IF EXISTS Notes")
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Students ADD COLUMN registration_date INTEGER DEFAULT 0 NOT NULL")
+        db.execSQL(
+            "UPDATE Students SET registration_date = '${
+                now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()
+            }'"
+        )
+        db.execSQL("DROP TABLE IF EXISTS Notes")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Notes (
                 id INTEGER PRIMARY KEY NOT NULL,
                 is_read INTEGER NOT NULL,
@@ -21,6 +26,7 @@ class Migration5 : Migration(4, 5) {
                 teacher TEXT NOT NULL,
                 category TEXT NOT NULL,
                 content TEXT NOT NULL)
-            """)
+            """
+        )
     }
 }

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

@@ -5,9 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration50 : Migration(49, 50) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS MobileDevices")
-        database.execSQL(
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS MobileDevices")
+        db.execSQL(
             """
             CREATE TABLE IF NOT EXISTS `MobileDevices` (
             `user_login_id` INTEGER NOT NULL, 

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

@@ -5,17 +5,17 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration51 : Migration(50, 51) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createMailboxTable(database)
-        recreateMessagesTable(database)
-        recreateMessageAttachmentsTable(database)
-        recreateRecipientsTable(database)
-        deleteReportingUnitTable(database)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        createMailboxTable(db)
+        recreateMessagesTable(db)
+        recreateMessageAttachmentsTable(db)
+        recreateRecipientsTable(db)
+        deleteReportingUnitTable(db)
     }
 
-    private fun createMailboxTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Mailboxes")
-        database.execSQL(
+    private fun createMailboxTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS Mailboxes")
+        db.execSQL(
             """
             CREATE TABLE IF NOT EXISTS `Mailboxes` (
                 `globalKey` TEXT NOT NULL,
@@ -30,9 +30,9 @@ class Migration51 : Migration(50, 51) {
         )
     }
 
-    private fun recreateMessagesTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Messages")
-        database.execSQL(
+    private fun recreateMessagesTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS Messages")
+        db.execSQL(
             """
             CREATE TABLE IF NOT EXISTS `Messages` (
                 `message_global_key` TEXT NOT NULL,
@@ -52,9 +52,9 @@ class Migration51 : Migration(50, 51) {
         )
     }
 
-    private fun recreateMessageAttachmentsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS MessageAttachments")
-        database.execSQL(
+    private fun recreateMessageAttachmentsTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS MessageAttachments")
+        db.execSQL(
             """
             CREATE TABLE IF NOT EXISTS `MessageAttachments` (
                 `real_id` INTEGER NOT NULL,
@@ -66,9 +66,9 @@ class Migration51 : Migration(50, 51) {
         )
     }
 
-    private fun recreateRecipientsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Recipients")
-        database.execSQL(
+    private fun recreateRecipientsTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS Recipients")
+        db.execSQL(
             """
             CREATE TABLE IF NOT EXISTS `Recipients` (
                 `mailboxGlobalKey` TEXT NOT NULL,
@@ -82,7 +82,7 @@ class Migration51 : Migration(50, 51) {
         )
     }
 
-    private fun deleteReportingUnitTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS ReportingUnits")
+    private fun deleteReportingUnitTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS ReportingUnits")
     }
 }

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

@@ -5,14 +5,14 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration53 : Migration(52, 53) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createMailboxTable(database)
-        recreateMessagesTable(database)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        createMailboxTable(db)
+        recreateMessagesTable(db)
     }
 
-    private fun createMailboxTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Mailboxes")
-        database.execSQL(
+    private fun createMailboxTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS Mailboxes")
+        db.execSQL(
             """
                 CREATE TABLE IF NOT EXISTS `Mailboxes` (
                     `globalKey` TEXT NOT NULL,
@@ -29,9 +29,9 @@ class Migration53 : Migration(52, 53) {
         )
     }
 
-    private fun recreateMessagesTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Messages")
-        database.execSQL(
+    private fun recreateMessagesTable(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS Messages")
+        db.execSQL(
             """
                 CREATE TABLE IF NOT EXISTS `Messages` (
                     `email` TEXT NOT NULL,

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

@@ -5,22 +5,24 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration54 : Migration(53, 54) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        migrateResman(database)
-        removeTomaszowMazowieckiStudents(database)
+    override fun migrate(db: SupportSQLiteDatabase) {
+        migrateResman(db)
+        removeTomaszowMazowieckiStudents(db)
     }
 
-    private fun migrateResman(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    private fun migrateResman(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             UPDATE Students SET
                 scrapper_base_url = 'https://vulcan.net.pl',
                 login_type = 'ADFSLightScoped',
                 symbol = 'rzeszowprojekt'
             WHERE scrapper_base_url = 'https://resman.pl'
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 
-    private fun removeTomaszowMazowieckiStudents(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Students WHERE symbol = 'tomaszowmazowiecki'")
+    private fun removeTomaszowMazowieckiStudents(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM Students WHERE symbol = 'tomaszowmazowiecki'")
     }
 }

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

@@ -0,0 +1,10 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.DeleteColumn
+import androidx.room.migration.AutoMigrationSpec
+
+@DeleteColumn(
+    tableName = "AdminMessages",
+    columnName = "is_dismissible",
+)
+class Migration58 : AutoMigrationSpec

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration6 : Migration(5, 6) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS ReportingUnits (
                 id INTEGER PRIMARY KEY NOT NULL,
                 student_id INTEGER NOT NULL,
@@ -15,9 +16,11 @@ class Migration6 : Migration(5, 6) {
                 sender_id INTEGER NOT NULL,
                 sender_name TEXT NOT NULL,
                 roles TEXT NOT NULL)
-                """)
+                """
+        )
 
-        database.execSQL("""
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Recipients (
                 id INTEGER PRIMARY KEY NOT NULL,
                 student_id INTEGER NOT NULL,
@@ -28,10 +31,11 @@ class Migration6 : Migration(5, 6) {
                 unit_id INTEGER NOT NULL,
                 role INTEGER NOT NULL,
                 hash TEXT NOT NULL)
-                """)
+                """
+        )
 
-        database.execSQL("DELETE FROM Semesters WHERE 1")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN unit_id INTEGER DEFAULT 0 NOT NULL")
+        db.execSQL("DELETE FROM Semesters WHERE 1")
+        db.execSQL("ALTER TABLE Semesters ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
+        db.execSQL("ALTER TABLE Semesters ADD COLUMN unit_id INTEGER DEFAULT 0 NOT NULL")
     }
 }

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

@@ -5,8 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration7 : Migration(6, 7) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS GradesStatistics (
                 id INTEGER PRIMARY KEY NOT NULL,
                 student_id INTEGER NOT NULL,
@@ -15,6 +16,7 @@ class Migration7 : Migration(6, 7) {
                 grade INTEGER NOT NULL,
                 amount INTEGER NOT NULL,
                 is_semester INTEGER NOT NULL)
-            """)
+            """
+        )
     }
 }

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

@@ -5,9 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration8 : Migration(7, 8) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Timetable ADD COLUMN subjectOld TEXT DEFAULT \"\" NOT NULL")
-        database.execSQL("ALTER TABLE Timetable ADD COLUMN roomOld TEXT DEFAULT \"\" NOT NULL")
-        database.execSQL("ALTER TABLE Timetable ADD COLUMN teacherOld TEXT DEFAULT \"\" NOT NULL")
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("ALTER TABLE Timetable ADD COLUMN subjectOld TEXT DEFAULT \"\" NOT NULL")
+        db.execSQL("ALTER TABLE Timetable ADD COLUMN roomOld TEXT DEFAULT \"\" NOT NULL")
+        db.execSQL("ALTER TABLE Timetable ADD COLUMN teacherOld TEXT DEFAULT \"\" NOT NULL")
     }
 }

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

@@ -5,9 +5,10 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration9 : Migration(8, 9) {
 
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS Messages")
-        database.execSQL("""
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DROP TABLE IF EXISTS Messages")
+        db.execSQL(
+            """
             CREATE TABLE IF NOT EXISTS Messages (
                 id INTEGER PRIMARY KEY NOT NULL,
                 student_id INTEGER NOT NULL,

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

@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.enums
+
+enum class AttendanceCalculatorSortingMode(private val value: String) {
+    ALPHABETIC("alphabetic"),
+    ATTENDANCE("attendance_percentage"),
+    LESSON_BALANCE("lesson_balance");
+
+    companion object {
+        fun getByValue(value: String) =
+            AttendanceCalculatorSortingMode.values()
+                .find { it.value == value } ?: ALPHABETIC
+    }
+}

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

@@ -3,5 +3,10 @@ package io.github.wulkanowy.data.enums
 enum class MessageFolder(val id: Int = 1) {
     RECEIVED(1),
     SENT(2),
-    TRASHED(3)
+    TRASHED(3),
+    ;
+
+    companion object {
+        fun byId(id: Int) = entries.first { it.id == id }
+    }
 }

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

@@ -3,12 +3,26 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.pojo.DirectorInformation as SdkDirectorInformation
+import io.github.wulkanowy.sdk.pojo.LastAnnouncement as SdkLastAnnouncement
 
+@JvmName("mapDirectorInformationToEntities")
 fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
     SchoolAnnouncement(
         userLoginId = student.userLoginId,
         date = it.date,
         subject = it.subject,
         content = it.content,
+        author = null,
+    )
+}
+
+@JvmName("mapLastAnnouncementsToEntities")
+fun List<SdkLastAnnouncement>.mapToEntities(student: Student) = map {
+    SchoolAnnouncement(
+        userLoginId = student.userLoginId,
+        date = it.date,
+        subject = it.subject,
+        content = it.content,
+        author = it.author,
     )
 }

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

@@ -1,10 +1,12 @@
 package io.github.wulkanowy.data.mappers
 
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeDescriptive
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.GradeSummary as SdkGradeSummary
 import io.github.wulkanowy.sdk.pojo.Grade as SdkGrade
+import io.github.wulkanowy.sdk.pojo.GradeDescriptive as SdkGradeDescriptive
+import io.github.wulkanowy.sdk.pojo.GradeSummary as SdkGradeSummary
 
 fun List<SdkGrade>.mapToEntities(semester: Semester) = map {
     Grade(
@@ -40,3 +42,15 @@ fun List<SdkGradeSummary>.mapToEntities(semester: Semester) = map {
         average = it.average
     )
 }
+
+@JvmName("mapGradeDescriptiveToEntities")
+fun List<SdkGradeDescriptive>.mapToEntities(semester: Semester) = map {
+    GradeDescriptive(
+        semesterId = semester.semesterId,
+        studentId = semester.studentId,
+        subject = it.subject,
+        description = it.description
+    )
+}
+
+

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

@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.pojos
+
+data class AttendanceData(
+    val subjectName: String,
+    val lessonBalance: Int,
+    val presences: Int,
+    val absences: Int,
+) {
+    val total: Int
+        get() = presences + absences
+
+    val presencePercentage: Double
+        get() = if (total == 0) 0.0 else (presences.toDouble() / total) * 100
+}

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

@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.dao.AdminMessageDao
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.networkBoundResource
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -28,6 +29,6 @@ class AdminMessageRepository @Inject constructor(
             saveFetchResult = { oldItems, newItems ->
                 adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
             },
-            showSavedOnLoading = false,
         )
+            .filterNot { it is Resource.Intermediate }
 }

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

@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
@@ -7,13 +8,14 @@ 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.*
-import kotlinx.coroutines.Dispatchers
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.withContext
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
@@ -24,7 +26,7 @@ import javax.inject.Singleton
 class AttendanceRepository @Inject constructor(
     private val attendanceDb: AttendanceDao,
     private val timetableDb: TimetableDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -52,23 +54,21 @@ class AttendanceRepository @Inject constructor(
             attendanceDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
         },
         fetch = {
-            val lessons = withContext(Dispatchers.IO) {
-                timetableDb.load(
-                    semester.diaryId, semester.studentId, start.monday, end.sunday
-                )
-            }
-            sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            val lessons = timetableDb.load(
+                semester.diaryId, semester.studentId, start.monday, end.sunday
+            )
+            wulkanowySdkFactory.create(student, semester)
                 .getAttendance(start.monday, end.sunday)
                 .mapToEntities(semester, lessons)
         },
         saveFetchResult = { old, new ->
-            attendanceDb.deleteAll(old uniqueSubtract new)
             val attendanceToAdd = (new uniqueSubtract old).map { newAttendance ->
                 newAttendance.apply { if (notify) isNotified = false }
             }
-            attendanceDb.insertAll(attendanceToAdd)
-
+            attendanceDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = attendanceToAdd,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
         filterResult = { it.filter { item -> item.date in start..end } }
@@ -87,8 +87,10 @@ class AttendanceRepository @Inject constructor(
     }
 
     suspend fun excuseForAbsence(
-        student: Student, semester: Semester,
-        absenceList: List<Attendance>, reason: String? = null
+        student: Student,
+        semester: Semester,
+        absenceList: List<Attendance>,
+        reason: String? = null
     ) {
         val items = absenceList.map { attendance ->
             Absent(
@@ -96,8 +98,7 @@ class AttendanceRepository @Inject constructor(
                 timeId = attendance.timeId
             )
         }
-        sdk.init(student)
-            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+        wulkanowySdkFactory.create(student, semester)
             .excuseForAbsence(items, reason)
     }
 }

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

@@ -1,14 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
+import androidx.room.withTransaction
+import io.github.wulkanowy.data.WulkanowySdkFactory
+import io.github.wulkanowy.data.db.AppDatabase
 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.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -17,8 +18,9 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceSummaryRepository @Inject constructor(
     private val attendanceDb: AttendanceSummaryDao,
-    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
+    private val appDatabase: AppDatabase,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -39,14 +41,15 @@ class AttendanceSummaryRepository @Inject constructor(
         },
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
         fetch = {
-            sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            wulkanowySdkFactory.create(student, semester)
                 .getAttendanceSummary(subjectId)
                 .mapToEntities(semester, subjectId)
         },
         saveFetchResult = { old, new ->
-            attendanceDb.deleteAll(old uniqueSubtract new)
-            attendanceDb.insertAll(new uniqueSubtract old)
+            appDatabase.withTransaction {
+                attendanceDb.deleteAll(old uniqueSubtract new)
+                attendanceDb.insertAll(new uniqueSubtract old)
+            }
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )

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

@@ -1,12 +1,16 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 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.*
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
@@ -15,7 +19,7 @@ import javax.inject.Singleton
 @Singleton
 class CompletedLessonsRepository @Inject constructor(
     private val completedLessonsDb: CompletedLessonsDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -47,14 +51,15 @@ class CompletedLessonsRepository @Inject constructor(
             )
         },
         fetch = {
-            sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            wulkanowySdkFactory.create(student, semester)
                 .getCompletedLessons(start.monday, end.sunday)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            completedLessonsDb.deleteAll(old uniqueSubtract new)
-            completedLessonsDb.insertAll(new uniqueSubtract old)
+            completedLessonsDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = new uniqueSubtract old,
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
         filterResult = { it.filter { item -> item.date in start..end } }

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

@@ -1,15 +1,14 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.ConferenceDao
 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.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -20,7 +19,7 @@ import javax.inject.Singleton
 @Singleton
 class ConferenceRepository @Inject constructor(
     private val conferenceDb: ConferenceDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -45,19 +44,18 @@ class ConferenceRepository @Inject constructor(
             conferenceDb.loadAll(semester.diaryId, student.studentId, startDate)
         },
         fetch = {
-            sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            wulkanowySdkFactory.create(student, semester)
                 .getConferences()
                 .mapToEntities(semester)
                 .filter { it.date >= startDate }
         },
         saveFetchResult = { old, new ->
-            val conferencesToSave = (new uniqueSubtract old).onEach {
-                if (notify) it.isNotified = false
-            }
-
-            conferenceDb.deleteAll(old uniqueSubtract new)
-            conferenceDb.insertAll(conferencesToSave)
+            conferenceDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = (new uniqueSubtract old).onEach {
+                    if (notify) it.isNotified = false
+                },
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )

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

@@ -1,13 +1,17 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.ExamDao
 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.*
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.endExamsDay
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.startExamsDay
+import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
@@ -17,7 +21,7 @@ import javax.inject.Singleton
 @Singleton
 class ExamRepository @Inject constructor(
     private val examDb: ExamDao,
-    private val sdk: Sdk,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -50,31 +54,32 @@ class ExamRepository @Inject constructor(
             )
         },
         fetch = {
-            sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            wulkanowySdkFactory.create(student, semester)
                 .getExams(start.startExamsDay, start.endExamsDay)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            val examsToSave = (new uniqueSubtract old).onEach {
-                if (notify) it.isNotified = false
-            }
-
-            examDb.deleteAll(old uniqueSubtract new)
-            examDb.insertAll(examsToSave)
+            examDb.removeOldAndSaveNew(
+                oldItems = old uniqueSubtract new,
+                newItems = (new uniqueSubtract old).onEach {
+                    if (notify) it.isNotified = false
+                },
+            )
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
         filterResult = { it.filter { item -> item.date in start..end } }
     )
 
-    fun getExamsFromDatabase(semester: Semester, start: LocalDate): Flow<List<Exam>> {
-        return examDb.loadAll(
-            diaryId = semester.diaryId,
-            studentId = semester.studentId,
-            from = start.startExamsDay,
-            end = start.endExamsDay
-        )
-    }
+    fun getExamsFromDatabase(
+        semester: Semester,
+        start: LocalDate,
+        end: LocalDate
+    ): Flow<List<Exam>> = examDb.loadAll(
+        diaryId = semester.diaryId,
+        studentId = semester.studentId,
+        from = start,
+        end = end,
+    )
 
     suspend fun updateExam(exam: List<Exam>) = examDb.updateAll(exam)
 }

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

@@ -1,15 +1,20 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradeDescriptiveDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeDescriptive
 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.*
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.toLocalDate
+import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
@@ -22,14 +27,13 @@ import javax.inject.Singleton
 class GradeRepository @Inject constructor(
     private val gradeDb: GradeDao,
     private val gradeSummaryDb: GradeSummaryDao,
-    private val sdk: Sdk,
+    private val gradeDescriptiveDb: GradeDescriptiveDao,
+    private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
     private val saveFetchResultMutex = Mutex()
 
-    private val cacheKey = "grade"
-
     fun getGrades(
         student: Student,
         semester: Semester,
@@ -41,30 +45,53 @@ class GradeRepository @Inject constructor(
             //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
+        shouldFetch = { (details, summaries, descriptive) ->
+            val isExpired =
+                refreshHelper.shouldBeRefreshed(getRefreshKey(GRADE_CACHE_KEY, semester))
+            details.isEmpty() || (summaries.isEmpty() && descriptive.isEmpty()) || forceRefresh || isExpired
         },
         query = {
             val detailsFlow = gradeDb.loadAll(semester.semesterId, semester.studentId)
             val summaryFlow = gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
-            detailsFlow.combine(summaryFlow) { details, summaries -> details to summaries }
+            val descriptiveFlow =
+                gradeDescriptiveDb.loadAll(semester.semesterId, semester.studentId)
+
+            combine(detailsFlow, summaryFlow, descriptiveFlow) { details, summaries, descriptive ->
+                Triple(details, summaries, descriptive)
+            }
         },
         fetch = {
-            val (details, summary) = sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            val (details, summary, descriptive) = wulkanowySdkFactory.create(student, semester)
                 .getGrades(semester.semesterId)
 
-            details.mapToEntities(semester) to summary.mapToEntities(semester)
+            Triple(
+                details.mapToEntities(semester),
+                summary.mapToEntities(semester),
+                descriptive.mapToEntities(semester)
+            )
         },
-        saveFetchResult = { (oldDetails, oldSummary), (newDetails, newSummary) ->
+        saveFetchResult = { (oldDetails, oldSummary, oldDescriptive), (newDetails, newSummary, newDescriptive) ->
             refreshGradeDetails(student, oldDetails, newDetails, notify)
             refreshGradeSummaries(oldSummary, newSummary, notify)
+            refreshGradeDescriptions(oldDescriptive, newDescriptive, notify)
 
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
+            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(GRADE_CACHE_KEY, semester))
         }
     )
 
+    private suspend fun refreshGradeDescriptions(
+        old: List<GradeDescriptive>,
+        new: List<GradeDescriptive>,
+        notify: Boolean
+    ) {
+        gradeDescriptiveDb.removeOldAndSaveNew(
+            oldItems = old uniqueSubtract new,
+            newItems = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            },
+        )
+    }
+
     private suspend fun refreshGradeDetails(
         student: Student,
         oldGrades: List<Grade>,
@@ -73,13 +100,16 @@ class GradeRepository @Inject constructor(
     ) {
         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 {
-                isRead = false
-                if (notify) isNotified = false
-            }
-        })
+
+        gradeDb.removeOldAndSaveNew(
+            oldItems = oldGrades uniqueSubtract newDetails,
+            newItems = (newDetails uniqueSubtract oldGrades).onEach {
+                if (it.date >= notifyBreakDate) it.apply {
+                    isRead = false
+                    if (notify) isNotified = false
+                }
+            },
+        )
     }
 
     private suspend fun refreshGradeSummaries(
@@ -87,31 +117,43 @@ class GradeRepository @Inject constructor(
         newSummary: List<GradeSummary>,
         notify: Boolean
     ) {
-        gradeSummaryDb.deleteAll(oldSummaries uniqueSubtract newSummary)
-        gradeSummaryDb.insertAll((newSummary uniqueSubtract oldSummaries).onEach { summary ->
-            val oldSummary = oldSummaries.find { old -> old.subject == summary.subject }
-            summary.isPredictedGradeNotified = when {
-                summary.predictedGrade.isEmpty() -> true
-                notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
-                else -> true
-            }
-            summary.isFinalGradeNotified = when {
-                summary.finalGrade.isEmpty() -> true
-                notify && oldSummary?.finalGrade != summary.finalGrade -> false
-                else -> true
-            }
+        gradeSummaryDb.removeOldAndSaveNew(
+            oldItems = oldSummaries uniqueSubtract newSummary,
+            newItems = (newSummary uniqueSubtract oldSummaries).onEach { summary ->
+                getGradeSummaryWithUpdatedNotificationState(
+                    summary = summary,
+                    oldSummary = oldSummaries.find { it.subject == summary.subject },
+                    notify = notify,
+                )
+            },
+        )
+    }
 
-            summary.predictedGradeLastChange = when {
-                oldSummary == null -> Instant.now()
-                summary.predictedGrade != oldSummary.predictedGrade -> Instant.now()
-                else -> oldSummary.predictedGradeLastChange
-            }
-            summary.finalGradeLastChange = when {
-                oldSummary == null -> Instant.now()
-                summary.finalGrade != oldSummary.finalGrade -> Instant.now()
-                else -> oldSummary.finalGradeLastChange
-            }
-        })
+    private fun getGradeSummaryWithUpdatedNotificationState(
+        summary: GradeSummary,
+        oldSummary: GradeSummary?,
+        notify: Boolean,
+    ) {
+        summary.isPredictedGradeNotified = when {
+            summary.predictedGrade.isEmpty() -> true
+            notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
+            else -> true
+        }
+        summary.isFinalGradeNotified = when {
+            summary.finalGrade.isEmpty() -> true
+            notify && oldSummary?.finalGrade != summary.finalGrade -> false
+            else -> true
+        }
+        summary.predictedGradeLastChange = when {
+            oldSummary == null -> Instant.now()
+            summary.predictedGrade != oldSummary.predictedGrade -> Instant.now()
+            else -> oldSummary.predictedGradeLastChange
+        }
+        summary.finalGradeLastChange = when {
+            oldSummary == null -> Instant.now()
+            summary.finalGrade != oldSummary.finalGrade -> Instant.now()
+            else -> oldSummary.finalGradeLastChange
+        }
     }
 
     fun getUnreadGrades(semester: Semester): Flow<List<Grade>> {
@@ -132,6 +174,10 @@ class GradeRepository @Inject constructor(
         return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
     }
 
+    fun getGradesDescriptiveFromDatabase(semester: Semester): Flow<List<GradeDescriptive>> {
+        return gradeDescriptiveDb.loadAll(semester.semesterId, semester.studentId)
+    }
+
     suspend fun updateGrade(grade: Grade) {
         return gradeDb.updateAll(listOf(grade))
     }
@@ -143,4 +189,13 @@ class GradeRepository @Inject constructor(
     suspend fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
         return gradeSummaryDb.updateAll(gradesSummary)
     }
+
+    suspend fun updateGradesDescriptive(gradesDescriptive: List<GradeDescriptive>) {
+        return gradeDescriptiveDb.updateAll(gradesDescriptive)
+    }
+
+    private companion object {
+
+        private const val GRADE_CACHE_KEY = "grade"
+    }
 }