Merge branch 'release/2.0.1'

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>

.editorconfig

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

.github/workflows/deploy-store.yml

@@ -1,4 +1,4 @@
-name: Deploy to app stores
+name: Deploy release
 
 on:
   release:
@@ -7,16 +7,17 @@ on:
 jobs:
 
   deploy-google-play:
-    name: Deploy to google play
+    name: Google Play
     runs-on: ubuntu-latest
     timeout-minutes: 10
     environment: google-play
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -37,20 +38,22 @@ jobs:
           ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}
           ADMOB_PROJECT_ID: ${{ secrets.ADMOB_PROJECT_ID }}
           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;
 
   deploy-app-gallery:
-    name: Deploy to AppGallery
+    name: AppGallery
     runs-on: ubuntu-latest
     timeout-minutes: 10
     environment: app-gallery
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches

.github/workflows/deploy-test.yml

@@ -1,4 +1,4 @@
-name: Deploy to app tests
+name: Deploy DEV
 
 on:
   push:
@@ -18,11 +18,12 @@ jobs:
     timeout-minutes: 10
     environment: app-center
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -66,7 +67,7 @@ jobs:
           BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
         run: ./gradlew assembleFdroidDebug --stacktrace
       - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wulkanowyDEV-${{ env.RUN_NUMBER }}.apk
           path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
@@ -87,11 +88,12 @@ jobs:
     environment: app-distribution
     if: github.event_name != 'pull_request_target'
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -131,7 +133,7 @@ jobs:
           BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
         run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
       - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wulkanowyDEV-${{ env.RUN_NUMBER }}-dev.apk
           path: app/build/outputs/apk/play/debug/app-play-debug.apk

.github/workflows/test.yml

@@ -2,24 +2,28 @@ name: Tests
 
 on:
   push:
-    branches: [ master, develop ]
+    branches:
+      - master
+      - develop
+      - 'hotfix/**'
     tags: [ '*' ]
   pull_request:
-    branches: [ master, develop ]
 
 jobs:
-  unit-tests:
-      name: Unit tests
+
+  tests-fdroid:
+      name: F-Droid
       runs-on: ubuntu-latest
       timeout-minutes: 10
       steps:
         - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v2
+        - uses: actions/checkout@v3
         - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v1
+        - uses: actions/setup-java@v2
           with:
+            distribution: 'zulu'
             java-version: 11
-        - uses: actions/cache@v2
+        - uses: actions/cache@v3
           with:
             path: |
               ~/.gradle/caches
@@ -29,6 +33,58 @@ jobs:
           run: |
             ./gradlew testFdroidDebugUnitTest --stacktrace
             ./gradlew jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v1
+        - uses: codecov/codecov-action@v3
+          with:
+              flags: unit
+
+  tests-play:
+      name: Play
+      runs-on: ubuntu-latest
+      timeout-minutes: 10
+      steps:
+        - uses: fkirc/skip-duplicate-actions@master
+        - uses: actions/checkout@v3
+        - uses: gradle/wrapper-validation-action@v1
+        - uses: actions/setup-java@v2
+          with:
+            distribution: 'zulu'
+            java-version: 11
+        - uses: actions/cache@v3
+          with:
+            path: |
+              ~/.gradle/caches
+              ~/.gradle/wrapper
+            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+        - name: Unit tests
+          run: |
+            ./gradlew testPlayDebugUnitTest --stacktrace
+            ./gradlew jacocoTestReport --stacktrace
+        - uses: codecov/codecov-action@v3
+          with:
+              flags: unit
+
+  tests-hms:
+      name: HMS
+      runs-on: ubuntu-latest
+      timeout-minutes: 10
+      steps:
+        - uses: fkirc/skip-duplicate-actions@master
+        - uses: actions/checkout@v3
+        - uses: gradle/wrapper-validation-action@v1
+        - uses: actions/setup-java@v2
+          with:
+            distribution: 'zulu'
+            java-version: 11
+        - uses: actions/cache@v3
+          with:
+            path: |
+              ~/.gradle/caches
+              ~/.gradle/wrapper
+            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+        - name: Unit tests
+          run: |
+            ./gradlew testHmsDebugUnitTest --stacktrace
+            ./gradlew jacocoTestReport --stacktrace
+        - uses: codecov/codecov-action@v3
           with:
               flags: unit

.gitignore

@@ -119,3 +119,4 @@ Thumbs.db
 app/src/release/agconnect-services.json
 app/src/release/agconnect-credentials.json
 .idea/deploymentTargetDropDown.xml
+.idea/kotlinc.xml

LICENSE

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

README.cs.md

@@ -1,18 +1,13 @@
-[English version of README](README.en.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Polska wersja README](README.md)
-
-[Slovenská verzia README](README.sk.md)
+Česká verze / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Neoficiální klient deníku VULCAN UONET+ pro žáka a rodiče
 
@@ -39,7 +34,7 @@ Neoficiální klient deníku VULCAN UONET+ pro žáka a rodiče
 * podpora více účtů s možností přejmenování žáků
 * tmavý a černý (AMOLED) motiv
 * offline režim
-* žádné reklamy
+* volitelné reklamy na podporu projektu
 
 ## Stáhnout
 
@@ -57,7 +52,7 @@ Aktuální verzi si můžete stáhnout z Google Play, F-Droid nebo Huawei AppGal
 
 Můžete si také stáhnout [vývojovou verzi](https://wulkanowy.github.io/#download), která zahrnuje nové funkce připravované pro příští vydání
 
-## Postaveno s
+## Postaveno s pomocí
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)

README.de.md

@@ -1,14 +1,13 @@
-[Polska wersja README](README.md)
-
-[English version of README](README.en.md)
+[Česká verze](README.cs.md) / Deutsche Version / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre Eltern
 
@@ -22,7 +21,7 @@ Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre
     * Prozentsatz der Anwesenheit
     * Prüfungen
     * Stundenplan
-    * Unterricht abgeschlossen
+    * abgeschlossene Unterrichtsstunden
     * Nachrichten
     * Hausaufgaben
     * Anmerkungen
@@ -35,7 +34,7 @@ Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre
 * Unterstützung für mehrere Konten mit der Möglichkeit, den Namen des Schülers zu ändern
 * dunkles und schwarzes (AMOLED) Thema
 * Offline-Modus
-* keine Werbung
+* optionale Werbungen, die es uns ermöglichen das Projekt zu unterstützen
 
 ## Herunterladen
 
@@ -51,7 +50,7 @@ Die aktuelle Version können Sie von der Google Play, F-Droid oder Huawei AppGal
     alt="Explore it on AppGallery"
     height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
     
-Sie können auch ein [Entwicklungsversion herunterladen](https://wulkanowy.github.io/#download) das beinhaltet neue Funktionen, die für die nächste Version vorbereitet werden
+Sie können auch eine [Entwicklungsversion herunterladen](https://wulkanowy.github.io/#download) die beinhaltet neue Funktionen, die für die nächste Version vorbereitet werden
 
 ## Gebaut mit
 

README.en.md

@@ -1,18 +1,13 @@
-[Polska wersja README](README.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Česká verze README](README.cs.md)
-
-[Slovenská verzia README](README.sk.md)
+[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / English version / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Unofficial android VULCAN UONET+ register client for both students and their parents
 
@@ -39,7 +34,7 @@ Unofficial android VULCAN UONET+ register client for both students and their par
 * support for multiple accounts with the ability to rename students 
 * dark and black (AMOLED) theme
 * offline mode
-* no ads
+* optional ads which allow to support the project
 
 ## Download
 

README.md

@@ -1,18 +1,13 @@
-[English version of README](README.en.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Česká verze README](README.cs.md)
-
-[Slovenská verzia README](README.sk.md)
+[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / Polska wersja / [Slovenská verzia](README.sk.md)
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
@@ -39,7 +34,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 * obsługa wielu kont wraz z możliwością zmiany nazwy ucznia 
 * ciemny i czarny (AMOLED) motyw
 * tryb offline
-* brak reklam
+* opcjonalne reklamy umożliwiające wsparcie projektu
 
 ## Pobierz
 

README.sk.md

@@ -1,18 +1,13 @@
-[English version of README](README.en.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Polska wersja README](README.md)
-
-[Česká verze README](README.cs.md)
+[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / Slovenská verzia
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Neoficiálny klient denníka VULCAN UONET+ pre žiaka a rodičov
 
@@ -39,7 +34,7 @@ Neoficiálny klient denníka VULCAN UONET+ pre žiaka a rodičov
 * podpora viacerých účtov s možnosťou premenovania žiakov
 * tmavý a čierny (AMOLED) motív
 * offline režim
-* žiadne reklamy
+* voliteľné reklamy na podporu projektu
 
 ## Stiahnuť
 
@@ -57,7 +52,7 @@ Aktuálnu verziu si môžete stiahnuť z Google Play, F-Droid alebo Huawei AppGa
 
 Môžete si tiež stiahnuť [vývojovú verziu](https://wulkanowy.github.io/#download), ktorá zahrňuje nové funkcie pripravované pre budúce vydanie
 
-## Postavené s
+## Postavené s pomocou
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)

app/build.gradle

@@ -15,33 +15,35 @@ apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 31
+    namespace 'io.github.wulkanowy'
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
-        targetSdkVersion 31
-        versionCode 103
-        versionName "1.5.0"
+        targetSdkVersion 33
+        versionCode 123
+        versionName "2.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
 
         manifestPlaceholders = [
-                firebase_enabled: project.hasProperty("enableFirebase"),
-                admob_project_id: ""
+            firebase_enabled: project.hasProperty("enableFirebase"),
+            admob_project_id: ""
         ]
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments += [
-                        "room.schemaLocation": "$projectDir/schemas".toString(),
-                        "room.incremental"   : "true"
+                    "room.schemaLocation": "$projectDir/schemas".toString(),
+                    "room.incremental"   : "true"
                 ]
             }
         }
 
         buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
+        buildConfigField "String", "DASHBOARD_TILE_AD_ID", "null"
 
         if (System.env.SET_BUILD_TIMESTAMP) {
             buildConfigField "long", "BUILD_TIMESTAMP", String.valueOf(System.currentTimeMillis())
@@ -73,6 +75,8 @@ android {
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
         }
         debug {
+            minifyEnabled false
+            shrinkResources false
             resValue "string", "app_name", "Wulkanowy DEV"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
@@ -92,10 +96,12 @@ android {
         play {
             dimension "platform"
             manifestPlaceholders = [
-                    install_channel : "Google Play",
-                    admob_project_id: System.getenv("ADMOB_PROJECT_ID") ?: "ca-app-pub-3940256099942544~3347511713"
+                install_channel : "Google Play",
+                admob_project_id: System.getenv("ADMOB_PROJECT_ID") ?: "ca-app-pub-3940256099942544~3347511713"
             ]
             buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "\"${System.getenv("SINGLE_SUPPORT_AD_ID") ?: "ca-app-pub-3940256099942544/5354046379"}\""
+            buildConfigField "String", "DASHBOARD_TILE_AD_ID", "\"${System.getenv("DASHBOARD_TILE_AD_ID") ?: "ca-app-pub-3940256099942544/6300978111"}\""
+
         }
 
         fdroid {
@@ -120,6 +126,8 @@ android {
 
     testOptions.unitTests {
         includeAndroidResources = true
+        // workaround HMS test errors https://github.com/robolectric/robolectric/issues/2750
+        all { jvmArgs '-noverify' }
     }
 
     compileOptions {
@@ -130,12 +138,14 @@ android {
 
     kotlinOptions {
         jvmTarget = "11"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
+        freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
-        exclude 'META-INF/library_release.kotlin_module'
-        exclude 'META-INF/library-core_release.kotlin_module'
+        resources {
+            excludes += ['META-INF/library_release.kotlin_module',
+                         'META-INF/library-core_release.kotlin_module']
+        }
     }
 
     aboutLibraries {
@@ -151,8 +161,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.25d
-    updatePriority = 1
+    userFraction = 0.10d
+    updatePriority = 2
     enabled.set(false)
 }
 
@@ -167,44 +177,44 @@ huaweiPublish {
 }
 
 ext {
-    work_manager = "2.7.1"
+    work_manager = "2.8.1"
     android_hilt = "1.0.0"
-    room = "2.4.0"
+    room = "2.5.1"
     chucker = "3.5.2"
-    mockk = "1.12.1"
-    coroutines = "1.6.0"
+    mockk = "1.13.5"
+    coroutines = "1.6.4"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.5.0"
+    implementation 'io.github.wulkanowy:sdk:2.0.1'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.7.0"
-    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
-    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.appcompat:appcompat:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.4.0"
-    implementation "androidx.annotation:annotation:1.3.0"
+    implementation "androidx.core:core-ktx:1.10.0"
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation "androidx.activity:activity-ktx:1.7.1"
+    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation "androidx.fragment:fragment-ktx:1.5.7"
+    implementation "androidx.annotation:annotation:1.6.0"
 
-    implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.preference:preference-ktx:1.2.0"
+    implementation "androidx.recyclerview:recyclerview:1.3.0"
     implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.4.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
+    implementation "com.google.android.material:material:1.8.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation 'com.github.lopspower:CircularImageView:4.2.0'
+    implementation 'com.github.lopspower:CircularImageView:4.3.0'
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -219,50 +229,53 @@ dependencies {
     implementation "com.github.YarikSOffice:lingver:1.3.0"
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.3"
+    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.11.0"
 
     implementation "com.jakewharton.timber:timber:5.0.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:1.4.0"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
-    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
-    implementation 'com.fredporciuncula:flow-preferences:1.6.0'
+    implementation "io.coil-kt:coil:2.3.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'
 
-    playImplementation platform('com.google.firebase:firebase-bom:29.0.3')
+    playImplementation platform('com.google.firebase:firebase-bom:31.5.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
-    playImplementation 'com.google.android.play:core:1.10.2'
+    playImplementation 'com.google.firebase:firebase-config-ktx'
+    playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:20.5.0'
+    playImplementation 'com.google.android.gms:play-services-ads:22.0.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.3.2.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.3.200'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
     debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
     debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.6'
+    debugImplementation 'com.github.haroldadmin:WhatTheStack:1.0.0-alpha04'
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.7.3'
-    testImplementation "androidx.test:runner:1.4.0"
-    testImplementation "androidx.test.ext:junit:1.1.3"
-    testImplementation "androidx.test:core:1.4.0"
+    testImplementation 'org.robolectric:robolectric:4.10'
+    testImplementation "androidx.test:runner:1.5.2"
+    testImplementation "androidx.test.ext:junit:1.1.5"
+    testImplementation "androidx.test:core:1.5.0"
     testImplementation "androidx.room:room-testing:$room"
     testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
     kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
 
-    androidTestImplementation "androidx.test:core:1.4.0"
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation "androidx.test:core:1.5.0"
+    androidTestImplementation "androidx.test:runner:1.5.2"
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }

app/src/debug/agconnect-services.json

@@ -1,33 +1,92 @@
 {
-	"agcgw":{
-		"backurl":"connect-dre.dbankcloud.cn",
-		"url":"connect-dre.hispace.hicloud.com"
-	},
-	"client":{
-		"cp_id":"890048000024105546",
-		"product_id":"",
-		"client_id":"",
-		"client_secret":"",
-		"app_id":"101440411",
-		"package_name":"io.github.wulkanowy.dev",
-		"api_key":""
-	},
-	"service":{
-		"analytics":{
-			"collector_url":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-			"resource_id":"p1",
-			"channel_id":""
-		},
+  "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":"https://ops-dre.agcstorage.link"
-		},
-		"ml":{
-			"mlservice_url":"ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
-		}
-	},
-	"region":"DE",
-	"configuration_version":"1.0"
+		"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/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorPrimary" />
+    <background android:drawable="@color/colorIcon" />
     <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
-</adaptive-icon>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_dev_mono" />
+</adaptive-icon>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorPrimary" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
-</adaptive-icon>

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

@@ -0,0 +1,28 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+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 javax.inject.Inject
+
+@Suppress("unused")
+class AdsHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val preferencesRepository: PreferencesRepository
+) {
+
+    fun initialize() {
+        preferencesRepository.isAdsEnabled = false
+        preferencesRepository.isAgreeToProcessData = false
+        preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
+    }
+
+    @Suppress("RedundantSuspendModifier", "UNUSED_PARAMETER")
+    suspend fun getDashboardTileAdBanner(width: Int): AdBanner {
+        throw IllegalStateException("Can't get ad banner (F-droid)")
+    }
+}
+
+data class AdBanner(val view: View)

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

@@ -8,15 +8,7 @@ import javax.inject.Singleton
 @Suppress("UNUSED_PARAMETER")
 class AnalyticsHelper @Inject constructor() {
 
-    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
-        // do nothing
-    }
-
-    fun setCurrentScreen(activity: Activity, name: String?) {
-        // do nothing
-    }
-
-    fun popCurrentScreen(name: String?) {
-        // do nothing
-    }
+    fun logEvent(name: String, vararg params: Pair<String, Any?>) = Unit
+    fun setCurrentScreen(activity: Activity, name: String?) = Unit
+    fun popCurrentScreen(name: String?) = Unit
 }

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

@@ -0,0 +1,7 @@
+package io.github.wulkanowy.utils
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigHelper @Inject constructor() : BaseRemoteConfigHelper()

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

@@ -0,0 +1,28 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+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 javax.inject.Inject
+
+@Suppress("unused")
+class AdsHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val preferencesRepository: PreferencesRepository
+) {
+
+    fun initialize() {
+        preferencesRepository.isAdsEnabled = false
+        preferencesRepository.isAgreeToProcessData = false
+        preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
+    }
+
+    @Suppress("RedundantSuspendModifier", "UNUSED_PARAMETER")
+    suspend fun getDashboardTileAdBanner(width: Int): AdBanner {
+        throw IllegalStateException("Can't get ad banner (HMS)")
+    }
+}
+
+data class AdBanner(val view: View)

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

@@ -3,26 +3,38 @@ package io.github.wulkanowy.utils
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
+import com.huawei.agconnect.crash.AGConnectCrash
 import com.huawei.hms.analytics.HiAnalytics
 import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AnalyticsHelper @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    preferencesRepository: PreferencesRepository,
+    appInfo: AppInfo,
 ) {
 
     private val analytics by lazy { HiAnalytics.getInstance(context) }
 
+    private val connectCrash by lazy { AGConnectCrash.getInstance() }
+
+    init {
+        if (!appInfo.isDebug) {
+            connectCrash.setUserId(preferencesRepository.installationId)
+        }
+    }
+
     fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         Bundle().apply {
-            params.forEach {
-                if (it.second == null) return@forEach
-                when (it.second) {
-                    is String, is String? -> putString(it.first, it.second as String)
-                    is Int, is Int? -> putInt(it.first, it.second as Int)
-                    is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
+            params.forEach { (key, value) ->
+                if (value == null) return@forEach
+                when (value) {
+                    is String -> putString(key, value)
+                    is Int -> putInt(key, value)
+                    is Boolean -> putBoolean(key, value)
                 }
             }
             analytics.onEvent(name, this)

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.utils
 import android.util.Log
 import com.huawei.agconnect.crash.AGConnectCrash
 import fr.bipi.tressence.base.FormatterPriorityTree
+import fr.bipi.tressence.common.StackTraceRecorder
 
 class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
 
@@ -22,16 +23,10 @@ class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR, ExceptionFilter)
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         if (skipLog(priority, tag, message, t)) return
 
-        // Disabled due to a bug in the Huawei library
-
-        /*connectCrash.setCustomKey("priority", priority)
-        connectCrash.setCustomKey("tag", tag.orEmpty())
-        connectCrash.setCustomKey("message", message)
-
         if (t != null) {
             connectCrash.recordException(t)
         } else {
             connectCrash.recordException(StackTraceRecorder(format(priority, tag, message)))
-        }*/
+        }
     }
 }

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

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

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

@@ -0,0 +1,7 @@
+package io.github.wulkanowy.utils
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigHelper @Inject constructor() : BaseRemoteConfigHelper()

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -9,7 +8,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <queries>
         <intent>
@@ -37,13 +37,14 @@
     <application
         android:name=".WulkanowyApp"
         android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="DataExtractionRules,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:exported="true"
@@ -71,7 +72,7 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.MessageSend"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"

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

@@ -31,10 +31,18 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
+    @Inject
+    lateinit var adsHelper: AdsHelper
+
+    @Inject
+    lateinit var remoteConfigHelper: RemoteConfigHelper
+
     override fun onCreate() {
         super.onCreate()
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
+        adsHelper.initialize()
+        remoteConfigHelper.initialize()
         initLogging()
     }
 

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

@@ -19,8 +19,7 @@ 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 kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.serialization.ExperimentalSerializationApi
+import io.github.wulkanowy.utils.RemoteConfigHelper
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -37,10 +36,11 @@ internal class DataModule {
 
     @Singleton
     @Provides
-    fun provideSdk(chuckerInterceptor: ChuckerInterceptor) =
+    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
@@ -80,7 +80,6 @@ internal class DataModule {
             .readTimeout(30, TimeUnit.SECONDS)
             .build()
 
-    @OptIn(ExperimentalSerializationApi::class)
     @Singleton
     @Provides
     fun provideRetrofit(
@@ -110,7 +109,6 @@ internal class DataModule {
     fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences =
         PreferenceManager.getDefaultSharedPreferences(context)
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Singleton
     @Provides
     fun provideFlowSharedPref(sharedPreferences: SharedPreferences) =
@@ -197,7 +195,7 @@ internal class DataModule {
 
     @Singleton
     @Provides
-    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
+    fun provideMailboxesDao(database: AppDatabase) = database.mailboxDao
 
     @Singleton
     @Provides

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

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

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

@@ -1,72 +1,10 @@
 package io.github.wulkanowy.data.db
 
 import android.content.Context
-import androidx.room.AutoMigration
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
+import androidx.room.*
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
-import androidx.room.TypeConverters
-import io.github.wulkanowy.data.db.dao.AdminMessageDao
-import io.github.wulkanowy.data.db.dao.AttendanceDao
-import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
-import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
-import io.github.wulkanowy.data.db.dao.ConferenceDao
-import io.github.wulkanowy.data.db.dao.ExamDao
-import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.dao.HomeworkDao
-import io.github.wulkanowy.data.db.dao.LuckyNumberDao
-import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
-import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.dao.MobileDeviceDao
-import io.github.wulkanowy.data.db.dao.NoteDao
-import io.github.wulkanowy.data.db.dao.NotificationDao
-import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.dao.ReportingUnitDao
-import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
-import io.github.wulkanowy.data.db.dao.SchoolDao
-import io.github.wulkanowy.data.db.dao.SemesterDao
-import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.data.db.dao.StudentInfoDao
-import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.dao.TeacherDao
-import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
-import io.github.wulkanowy.data.db.dao.TimetableDao
-import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
-import io.github.wulkanowy.data.db.entities.AdminMessage
-import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.db.entities.Conference
-import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradePartialStatistics
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Notification
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentInfo
-import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.data.db.entities.TimetableHeader
+import io.github.wulkanowy.data.db.dao.*
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.db.migrations.*
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Singleton
@@ -92,7 +30,7 @@ import javax.inject.Singleton
         Subject::class,
         LuckyNumber::class,
         CompletedLesson::class,
-        ReportingUnit::class,
+        Mailbox::class,
         Recipient::class,
         MobileDevice::class,
         Teacher::class,
@@ -108,6 +46,9 @@ import javax.inject.Singleton
     autoMigrations = [
         AutoMigration(from = 44, to = 45),
         AutoMigration(from = 46, to = 47),
+        AutoMigration(from = 47, to = 48),
+        AutoMigration(from = 51, to = 52),
+        AutoMigration(from = 54, to = 55, spec = Migration55::class),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -116,7 +57,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 47
+        const val VERSION_SCHEMA = 55
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -163,6 +104,11 @@ abstract class AppDatabase : RoomDatabase() {
             Migration43(),
             Migration44(),
             Migration46(),
+            Migration49(),
+            Migration50(),
+            Migration51(),
+            Migration53(),
+            Migration54(),
         )
 
         fun newInstance(
@@ -213,7 +159,7 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val completedLessonsDao: CompletedLessonsDao
 
-    abstract val reportingUnitDao: ReportingUnitDao
+    abstract val mailboxDao: MailboxDao
 
     abstract val recipientDao: RecipientDao
 

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

@@ -1,11 +1,14 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
+import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.utils.toTimestamp
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import java.time.*
+import java.util.*
 import java.time.Instant
 import java.time.LocalDate
 import java.time.Month
@@ -58,4 +61,11 @@ class Converters {
             emptyList() // handle errors from old gson Pair serialized data
         }
     }
+
+    @TypeConverter
+    fun destinationToString(destination: Destination) = json.encodeToString(destination)
+
+    @TypeConverter
+    fun stringToDestination(destination: String): Destination = json.decodeFromString(destination)
+
 }

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

@@ -2,11 +2,12 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Delete
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Update
 
 interface BaseDao<T> {
 
-    @Insert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(items: List<T>): List<Long>
 
     @Update

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

@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.Mailbox
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface MailboxDao : BaseDao<Mailbox> {
+
+    @Query("SELECT * FROM Mailboxes WHERE email = :email")
+    suspend fun loadAll(email: String): List<Mailbox>
+
+    @Query("SELECT * FROM Mailboxes WHERE email = :email AND symbol = :symbol AND schoolId = :schoolId")
+    fun loadAll(email: String, symbol: String, schoolId: String): Flow<List<Mailbox>>
+}

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

@@ -11,9 +11,12 @@ import kotlinx.coroutines.flow.Flow
 interface MessagesDao : BaseDao<Message> {
 
     @Transaction
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
-    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Flow<MessageWithAttachment?>
+    @Query("SELECT * FROM Messages WHERE message_global_key = :messageGlobalKey")
+    fun loadMessageWithAttachment(messageGlobalKey: String): Flow<MessageWithAttachment?>
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun loadAll(studentId: Int, folder: Int): Flow<List<Message>>
+    @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>>
+
+    @Query("SELECT * FROM Messages WHERE email = :email AND folder_id = :folder ORDER BY date DESC")
+    fun loadAll(folder: Int, email: String): Flow<List<Message>>
 }

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

@@ -8,6 +8,6 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
-    @Query("SELECT * FROM MobileDevices WHERE student_id = :userLoginId ORDER BY date DESC")
+    @Query("SELECT * FROM MobileDevices WHERE user_login_id = :userLoginId ORDER BY date DESC")
     fun loadAll(userLoginId: Int): Flow<List<MobileDevice>>
 }

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

@@ -2,6 +2,7 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Recipient
 import javax.inject.Singleton
 
@@ -9,6 +10,6 @@ import javax.inject.Singleton
 @Dao
 interface RecipientDao : BaseDao<Recipient> {
 
-    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND unit_id = :unitId AND role = :role")
-    suspend fun loadAll(studentId: Int, unitId: Int, role: Int): List<Recipient>
+    @Query("SELECT * FROM Recipients WHERE type = :type AND studentMailboxGlobalKey = :studentMailboxGlobalKey")
+    suspend fun loadAll(type: MailboxType, studentMailboxGlobalKey: String): List<Recipient>
 }

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

@@ -1,17 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface ReportingUnitDao : BaseDao<ReportingUnit> {
-
-    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
-    suspend fun load(studentId: Int): List<ReportingUnit>
-
-    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
-    suspend fun loadOne(studentId: Int, unitId: Int): ReportingUnit?
-}

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

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

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

@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.*
-import androidx.room.OnConflictStrategy.ABORT
 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
@@ -11,7 +11,7 @@ import javax.inject.Singleton
 @Dao
 abstract class StudentDao {
 
-    @Insert(onConflict = ABORT)
+    @Insert(onConflict = OnConflictStrategy.ABORT)
     abstract suspend fun insertAll(student: List<Student>): List<Long>
 
     @Delete
@@ -20,6 +20,9 @@ abstract class StudentDao {
     @Update(entity = Student::class)
     abstract suspend fun update(studentNickAndAvatar: StudentNickAndAvatar)
 
+    @Update(entity = Student::class)
+    abstract suspend fun update(studentName: StudentName)
+
     @Query("SELECT * FROM Students WHERE is_current = 1")
     abstract suspend fun loadCurrent(): Student?
 
@@ -33,6 +36,10 @@ abstract class StudentDao {
     @Query("SELECT * FROM Students")
     abstract suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
 
+    @Transaction
+    @Query("SELECT * FROM Students WHERE id = :id")
+    abstract suspend fun loadStudentWithSemestersById(id: Long): StudentWithSemesters?
+
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
     abstract suspend fun updateCurrent(id: Long)
 

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

@@ -13,4 +13,7 @@ interface TimetableDao : BaseDao<Timetable> {
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<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>
 }

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

@@ -22,6 +22,7 @@ data class Exam(
 
     val subject: String,
 
+    @Deprecated("not available anymore")
     val group: String,
 
     val type: String,

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

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

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

@@ -0,0 +1,32 @@
+package io.github.wulkanowy.data.db.entities
+
+import android.os.Parcelable
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+@Entity(tableName = "Mailboxes")
+data class Mailbox(
+
+    @PrimaryKey
+    val globalKey: String,
+
+    val email: String,
+    val symbol: String,
+    val schoolId: String,
+
+    val fullName: String,
+    val userName: String,
+    val studentName: String,
+    val schoolNameShort: String,
+    val type: MailboxType,
+) : java.io.Serializable, Parcelable
+
+enum class MailboxType {
+    STUDENT,
+    PARENT,
+    GUARDIAN,
+    EMPLOYEE,
+    UNKNOWN,
+}

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

@@ -9,23 +9,19 @@ import java.time.Instant
 @Entity(tableName = "Messages")
 data class Message(
 
-    @ColumnInfo(name = "student_id")
-    val studentId: Long,
+    @ColumnInfo(name = "email")
+    val email: String,
 
-    @ColumnInfo(name = "real_id")
-    val realId: Int,
+    @ColumnInfo(name = "message_global_key")
+    val messageGlobalKey: String,
+
+    @ColumnInfo(name = "mailbox_key")
+    val mailboxKey: String,
 
     @ColumnInfo(name = "message_id")
     val messageId: Int,
 
-    @ColumnInfo(name = "sender_name")
-    val sender: String,
-
-    @ColumnInfo(name = "sender_id")
-    val senderId: Int,
-
-    @ColumnInfo(name = "recipient_name")
-    val recipient: String,
+    val correspondents: String,
 
     val subject: String,
 
@@ -36,7 +32,11 @@ data class Message(
 
     var unread: Boolean,
 
-    val removed: Boolean,
+    @ColumnInfo(name = "read_by")
+    val readBy: Int?,
+
+    @ColumnInfo(name = "unread_by")
+    val unreadBy: Int?,
 
     @ColumnInfo(name = "has_attachments")
     val hasAttachments: Boolean
@@ -48,11 +48,7 @@ data class Message(
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
 
-    @ColumnInfo(name = "unread_by")
-    var unreadBy: Int = 0
-
-    @ColumnInfo(name = "read_by")
-    var readBy: Int = 0
-
     var content: String = ""
+    var sender: String? = null
+    var recipients: String? = null
 }

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

@@ -2,21 +2,16 @@ 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 = "MessageAttachments")
+@Entity(
+    tableName = "MessageAttachments",
+    primaryKeys = ["message_global_key", "url", "filename"],
+)
 data class MessageAttachment(
 
-    @PrimaryKey
-    @ColumnInfo(name = "real_id")
-    val realId: Int,
-
-    @ColumnInfo(name = "message_id")
-    val messageId: Int,
-
-    @ColumnInfo(name = "one_drive_id")
-    val oneDriveId: String,
+    @ColumnInfo(name = "message_global_key")
+    val messageGlobalKey: String,
 
     @ColumnInfo(name = "url")
     val url: String,

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

@@ -7,6 +7,6 @@ data class MessageWithAttachment(
     @Embedded
     val message: Message,
 
-    @Relation(parentColumn = "message_id", entityColumn = "message_id")
+    @Relation(parentColumn = "message_global_key", entityColumn = "message_global_key")
     val attachments: List<MessageAttachment>
 )

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

@@ -9,7 +9,7 @@ import java.time.Instant
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
 
-    @ColumnInfo(name = "student_id")
+    @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 
     @ColumnInfo(name = "device_id")

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

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

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

@@ -1,6 +1,5 @@
 package io.github.wulkanowy.data.db.entities
 
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import java.io.Serializable
@@ -8,32 +7,16 @@ import java.io.Serializable
 @kotlinx.serialization.Serializable
 @Entity(tableName = "Recipients")
 data class Recipient(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "real_id")
-    val realId: String,
-
-    val name: String,
-
-    @ColumnInfo(name = "real_name")
-    val realName: String,
-
-    @ColumnInfo(name = "login_id")
-    val loginId: Int,
-
-    @ColumnInfo(name = "unit_id")
-    val unitId: Int,
-
-    val role: Int,
-
-    val hash: String
-
+    val mailboxGlobalKey: String,
+    val studentMailboxGlobalKey: String,
+    val fullName: String,
+    val userName: String,
+    val schoolShortName: String,
+    val type: MailboxType,
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
 
-    override fun toString() = name
+    override fun toString() = userName
 }

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

@@ -1,32 +0,0 @@
-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 = "ReportingUnits")
-data class ReportingUnit(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "real_id")
-    val unitId: Int,
-
-    @ColumnInfo(name = "short")
-    val shortName: String,
-
-    @ColumnInfo(name = "sender_id")
-    val senderId: Int,
-
-    @ColumnInfo(name = "sender_name")
-    val senderName: String,
-
-    val roles: List<Int>
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

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

@@ -9,8 +9,8 @@ import java.time.LocalDate
 @Entity(tableName = "SchoolAnnouncements")
 data class SchoolAnnouncement(
 
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    @ColumnInfo(name = "user_login_id")
+    val userLoginId: Int,
 
     val date: LocalDate,
 

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

@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity
+data class StudentName(
+
+    @ColumnInfo(name = "student_name")
+    val studentName: String
+
+) : Serializable {
+
+    @PrimaryKey
+    var id: Long = 0
+}

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

@@ -0,0 +1,23 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration49 : Migration(48, 49) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS SchoolAnnouncements")
+
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `SchoolAnnouncements` (
+            `user_login_id` INTEGER NOT NULL, 
+            `date` INTEGER NOT NULL, 
+            `subject` TEXT NOT NULL, 
+            `content` TEXT NOT NULL, 
+            `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
+            `is_notified` INTEGER NOT NULL)
+        """.trimIndent()
+        )
+    }
+}

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

@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration50 : Migration(49, 50) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS MobileDevices")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `MobileDevices` (
+            `user_login_id` INTEGER NOT NULL, 
+            `device_id` INTEGER NOT NULL, 
+            `name` TEXT NOT NULL, 
+            `date` INTEGER NOT NULL, 
+            `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)
+        """.trimIndent()
+        )
+    }
+}

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

@@ -0,0 +1,88 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+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)
+    }
+
+    private fun createMailboxTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Mailboxes")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `Mailboxes` (
+                `globalKey` TEXT NOT NULL,
+                `fullName` TEXT NOT NULL,
+                `userName` TEXT NOT NULL,
+                `userLoginId` INTEGER NOT NULL,
+                `studentName` TEXT NOT NULL,
+                `schoolNameShort` TEXT NOT NULL,
+                `type` TEXT NOT NULL,
+                PRIMARY KEY(`globalKey`)
+            )""".trimIndent()
+        )
+    }
+
+    private fun recreateMessagesTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Messages")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `Messages` (
+                `message_global_key` TEXT NOT NULL,
+                `mailbox_key` TEXT NOT NULL,
+                `message_id` INTEGER NOT NULL,
+                `correspondents` TEXT NOT NULL,
+                `subject` TEXT NOT NULL,
+                `date` INTEGER NOT NULL,
+                `folder_id` INTEGER NOT NULL,
+                `unread` INTEGER NOT NULL,
+                `has_attachments` INTEGER NOT NULL,
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `is_notified` INTEGER NOT NULL,
+                `content` TEXT NOT NULL,
+                `sender` TEXT, `recipients` TEXT
+            )""".trimIndent()
+        )
+    }
+
+    private fun recreateMessageAttachmentsTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS MessageAttachments")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `MessageAttachments` (
+                `real_id` INTEGER NOT NULL,
+                `message_global_key` TEXT NOT NULL,
+                `url` TEXT NOT NULL,
+                `filename` TEXT NOT NULL,
+                PRIMARY KEY(`real_id`)
+            )""".trimIndent()
+        )
+    }
+
+    private fun recreateRecipientsTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Recipients")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `Recipients` (
+                `mailboxGlobalKey` TEXT NOT NULL,
+                `studentMailboxGlobalKey` TEXT NOT NULL,
+                `fullName` TEXT NOT NULL,
+                `userName` TEXT NOT NULL,
+                `schoolShortName` TEXT NOT NULL,
+                `type` TEXT NOT NULL,
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
+            )""".trimIndent()
+        )
+    }
+
+    private fun deleteReportingUnitTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS ReportingUnits")
+    }
+}

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

@@ -0,0 +1,57 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration53 : Migration(52, 53) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        createMailboxTable(database)
+        recreateMessagesTable(database)
+    }
+
+    private fun createMailboxTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Mailboxes")
+        database.execSQL(
+            """
+                CREATE TABLE IF NOT EXISTS `Mailboxes` (
+                    `globalKey` TEXT NOT NULL,
+                    `email` TEXT NOT NULL,
+                    `symbol` TEXT NOT NULL,
+                    `schoolId` TEXT NOT NULL,
+                    `fullName` TEXT NOT NULL,
+                    `userName` TEXT NOT NULL,
+                    `studentName` TEXT NOT NULL,
+                    `schoolNameShort` TEXT NOT NULL,
+                    `type` TEXT NOT NULL,
+                    PRIMARY KEY(`globalKey`)
+                )""".trimIndent()
+        )
+    }
+
+    private fun recreateMessagesTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Messages")
+        database.execSQL(
+            """
+                CREATE TABLE IF NOT EXISTS `Messages` (
+                    `email` TEXT NOT NULL,
+                    `message_global_key` TEXT NOT NULL,
+                    `mailbox_key` TEXT NOT NULL,
+                    `message_id` INTEGER NOT NULL,
+                    `correspondents` TEXT NOT NULL,
+                    `subject` TEXT NOT NULL,
+                    `date` INTEGER NOT NULL,
+                    `folder_id` INTEGER NOT NULL,
+                    `unread` INTEGER NOT NULL,
+                    `read_by` INTEGER,
+                    `unread_by` INTEGER,
+                    `has_attachments` INTEGER NOT NULL,
+                    `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
+                    `is_notified` INTEGER NOT NULL, 
+                    `content` TEXT NOT NULL,
+                    `sender` TEXT,
+                    `recipients` TEXT
+                )""".trimIndent()
+        )
+    }
+}

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

@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration54 : Migration(53, 54) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        migrateResman(database)
+        removeTomaszowMazowieckiStudents(database)
+    }
+
+    private fun migrateResman(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            UPDATE Students SET
+                scrapper_base_url = 'https://vulcan.net.pl',
+                login_type = 'ADFSLightScoped',
+                symbol = 'rzeszowprojekt'
+            WHERE scrapper_base_url = 'https://resman.pl'
+        """.trimIndent())
+    }
+
+    private fun removeTomaszowMazowieckiStudents(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Students WHERE symbol = 'tomaszowmazowiecki'")
+    }
+}

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

@@ -0,0 +1,17 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.DeleteColumn
+import androidx.room.migration.AutoMigrationSpec
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+@DeleteColumn(
+    tableName = "MessageAttachments",
+    columnName = "real_id",
+)
+class Migration55 : AutoMigrationSpec {
+
+    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM Messages")
+        db.execSQL("DELETE FROM MessageAttachments")
+    }
+}

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

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

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

@@ -3,17 +3,22 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.sdk.pojo.Attendance as SdkAttendance
 import io.github.wulkanowy.sdk.pojo.AttendanceSummary as SdkAttendanceSummary
 
-fun List<SdkAttendance>.mapToEntities(semester: Semester) = map {
+fun List<SdkAttendance>.mapToEntities(semester: Semester, lessons: List<Timetable>) = map {
     Attendance(
         studentId = semester.studentId,
         diaryId = semester.diaryId,
         date = it.date,
         timeId = it.timeId,
         number = it.number,
-        subject = it.subject,
+        subject = it.subject.ifBlank {
+            lessons.find { lesson ->
+                lesson.date == it.date && lesson.number == it.number
+            }?.subject.orEmpty()
+        },
         name = it.name,
         presence = it.presence,
         absence = it.absence,

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

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

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

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

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

@@ -11,7 +11,7 @@ fun List<SdkExam>.mapToEntities(semester: Semester) = map {
         date = it.date,
         entryDate = it.entryDate,
         subject = it.subject,
-        group = it.group,
+        group = "",
         type = it.type,
         description = it.description,
         teacher = it.teacher,

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

@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.MailboxType
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.pojo.Mailbox as SdkMailbox
+
+fun List<SdkMailbox>.mapToEntities(student: Student) = map {
+    Mailbox(
+        globalKey = it.globalKey,
+        fullName = it.fullName,
+        userName = it.userName,
+        studentName = it.studentName,
+        schoolNameShort = it.schoolNameShort,
+        type = MailboxType.valueOf(it.type.name),
+        email = student.email,
+        symbol = student.symbol,
+        schoolId = student.schoolSymbol,
+    )
+}

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

@@ -1,40 +1,45 @@
 package io.github.wulkanowy.data.mappers
 
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.Student
-import java.time.Instant
+import io.github.wulkanowy.data.db.entities.*
+import io.github.wulkanowy.sdk.pojo.MailboxType
+import timber.log.Timber
 import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
 import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
-fun List<SdkMessage>.mapToEntities(student: Student) = map {
+fun List<SdkMessage>.mapToEntities(
+    student: Student,
+    mailbox: Mailbox?,
+    allMailboxes: List<Mailbox>
+): List<Message> = map {
     Message(
-        studentId = student.id,
-        realId = it.id ?: 0,
-        messageId = it.messageId ?: 0,
-        sender = it.sender?.name.orEmpty(),
-        senderId = it.sender?.loginId ?: 0,
-        recipient = it.recipients.singleOrNull()?.name ?: "Wielu adresatów",
+        messageGlobalKey = it.globalKey,
+        mailboxKey = mailbox?.globalKey ?: allMailboxes.find { box ->
+            box.fullName == it.mailbox
+        }?.globalKey.let { mailboxKey ->
+            if (mailboxKey == null) {
+                Timber.e("Can't find ${it.mailbox} in $allMailboxes")
+                "unknown"
+            } else mailboxKey
+        },
+        email = student.email,
+        messageId = it.id,
+        correspondents = it.correspondents,
         subject = it.subject.trim(),
-        date = it.dateZoned?.toInstant() ?: Instant.now(),
+        date = it.date.toInstant(),
         folderId = it.folderId,
-        unread = it.unread ?: false,
-        removed = it.removed,
-        hasAttachments = it.hasAttachments
+        unread = it.unread,
+        unreadBy = it.unreadBy,
+        readBy = it.readBy,
+        hasAttachments = it.hasAttachments,
     ).apply {
         content = it.content.orEmpty()
-        unreadBy = it.unreadBy ?: 0
-        readBy = it.readBy ?: 0
     }
 }
 
-fun List<SdkMessageAttachment>.mapToEntities() = map {
+fun List<SdkMessageAttachment>.mapToEntities(messageGlobalKey: String) = map {
     MessageAttachment(
-        realId = it.id,
-        messageId = it.messageId,
-        oneDriveId = it.oneDriveId,
+        messageGlobalKey = messageGlobalKey,
         url = it.url,
         filename = it.filename
     )
@@ -42,12 +47,11 @@ fun List<SdkMessageAttachment>.mapToEntities() = map {
 
 fun List<Recipient>.mapFromEntities() = map {
     SdkRecipient(
-        id = it.realId,
-        name = it.realName,
-        loginId = it.loginId,
-        reportingUnitId = it.unitId,
-        role = it.role,
-        hash = it.hash,
-        shortName = it.name
+        fullName = it.fullName,
+        userName = it.userName,
+        studentName = it.userName,
+        mailboxGlobalKey = it.mailboxGlobalKey,
+        schoolNameShort = it.schoolShortName,
+        type = MailboxType.valueOf(it.type.name),
     )
 }

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

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

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

@@ -1,17 +1,16 @@
 package io.github.wulkanowy.data.mappers
 
+import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
-fun List<SdkRecipient>.mapToEntities(userLoginId: Int) = map {
+fun List<SdkRecipient>.mapToEntities(studentMailboxGlobalKey: String) = map {
     Recipient(
-        studentId = userLoginId,
-        realId = it.id,
-        realName = it.name,
-        name = it.shortName,
-        hash = it.hash,
-        loginId = it.loginId,
-        role = it.role,
-        unitId = it.reportingUnitId ?: 0
+        mailboxGlobalKey = it.mailboxGlobalKey,
+        fullName = it.fullName,
+        userName = it.userName,
+        studentMailboxGlobalKey = studentMailboxGlobalKey,
+        schoolShortName = it.schoolNameShort,
+        type = MailboxType.valueOf(it.type.name),
     )
 }

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

@@ -0,0 +1,88 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.*
+import java.time.Instant
+import io.github.wulkanowy.sdk.pojo.RegisterStudent as SdkRegisterStudent
+import io.github.wulkanowy.sdk.pojo.RegisterUser as SdkRegisterUser
+
+fun SdkRegisterUser.mapToPojo(password: String?) = RegisterUser(
+    email = email,
+    login = login,
+    password = password,
+    scrapperBaseUrl = scrapperBaseUrl,
+    loginMode = loginMode,
+    loginType = loginType,
+    symbols = symbols.map { registerSymbol ->
+        RegisterSymbol(
+            symbol = registerSymbol.symbol,
+            error = registerSymbol.error,
+            hebeBaseUrl = registerSymbol.hebeBaseUrl,
+            keyId = registerSymbol.keyId,
+            privatePem = registerSymbol.privatePem,
+            userName = registerSymbol.userName,
+            schools = registerSymbol.schools.map {
+                RegisterUnit(
+                    userLoginId = it.userLoginId,
+                    schoolId = it.schoolId,
+                    schoolName = it.schoolName,
+                    schoolShortName = it.schoolShortName,
+                    parentIds = it.parentIds,
+                    studentIds = it.studentIds,
+                    employeeIds = it.employeeIds,
+                    error = it.error,
+                    students = it.subjects
+                        .filterIsInstance<SdkRegisterStudent>()
+                        .map { registerSubject ->
+                            RegisterStudent(
+                                studentId = registerSubject.studentId,
+                                studentName = registerSubject.studentName,
+                                studentSecondName = registerSubject.studentSecondName,
+                                studentSurname = registerSubject.studentSurname,
+                                className = registerSubject.className,
+                                classId = registerSubject.classId,
+                                isParent = registerSubject.isParent,
+                                semesters = registerSubject.semesters
+                                    .mapToEntities(registerSubject.studentId),
+                            )
+                        },
+                )
+            }
+        )
+    },
+)
+
+fun RegisterStudent.mapToStudentWithSemesters(
+    user: RegisterUser,
+    symbol: RegisterSymbol,
+    unit: RegisterUnit,
+    colors: List<Long>,
+): StudentWithSemesters = StudentWithSemesters(
+    semesters = semesters,
+    student = Student(
+        email = user.login, // for compatibility
+        userName = symbol.userName,
+        userLoginId = unit.userLoginId,
+        isParent = isParent,
+        className = className,
+        classId = classId,
+        studentId = studentId,
+        symbol = symbol.symbol,
+        loginType = user.loginType?.name.orEmpty(),
+        schoolName = unit.schoolName,
+        schoolShortName = unit.schoolShortName,
+        schoolSymbol = unit.schoolId,
+        studentName = "$studentName $studentSurname",
+        loginMode = user.loginMode.name,
+        scrapperBaseUrl = user.scrapperBaseUrl.orEmpty(),
+        mobileBaseUrl = symbol.hebeBaseUrl.orEmpty(),
+        certificateKey = symbol.keyId.orEmpty(),
+        privateKey = symbol.privatePem.orEmpty(),
+        password = user.password.orEmpty(),
+        isCurrent = false,
+        registrationDate = Instant.now(),
+    ).apply {
+        avatarColor = colors.random()
+    },
+)

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

@@ -1,16 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.pojo.ReportingUnit as SdkReportingUnit
-
-fun List<SdkReportingUnit>.mapToEntities(student: Student) = map {
-    ReportingUnit(
-        studentId = student.id.toInt(),
-        unitId = it.id,
-        roles = it.roles,
-        senderId = it.senderId,
-        senderName = it.senderName,
-        shortName = it.short
-    )
-}

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

@@ -1,37 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import java.time.Instant
-import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
-
-fun List<SdkStudent>.mapToEntities(password: String = "", colors: List<Long>) = map {
-    StudentWithSemesters(
-        student = Student(
-            email = it.email,
-            password = password,
-            isParent = it.isParent,
-            symbol = it.symbol,
-            studentId = it.studentId,
-            userLoginId = it.userLoginId,
-            userName = it.userName,
-            studentName = it.studentName + " " + it.studentSurname,
-            schoolSymbol = it.schoolSymbol,
-            schoolShortName = it.schoolShortName,
-            schoolName = it.schoolName,
-            className = it.className,
-            classId = it.classId,
-            scrapperBaseUrl = it.scrapperBaseUrl,
-            loginType = it.loginType.name,
-            isCurrent = false,
-            registrationDate = Instant.now(),
-            mobileBaseUrl = it.mobileBaseUrl,
-            privateKey = it.privateKey,
-            certificateKey = it.certificateKey,
-            loginMode = it.loginMode.name,
-        ).apply {
-            avatarColor = colors.random()
-        },
-        semesters = it.semesters.mapToEntities(it.studentId)
-    )
-}

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

@@ -5,10 +5,10 @@ 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.pojos.TimetableFull
-import io.github.wulkanowy.sdk.pojo.TimetableFull as SdkTimetableFull
+import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetableFull
 import io.github.wulkanowy.sdk.pojo.TimetableDayHeader as SdkTimetableHeader
-import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetable
-import io.github.wulkanowy.sdk.pojo.TimetableAdditional as SdkTimetableAdditional
+import io.github.wulkanowy.sdk.pojo.Lesson as SdkLesson
+import io.github.wulkanowy.sdk.pojo.LessonAdditional as SdkTimetableAdditional
 
 fun SdkTimetableFull.mapToEntities(semester: Semester) = TimetableFull(
     lessons = lessons.mapToEntities(semester),
@@ -16,13 +16,13 @@ fun SdkTimetableFull.mapToEntities(semester: Semester) = TimetableFull(
     headers = headers.mapToEntities(semester)
 )
 
-fun List<SdkTimetable>.mapToEntities(semester: Semester) = map {
+fun List<SdkLesson>.mapToEntities(semester: Semester) = map {
     Timetable(
         studentId = semester.studentId,
         diaryId = semester.diaryId,
         number = it.number,
-        start = it.startZoned.toInstant(),
-        end = it.endZoned.toInstant(),
+        start = it.start.toInstant(),
+        end = it.end.toInstant(),
         date = it.date,
         subject = it.subject,
         subjectOld = it.subjectOld,
@@ -45,8 +45,8 @@ fun List<SdkTimetableAdditional>.mapToEntities(semester: Semester) = map {
         diaryId = semester.diaryId,
         subject = it.subject,
         date = it.date,
-        start = it.startZoned.toInstant(),
-        end = it.endZoned.toInstant(),
+        start = it.start.toInstant(),
+        end = it.end.toInstant(),
     )
 }
 

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

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

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

@@ -0,0 +1,48 @@
+package io.github.wulkanowy.data.pojos
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.scrapper.Scrapper
+
+data class RegisterUser(
+    val email: String,
+    val password: String?,
+    val login: String, // may be the same as email
+    val scrapperBaseUrl: String?,
+    val loginType: Scrapper.LoginType?,
+    val loginMode: Sdk.Mode,
+    val symbols: List<RegisterSymbol>,
+) : java.io.Serializable
+
+data class RegisterSymbol(
+    val symbol: String,
+    val error: Throwable?,
+    val hebeBaseUrl: String?,
+    val keyId: String?,
+    val privatePem: String?,
+    val userName: String,
+    val schools: List<RegisterUnit>,
+) : java.io.Serializable
+
+data class RegisterUnit(
+    val userLoginId: Int,
+    val schoolId: String,
+    val schoolName: String,
+    val schoolShortName: String,
+    val parentIds: List<Int>,
+    val studentIds: List<Int>,
+    val employeeIds: List<Int>,
+    val error: Throwable?,
+    val students: List<RegisterStudent>,
+) : java.io.Serializable
+
+data class RegisterStudent(
+    val studentId: Int,
+    val studentName: String,
+    val studentSecondName: String,
+    val studentSurname: String,
+    val className: String,
+    val classId: Int,
+    val isParent: Boolean,
+    val semesters: List<Semester>,
+) : java.io.Serializable

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

@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.repositories
 import io.github.wulkanowy.data.api.AdminMessageService
 import io.github.wulkanowy.data.db.dao.AdminMessageDao
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.networkBoundResource
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -19,6 +19,7 @@ class AdminMessageRepository @Inject constructor(
 
     suspend fun getAdminMessages(student: Student) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it == null },
         query = { adminMessageDao.loadAll() },
         fetch = { adminMessageService.getAdminMessages() },
         shouldFetch = { true },

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

@@ -19,7 +19,6 @@ class AppCreatorRepository @Inject constructor(
 ) {
 
     @OptIn(ExperimentalSerializationApi::class)
-    @Suppress("BlockingMethodInNonBlockingContext")
     suspend fun getAppCreators() = withContext(dispatchers.io) {
         val inputStream = context.assets.open("contributors.json").buffered()
         json.decodeFromStream<List<Contributor>>(inputStream)

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

@@ -1,15 +1,19 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.AttendanceDao
+import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Absent
 import io.github.wulkanowy.utils.*
+import kotlinx.coroutines.Dispatchers
 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
@@ -19,6 +23,7 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceRepository @Inject constructor(
     private val attendanceDb: AttendanceDao,
+    private val timetableDb: TimetableDao,
     private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
@@ -36,6 +41,7 @@ class AttendanceRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, semester, start, end)
@@ -46,10 +52,15 @@ 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)
-                .getAttendance(start.monday, end.sunday, semester.semesterId)
-                .mapToEntities(semester)
+                .getAttendance(start.monday, end.sunday)
+                .mapToEntities(semester, lessons)
         },
         saveFetchResult = { old, new ->
             attendanceDb.deleteAll(old uniqueSubtract new)

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

@@ -4,8 +4,12 @@ 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.*
+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
 import javax.inject.Singleton
@@ -28,6 +32,7 @@ class AttendanceSummaryRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, semester))
             it.isEmpty() || forceRefresh || isExpired

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

@@ -4,6 +4,7 @@ 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 kotlinx.coroutines.sync.Mutex
@@ -30,6 +31,7 @@ class CompletedLessonsRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, semester, start, end)

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

@@ -5,8 +5,12 @@ 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.*
+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
 import java.time.Instant
@@ -32,6 +36,7 @@ class ConferenceRepository @Inject constructor(
         startDate: Instant = Instant.EPOCH,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, semester))
             it.isEmpty() || forceRefresh || isExpired

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

@@ -5,6 +5,7 @@ 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 kotlinx.coroutines.flow.Flow
@@ -33,6 +34,7 @@ class ExamRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, semester, start, end)
@@ -50,7 +52,7 @@ class ExamRepository @Inject constructor(
         fetch = {
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
-                .getExams(start.startExamsDay, start.endExamsDay, semester.semesterId)
+                .getExams(start.startExamsDay, start.endExamsDay)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->

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

@@ -7,6 +7,7 @@ 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 kotlinx.coroutines.flow.Flow
@@ -36,6 +37,10 @@ class GradeRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = {
+            //When details is empty and summary is not, app will not use summary cache - edge case
+            it.first.isEmpty()
+        },
         shouldFetch = { (details, summaries) ->
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, semester))
             details.isEmpty() || summaries.isEmpty() || forceRefresh || isExpired

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

@@ -11,8 +11,12 @@ import io.github.wulkanowy.data.mappers.mapPartialToStatisticItems
 import io.github.wulkanowy.data.mappers.mapPointsToStatisticsItems
 import io.github.wulkanowy.data.mappers.mapSemesterToStatisticItems
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.*
+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 java.util.*
 import javax.inject.Inject
@@ -42,6 +46,7 @@ class GradeStatisticsRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = partialMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(partialCacheKey, semester)
@@ -63,20 +68,16 @@ class GradeStatisticsRepository @Inject constructor(
         mapResult = { items ->
             when (subjectName) {
                 "Wszystkie" -> {
-                    val numerator = items.map {
-                        it.classAverage.replace(",", ".").toDoubleOrNull() ?: .0
-                    }.filterNot { it == .0 }
-                    (items.reversed() + GradePartialStatistics(
+                    val summaryItem = GradePartialStatistics(
                         studentId = semester.studentId,
                         semesterId = semester.semesterId,
                         subject = subjectName,
-                        classAverage = if (numerator.isEmpty()) "" else numerator.average().let {
-                            "%.2f".format(Locale.FRANCE, it)
-                        },
-                        studentAverage = "",
+                        classAverage = items.map { it.classAverage }.getSummaryAverage(),
+                        studentAverage = items.map { it.studentAverage }.getSummaryAverage(),
                         classAmounts = items.map { it.classAmounts }.sumGradeAmounts(),
                         studentAmounts = items.map { it.studentAmounts }.sumGradeAmounts()
-                    )).reversed()
+                    )
+                    listOf(summaryItem) + items
                 }
                 else -> items.filter { it.subject == subjectName }
             }.mapPartialToStatisticItems()
@@ -90,6 +91,7 @@ class GradeStatisticsRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = semesterMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(semesterCacheKey, semester)
@@ -112,29 +114,29 @@ class GradeStatisticsRepository @Inject constructor(
             val itemsWithAverage = items.map { item ->
                 item.copy().apply {
                     val denominator = item.amounts.sum()
-                    average = if (denominator == 0) "" else {
+                    classAverage = if (denominator == 0) "" else {
                         (item.amounts.mapIndexed { gradeValue, amount ->
                             (gradeValue + 1) * amount
-                        }.sum().toDouble() / denominator).let {
-                            "%.2f".format(Locale.FRANCE, it)
-                        }
+                        }.sum().toDouble() / denominator).asAverageString()
                     }
                 }
             }
             when (subjectName) {
-                "Wszystkie" -> (itemsWithAverage.reversed() + GradeSemesterStatistics(
-                    studentId = semester.studentId,
-                    semesterId = semester.semesterId,
-                    subject = subjectName,
-                    amounts = itemsWithAverage.map { it.amounts }.sumGradeAmounts(),
-                    studentGrade = 0
-                ).apply {
-                    average = itemsWithAverage.mapNotNull {
-                        it.average.replace(",", ".").toDoubleOrNull()
-                    }.average().let {
-                        "%.2f".format(Locale.FRANCE, it)
+                "Wszystkie" -> {
+                    val summaryItem = GradeSemesterStatistics(
+                        studentId = semester.studentId,
+                        semesterId = semester.semesterId,
+                        subject = subjectName,
+                        amounts = itemsWithAverage.map { it.amounts }.sumGradeAmounts(),
+                        studentGrade = 0,
+                    ).apply {
+                        classAverage = itemsWithAverage.map { it.classAverage }.getSummaryAverage()
+                        studentAverage = items
+                            .mapNotNull { summary -> summary.studentGrade.takeIf { it != 0 } }
+                            .average().asAverageString()
                     }
-                }).reversed()
+                    listOf(summaryItem) + itemsWithAverage
+                }
                 else -> itemsWithAverage.filter { it.subject == subjectName }
             }.mapSemesterToStatisticItems()
         }
@@ -147,6 +149,7 @@ class GradeStatisticsRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = pointsMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(pointsCacheKey, semester))
             it.isEmpty() || forceRefresh || isExpired
@@ -171,6 +174,19 @@ class GradeStatisticsRepository @Inject constructor(
         }
     )
 
+    private fun List<String>.getSummaryAverage(): String {
+        val averages = mapNotNull {
+            it.replace(",", ".").toDoubleOrNull()
+        }
+
+        return averages.average()
+            .asAverageString()
+            .takeIf { averages.isNotEmpty() }
+            .orEmpty()
+    }
+
+    private fun Double.asAverageString(): String = "%.2f".format(Locale.FRANCE, this)
+
     private fun List<List<Int>>.sumGradeAmounts(): List<Int> {
         val result = mutableListOf(0, 0, 0, 0, 0, 0)
         forEach {

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

@@ -5,6 +5,7 @@ import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.sync.Mutex
@@ -32,6 +33,7 @@ class HomeworkRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 key = getRefreshKey(cacheKey, semester, start, end)

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

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

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

@@ -3,35 +3,32 @@ package io.github.wulkanowy.data.repositories
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.SharedPrefProvider
+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.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.enums.MessageFolder.TRASHED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.pojos.MessageDraft
+import io.github.wulkanowy.domain.messages.GetMailboxByStudentUseCase
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
-import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import timber.log.Timber
-import java.time.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -44,98 +41,96 @@ class MessageRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
     private val sharedPrefProvider: SharedPrefProvider,
     private val json: Json,
+    private val mailboxDao: MailboxDao,
+    private val getMailboxByStudentUseCase: GetMailboxByStudentUseCase,
 ) {
 
     private val saveFetchResultMutex = Mutex()
 
-    private val cacheKey = "message"
+    private val messagesCacheKey = "message"
+    private val mailboxCacheKey = "mailboxes"
 
-    @Suppress("UNUSED_PARAMETER")
     fun getMessages(
         student: Student,
-        semester: Semester,
+        mailbox: Mailbox?,
         folder: MessageFolder,
         forceRefresh: Boolean,
         notify: Boolean = false,
     ): Flow<Resource<List<Message>>> = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
-                key = getRefreshKey(cacheKey, student, folder)
+                key = getRefreshKey(messagesCacheKey, mailbox, folder)
             )
             it.isEmpty() || forceRefresh || isExpired
         },
-        query = { messagesDb.loadAll(student.id.toInt(), folder.id) },
+        query = {
+            if (mailbox == null) {
+                messagesDb.loadAll(folder.id, student.email)
+            } else messagesDb.loadAll(mailbox.globalKey, folder.id)
+        },
         fetch = {
-            sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now())
-                .mapToEntities(student)
+            sdk.init(student).getMessages(
+                folder = Folder.valueOf(folder.name),
+                mailboxKey = mailbox?.globalKey,
+            ).mapToEntities(student, mailbox, mailboxDao.loadAll(student.email))
         },
         saveFetchResult = { old, new ->
             messagesDb.deleteAll(old uniqueSubtract new)
             messagesDb.insertAll((new uniqueSubtract old).onEach {
                 it.isNotified = !notify
             })
-            messagesDb.updateAll(getMessagesWithReadByChange(old, new, !notify))
 
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student, folder))
+            refreshHelper.updateLastRefreshTimestamp(
+                getRefreshKey(messagesCacheKey, mailbox, folder)
+            )
         }
     )
 
-    private fun getMessagesWithReadByChange(
-        old: List<Message>,
-        new: List<Message>,
-        setNotified: Boolean
-    ): List<Message> {
-        val oldMeta = old.map { Triple(it, it.readBy, it.unreadBy) }
-        val newMeta = new.map { Triple(it, it.readBy, it.unreadBy) }
-
-        val updatedItems = newMeta uniqueSubtract oldMeta
-
-        return updatedItems.map {
-            val oldItem = old.find { item -> item.messageId == it.first.messageId }
-            it.first.apply {
-                id = oldItem?.id ?: 0
-                isNotified = oldItem?.isNotified ?: setNotified
-                content = oldItem?.content.orEmpty()
-            }
-        }
-    }
-
     fun getMessage(
         student: Student,
         message: Message,
         markAsRead: Boolean = false,
     ): Flow<Resource<MessageWithAttachment?>> = networkBoundResource(
+        isResultEmpty = { it?.message?.content.isNullOrBlank() },
         shouldFetch = {
-            checkNotNull(it, { "This message no longer exist!" })
-            Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
-            it.message.unread || it.message.content.isEmpty()
+            checkNotNull(it) { "This message no longer exist!" }
+            Timber.d("Message content in db empty: ${it.message.content.isBlank()}")
+            it.message.unread || it.message.content.isBlank()
+        },
+        query = {
+            messagesDb.loadMessageWithAttachment(message.messageGlobalKey)
         },
-        query = { messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId) },
         fetch = {
             sdk.init(student).getMessageDetails(
-                messageId = it!!.message.messageId,
-                folderId = message.folderId,
-                read = markAsRead,
-                id = message.realId
-            ).let { details ->
-                details.content to details.attachments.mapToEntities()
-            }
+                messageKey = it!!.message.messageGlobalKey,
+                markAsRead = message.unread && markAsRead,
+            )
         },
-        saveFetchResult = { old, (downloadedMessage, attachments) ->
-            checkNotNull(old, { "Fetched message no longer exist!" })
-            messagesDb.updateAll(listOf(old.message.apply {
-                id = old.message.id
-                unread = !markAsRead
-                content = content.ifBlank { downloadedMessage }
-            }))
-            messageAttachmentDao.insertAttachments(attachments)
+        saveFetchResult = { old, new ->
+            checkNotNull(old) { "Fetched message no longer exist!" }
+            messagesDb.updateAll(
+                listOf(old.message.apply {
+                    id = message.id
+                    unread = !markAsRead
+                    sender = new.sender
+                    recipients = new.recipients.singleOrNull() ?: "Wielu adresatów"
+                    content = content.ifBlank { new.content }
+                })
+            )
+            messageAttachmentDao.insertAttachments(
+                items = new.attachments.mapToEntities(message.messageGlobalKey),
+            )
+
             Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
         }
     )
 
-    fun getMessagesFromDatabase(student: Student): Flow<List<Message>> {
-        return messagesDb.loadAll(student.id.toInt(), RECEIVED.id)
+    fun getMessagesFromDatabase(student: Student, mailbox: Mailbox?): Flow<List<Message>> {
+        return if (mailbox == null) {
+            messagesDb.loadAll(RECEIVED.id, student.email)
+        } else messagesDb.loadAll(mailbox.globalKey, RECEIVED.id)
     }
 
     suspend fun updateMessages(messages: List<Message>) {
@@ -147,31 +142,88 @@ class MessageRepository @Inject constructor(
         subject: String,
         content: String,
         recipients: List<Recipient>,
-    ): SentMessage = sdk.init(student).sendMessage(
-        subject = subject,
-        content = content,
-        recipients = recipients.mapFromEntities()
-    )
+        mailboxId: String,
+    ) {
+        sdk.init(student).sendMessage(
+            subject = subject,
+            content = content,
+            recipients = recipients.mapFromEntities(),
+            mailboxId = mailboxId,
+        )
+    }
 
-    suspend fun deleteMessage(student: Student, message: Message) {
-        val isDeleted = sdk.init(student).deleteMessages(
-            messages = listOf(message.messageId), message.folderId
+    suspend fun deleteMessages(student: Student, mailbox: Mailbox?, messages: List<Message>) {
+        val firstMessage = messages.first()
+        sdk.init(student).deleteMessages(
+            messages = messages.map { it.messageGlobalKey },
+            removeForever = firstMessage.folderId == TRASHED.id,
         )
 
-        if (message.folderId != MessageFolder.TRASHED.id && isDeleted) {
-            val deletedMessage = message.copy(folderId = MessageFolder.TRASHED.id).apply {
-                id = message.id
-                content = message.content
+        if (firstMessage.folderId != TRASHED.id) {
+            val deletedMessages = messages.map {
+                it.copy(folderId = TRASHED.id)
+                    .apply {
+                        id = it.id
+                        content = it.content
+                        sender = it.sender
+                        recipients = it.recipients
+                    }
             }
-            messagesDb.updateAll(listOf(deletedMessage))
-        } else messagesDb.deleteAll(listOf(message))
+
+            messagesDb.updateAll(deletedMessages)
+        } else messagesDb.deleteAll(messages)
+
+        getMessages(
+            student = student,
+            mailbox = mailbox,
+            folder = TRASHED,
+            forceRefresh = true,
+        ).first()
+    }
+
+    suspend fun deleteMessage(student: Student, mailbox: Mailbox?, message: Message) {
+        deleteMessages(student, mailbox, listOf(message))
+    }
+
+    suspend fun getMailboxes(student: Student, forceRefresh: Boolean) = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
+        shouldFetch = {
+            val isExpired = refreshHelper.shouldBeRefreshed(
+                key = getRefreshKey(mailboxCacheKey, student),
+            )
+            it.isEmpty() || isExpired || forceRefresh
+        },
+        query = { mailboxDao.loadAll(student.email, student.symbol, student.schoolSymbol) },
+        fetch = {
+            sdk.init(student).getMailboxes().mapToEntities(student)
+        },
+        saveFetchResult = { old, new ->
+            mailboxDao.deleteAll(old uniqueSubtract new)
+            mailboxDao.insertAll(new uniqueSubtract old)
+
+            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(mailboxCacheKey, student))
+        }
+    )
+
+    suspend fun getMailboxByStudent(student: Student): Mailbox? {
+        val mailbox = getMailboxByStudentUseCase(student)
+
+        return if (mailbox == null) {
+            getMailboxes(student, forceRefresh = true)
+                .onResourceError { throw it }
+                .onResourceSuccess { Timber.i("Found ${it.size} new mailboxes") }
+                .waitForResult()
+
+            getMailboxByStudentUseCase(student)
+        } else mailbox
     }
 
     var draftMessage: MessageDraft?
-        get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_send_draft))
+        get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_draft))
             ?.let { json.decodeFromString(it) }
         set(value) = sharedPrefProvider.putString(
-            context.getString(R.string.pref_key_message_send_draft),
+            context.getString(R.string.pref_key_message_draft),
             value?.let { json.encodeToString(it) }
         )
 }

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

@@ -6,9 +6,13 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.mappers.mapToMobileDeviceToken
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.*
+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
 import javax.inject.Singleton
@@ -30,16 +34,17 @@ class MobileDeviceRepository @Inject constructor(
         forceRefresh: Boolean,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
             it.isEmpty() || forceRefresh || isExpired
         },
-        query = { mobileDb.loadAll(student.userLoginId.takeIf { it != 0 } ?: student.studentId) },
+        query = { mobileDb.loadAll(student.userLoginId) },
         fetch = {
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getRegisteredDevices()
-                .mapToEntities(semester)
+                .mapToEntities(student)
         },
         saveFetchResult = { old, new ->
             mobileDb.deleteAll(old uniqueSubtract new)

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

@@ -5,6 +5,7 @@ import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
@@ -30,6 +31,7 @@ class NoteRepository @Inject constructor(
         notify: Boolean = false,
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
                 getRefreshKey(cacheKey, semester)
@@ -40,7 +42,7 @@ class NoteRepository @Inject constructor(
         fetch = {
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
-                .getNotes(semester.semesterId)
+                .getNotes()
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->

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

@@ -2,25 +2,27 @@ package io.github.wulkanowy.data.repositories
 
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.annotation.StringRes
 import androidx.core.content.edit
 import com.fredporciuncula.flow.preferences.FlowSharedPreferences
 import com.fredporciuncula.flow.preferences.Preference
+import com.fredporciuncula.flow.preferences.Serializer
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.enums.*
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
-import kotlinx.coroutines.ExperimentalCoroutinesApi
+import io.github.wulkanowy.ui.modules.settings.appearance.menuorder.AppMenuItem
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.Instant
+import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @Singleton
 class PreferencesRepository @Inject constructor(
     @ApplicationContext val context: Context,
@@ -29,29 +31,35 @@ class PreferencesRepository @Inject constructor(
     private val json: Json,
 ) {
 
-    val startMenuIndex: Int
-        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
-
     val isShowPresent: Boolean
         get() = getBoolean(
             R.string.pref_key_attendance_present,
             R.bool.pref_default_attendance_present
         )
 
-    val gradeAverageMode: GradeAverageMode
-        get() = GradeAverageMode.getByValue(
-            getString(
-                R.string.pref_key_grade_average_mode,
-                R.string.pref_default_grade_average_mode
-            )
+    private val gradeAverageModePref: Preference<GradeAverageMode>
+        get() = getObjectFlow(
+            R.string.pref_key_grade_average_mode,
+            R.string.pref_default_grade_average_mode,
+            object : Serializer<GradeAverageMode> {
+                override fun serialize(value: GradeAverageMode) = value.value
+                override fun deserialize(serialized: String) =
+                    GradeAverageMode.getByValue(serialized)
+            },
         )
 
-    val gradeAverageForceCalc: Boolean
-        get() = getBoolean(
-            R.string.pref_key_grade_average_force_calc,
-            R.bool.pref_default_grade_average_force_calc
+    val gradeAverageModeFlow: Flow<GradeAverageMode>
+        get() = gradeAverageModePref.asFlow()
+
+    private val gradeAverageForceCalcPref: Preference<Boolean>
+        get() = flowSharedPref.getBoolean(
+            context.getString(R.string.pref_key_grade_average_force_calc),
+            context.resources.getBoolean(R.bool.pref_default_grade_average_force_calc)
         )
 
+    val gradeAverageForceCalcFlow: Flow<Boolean>
+        get() = gradeAverageForceCalcPref.asFlow()
+
     val gradeExpandMode: GradeExpandMode
         get() = GradeExpandMode.getByValue(
             getString(
@@ -141,12 +149,24 @@ class PreferencesRepository @Inject constructor(
             R.string.pref_default_grade_modifier_plus
         ).toDouble()
 
+    val gradePlusModifierFlow: Flow<Double>
+        get() = getStringFlow(
+            R.string.pref_key_grade_modifier_plus,
+            R.string.pref_default_grade_modifier_plus
+        ).asFlow().map { it.toDouble() }
+
     val gradeMinusModifier: Double
         get() = getString(
             R.string.pref_key_grade_modifier_minus,
             R.string.pref_default_grade_modifier_minus
         ).toDouble()
 
+    val gradeMinusModifierFlow: Flow<Double>
+        get() = getStringFlow(
+            R.string.pref_key_grade_modifier_minus,
+            R.string.pref_default_grade_modifier_minus
+        ).asFlow().map { it.toDouble() }
+
     val fillMessageContent: Boolean
         get() = getBoolean(
             R.string.pref_key_fill_message_content,
@@ -181,24 +201,17 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_timetable_show_timers
         )
 
-    var isHomeworkFullscreen: Boolean
-        get() = getBoolean(
-            R.string.pref_key_homework_fullscreen,
-            R.bool.pref_default_homework_fullscreen
-        )
-        set(value) = sharedPref.edit().putBoolean("homework_fullscreen", value).apply()
-
     val showSubjectsWithoutGrades: Boolean
         get() = getBoolean(
             R.string.pref_key_subjects_without_grades,
             R.bool.pref_default_subjects_without_grades
         )
 
-    val isOptionalArithmeticAverage: Boolean
-        get() = getBoolean(
-            R.string.pref_key_optional_arithmetic_average,
-            R.bool.pref_default_optional_arithmetic_average
-        )
+    val isOptionalArithmeticAverageFlow: Flow<Boolean>
+        get() = flowSharedPref.getBoolean(
+            context.getString(R.string.pref_key_optional_arithmetic_average),
+            context.resources.getBoolean(R.bool.pref_default_optional_arithmetic_average)
+        ).asFlow()
 
     var lasSyncDate: Instant?
         get() = getLong(R.string.pref_key_last_sync_date, R.string.pref_default_last_sync_date)
@@ -222,19 +235,31 @@ class PreferencesRepository @Inject constructor(
         get() = selectedDashboardTilesPreference.asFlow()
             .map { set ->
                 set.map { DashboardItem.Tile.valueOf(it) }
-                    .plus(DashboardItem.Tile.ACCOUNT)
-                    .plus(DashboardItem.Tile.ADMIN_MESSAGE)
+                    .plus(
+                        listOfNotNull(
+                            DashboardItem.Tile.ACCOUNT,
+                            DashboardItem.Tile.ADMIN_MESSAGE,
+                            DashboardItem.Tile.ADS.takeIf { isAdsEnabled }
+                        )
+                    )
                     .toSet()
             }
 
     var selectedDashboardTiles: Set<DashboardItem.Tile>
         get() = selectedDashboardTilesPreference.get()
             .map { DashboardItem.Tile.valueOf(it) }
-            .plus(DashboardItem.Tile.ACCOUNT)
-            .plus(DashboardItem.Tile.ADMIN_MESSAGE)
+            .plus(
+                listOfNotNull(
+                    DashboardItem.Tile.ACCOUNT,
+                    DashboardItem.Tile.ADMIN_MESSAGE,
+                    DashboardItem.Tile.ADS.takeIf { isAdsEnabled }
+                )
+            )
             .toSet()
         set(value) {
-            val filteredValue = value.filterNot { it == DashboardItem.Tile.ACCOUNT }
+            val filteredValue = value.filterNot {
+                it == DashboardItem.Tile.ACCOUNT || it == DashboardItem.Tile.ADMIN_MESSAGE
+            }
                 .map { it.name }
                 .toSet()
 
@@ -271,13 +296,83 @@ class PreferencesRepository @Inject constructor(
 
     var isAppReviewDone: Boolean
         get() = sharedPref.getBoolean(PREF_KEY_IN_APP_REVIEW_DONE, false)
-        set(value) = sharedPref.edit().putBoolean(PREF_KEY_IN_APP_REVIEW_DONE, value).apply()
+        set(value) = sharedPref.edit { putBoolean(PREF_KEY_IN_APP_REVIEW_DONE, value) }
+
+    var isAppSupportShown: Boolean
+        get() = sharedPref.getBoolean(PREF_KEY_APP_SUPPORT_SHOWN, false)
+        set(value) = sharedPref.edit { putBoolean(PREF_KEY_APP_SUPPORT_SHOWN, value) }
+
+    var isAgreeToProcessData: Boolean
+        get() = getBoolean(
+            R.string.pref_key_ads_consent_data_processing,
+            R.bool.pref_default_ads_consent_data_processing
+        )
+        set(value) = sharedPref.edit {
+            putBoolean(context.getString(R.string.pref_key_ads_consent_data_processing), value)
+        }
+
+    var isPersonalizedAdsEnabled: Boolean
+        get() = sharedPref.getBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, false)
+        set(value) = sharedPref.edit { putBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, value) }
+
+    val isAdsEnabledFlow = flowSharedPref.getBoolean(
+        context.getString(R.string.pref_key_ads_enabled),
+        context.resources.getBoolean(R.bool.pref_default_ads_enabled)
+    ).asFlow()
+
+    var isAdsEnabled: Boolean
+        get() = getBoolean(
+            R.string.pref_key_ads_enabled,
+            R.bool.pref_default_ads_enabled
+        )
+        set(value) = sharedPref.edit {
+            putBoolean(context.getString(R.string.pref_key_ads_enabled), value)
+        }
+
+    var appMenuItemOrder: List<AppMenuItem>
+        get() {
+            val value = sharedPref.getString(PREF_KEY_APP_MENU_ITEM_ORDER, null)
+                ?: return AppMenuItem.defaultAppMenuItemList
+
+            return json.decodeFromString(value)
+        }
+        set(value) = sharedPref.edit {
+            putString(
+                PREF_KEY_APP_MENU_ITEM_ORDER,
+                json.encodeToString(value)
+            )
+        }
+
+    var installationId: String
+        get() = sharedPref.getString(PREF_KEY_INSTALLATION_ID, null).orEmpty()
+        private set(value) = sharedPref.edit { putString(PREF_KEY_INSTALLATION_ID, value) }
+
+    init {
+        if (installationId.isEmpty()) {
+            installationId = UUID.randomUUID().toString()
+        }
+    }
 
     private fun getLong(id: Int, default: Int) = getLong(context.getString(id), default)
 
     private fun getLong(id: String, default: Int) =
         sharedPref.getLong(id, context.resources.getString(default).toLong())
 
+    private fun getStringFlow(id: Int, default: Int) =
+        flowSharedPref.getString(context.getString(id), context.getString(default))
+
+    private fun <T : Any> getObjectFlow(
+        @StringRes id: Int,
+        @StringRes default: Int,
+        serializer: Serializer<T>
+    ): Preference<T> = flowSharedPref.getObject(
+        key = context.getString(id),
+        serializer = serializer,
+        defaultValue = serializer.deserialize(
+            flowSharedPref.getString(context.getString(default)).get()
+        )
+    )
+
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
     private fun getString(id: String, default: Int) =
@@ -288,19 +383,15 @@ class PreferencesRepository @Inject constructor(
     private fun getBoolean(id: String, default: Int) =
         sharedPref.getBoolean(id, context.resources.getBoolean(default))
 
-    private fun getBoolean(id: Int, default: Boolean) =
-        sharedPref.getBoolean(context.getString(id), default)
-
     private companion object {
-
+        private const val PREF_KEY_APP_MENU_ITEM_ORDER = "app_menu_item_order"
+        private const val PREF_KEY_INSTALLATION_ID = "installation_id"
         private const val PREF_KEY_DASHBOARD_ITEMS_POSITION = "dashboard_items_position"
-
         private const val PREF_KEY_IN_APP_REVIEW_COUNT = "in_app_review_count"
-
         private const val PREF_KEY_IN_APP_REVIEW_DATE = "in_app_review_date"
-
         private const val PREF_KEY_IN_APP_REVIEW_DONE = "in_app_review_done"
-
+        private const val PREF_KEY_APP_SUPPORT_SHOWN = "app_support_shown"
+        private const val PREF_KEY_PERSONALIZED_ADS_ENABLED = "personalized_ads_enabled"
         private const val PREF_KEY_ADMIN_DISMISSED_MESSAGE_IDS = "admin_message_dismissed_ids"
     }
 }

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

@@ -1,10 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
@@ -23,9 +20,10 @@ class RecipientRepository @Inject constructor(
 
     private val cacheKey = "recipient"
 
-    suspend fun refreshRecipients(student: Student, unit: ReportingUnit, role: Int) {
-        val new = sdk.init(student).getRecipients(unit.unitId, role).mapToEntities(unit.studentId)
-        val old = recipientDb.loadAll(unit.studentId, unit.unitId, role)
+    suspend fun refreshRecipients(student: Student, mailbox: Mailbox, type: MailboxType) {
+        val new = sdk.init(student).getRecipients(mailbox.globalKey)
+            .mapToEntities(mailbox.globalKey)
+        val old = recipientDb.loadAll(type, mailbox.globalKey)
 
         recipientDb.deleteAll(old uniqueSubtract new)
         recipientDb.insertAll(new uniqueSubtract old)
@@ -33,18 +31,33 @@ class RecipientRepository @Inject constructor(
         refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
     }
 
-    suspend fun getRecipients(student: Student, unit: ReportingUnit, role: Int): List<Recipient> {
-        val cached = recipientDb.loadAll(unit.studentId, unit.unitId, role)
+    suspend fun getRecipients(
+        student: Student,
+        mailbox: Mailbox?,
+        type: MailboxType,
+    ): List<Recipient> {
+        mailbox ?: return emptyList()
+
+        val cached = recipientDb.loadAll(type, mailbox.globalKey)
 
         val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
         return if (cached.isEmpty() || isExpired) {
-            refreshRecipients(student, unit, role)
-            recipientDb.loadAll(unit.studentId, unit.unitId, role)
+            refreshRecipients(student, mailbox, type)
+            recipientDb.loadAll(type, mailbox.globalKey)
         } else cached
     }
 
-    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
-        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
-            .mapToEntities(student.studentId)
+    suspend fun getMessageSender(
+        student: Student,
+        mailbox: Mailbox?,
+        message: Message,
+    ): List<Recipient> {
+        mailbox ?: return emptyList()
+
+        return sdk.init(student)
+            .getMessageReplayDetails(message.messageGlobalKey)
+            .sender
+            .let(::listOf)
+            .mapToEntities(mailbox.globalKey)
     }
 }