.github/FUNDING.yml

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

.github/workflows/deploy-store.yml

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

.github/workflows/deploy-test.yml

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

.github/workflows/test.yml

@@ -2,28 +2,24 @@ name: Tests
 
 on:
   push:
-    branches:
+    branches: [ master, develop ]
-      - master
-      - develop
-      - 'hotfix/**'
     tags: [ '*' ]
   pull_request:
+    branches: [ master, develop ]
 
 jobs:
-
+  unit-tests:
-  tests-fdroid:
+      name: Unit tests
-      name: F-Droid
       runs-on: ubuntu-latest
       timeout-minutes: 10
       steps:
         - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v2
         - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v3
+        - uses: actions/setup-java@v1
           with:
-            distribution: 'zulu'
+            java-version: 11
-            java-version: 17
+        - uses: actions/cache@v2
-        - uses: actions/cache@v3
           with:
             path: |
               ~/.gradle/caches
@@ -33,58 +29,6 @@ jobs:
           run: |
             ./gradlew testFdroidDebugUnitTest --stacktrace
             ./gradlew jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v3
+        - uses: codecov/codecov-action@v1
-          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@v3
-          with:
-            distribution: 'zulu'
-            java-version: 17
-        - 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@v3
-          with:
-            distribution: 'zulu'
-            java-version: 17
-        - 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

@@ -65,12 +65,6 @@ captures/
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
 .idea/discord.xml
-.idea/migrations.xml
-.idea/androidTestResultsUserPreferences.xml
-.idea/copilot
-.idea/deploymentTargetDropDown.xml
-.idea/deploymentTargetSelector.xml
-.idea/kotlinc.xml
 
 # Keystore files
 *.jks
@@ -125,4 +119,3 @@ 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 2023 Wulkanowy
+   Copyright 2022 Wulkanowy
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.cs.md

@@ -1,13 +1,18 @@
-Česká verze / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
+[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)
 
 # Wulkanowy
 
-[![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)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/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
 
@@ -34,7 +39,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
-* volitelné reklamy na podporu projektu
+* žádné reklamy
 
 ## Stáhnout
 
@@ -52,7 +57,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 pomocí
+## Postaveno s
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)

README.de.md

@@ -1,13 +1,14 @@
-[Česká verze](README.cs.md) / Deutsche Version / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
+[Polska wersja README](README.md)
+
+[English version of README](README.en.md)
 
 # Wulkanowy
 
-[![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)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/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
 
@@ -21,7 +22,7 @@ Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre
     * Prozentsatz der Anwesenheit
     * Prüfungen
     * Stundenplan
-    * abgeschlossene Unterrichtsstunden
+    * Unterricht abgeschlossen
     * Nachrichten
     * Hausaufgaben
     * Anmerkungen
@@ -34,7 +35,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
-* optionale Werbungen, die es uns ermöglichen das Projekt zu unterstützen
+* keine Werbung
 
 ## Herunterladen
 
@@ -50,7 +51,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 eine [Entwicklungsversion herunterladen](https://wulkanowy.github.io/#download) die beinhaltet neue Funktionen, die für die nächste Version vorbereitet werden
+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
 
 ## Gebaut mit
 

README.en.md

@@ -1,13 +1,18 @@
-[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / English version / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
+[Polska wersja README](README.md)
+
+[Deutsche Version von README](README.de.md)
+
+[Česká verze README](README.cs.md)
+
+[Slovenská verzia README](README.sk.md)
 
 # Wulkanowy
 
-[![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)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/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
 
@@ -34,7 +39,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
-* optional ads which allow to support the project
+* no ads
 
 ## Download
 

README.md

@@ -1,13 +1,18 @@
-[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / Polska wersja / [Slovenská verzia](README.sk.md)
+[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)
 
 # Wulkanowy
 
-[![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)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/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
 
@@ -34,7 +39,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
-* opcjonalne reklamy umożliwiające wsparcie projektu
+* brak reklam
 
 ## Pobierz
 

README.sk.md

@@ -1,13 +1,18 @@
-[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / Slovenská verzia
+[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)
 
 # Wulkanowy
 
-[![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)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/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
 
@@ -34,7 +39,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
-* voliteľné reklamy na podporu projektu
+* žiadne reklamy
 
 ## Stiahnuť
 
@@ -52,7 +57,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 pomocou
+## Postavené s
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)

app/build.gradle

@@ -1,11 +1,8 @@
-import com.github.triplet.gradle.androidpublisher.ReleaseStatus
-import ru.cian.huawei.publish.ReleaseNote
-
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'com.google.devtools.ksp'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
@@ -13,32 +10,38 @@ apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'com.huawei.agconnect'
-apply plugin: 'kotlin-kapt'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    namespace 'io.github.wulkanowy'
+    compileSdkVersion 31
-    compileSdk 34
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 31
-        versionCode 155
+        versionCode 108
-        versionName "2.5.6"
+        versionName "1.6.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
+
         manifestPlaceholders = [
-            firebase_enabled: project.hasProperty("enableFirebase"),
+                firebase_enabled: project.hasProperty("enableFirebase"),
-            admob_project_id: ""
+                admob_project_id: ""
         ]
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments += [
+                        "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())
@@ -68,7 +71,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
-            buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
         debug {
             minifyEnabled false
@@ -78,11 +80,10 @@ android {
             versionNameSuffix "-dev"
             ext.enableCrashlytics = project.hasProperty("enableFirebase")
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
-            buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
     }
 
-    flavorDimensions += "platform"
+    flavorDimensions "platform"
 
     productFlavors {
         hms {
@@ -93,12 +94,10 @@ android {
         play {
             dimension "platform"
             manifestPlaceholders = [
-                install_channel : "Google Play",
+                    install_channel : "Google Play",
-                admob_project_id: System.getenv("ADMOB_PROJECT_ID") ?: "ca-app-pub-3940256099942544~3347511713"
+                    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 {
@@ -113,7 +112,6 @@ android {
 
     buildFeatures {
         viewBinding true
-        buildConfig true
     }
 
     bundle {
@@ -122,30 +120,24 @@ android {
         }
     }
 
-    testOptions {
+    testOptions.unitTests {
-        unitTests.includeAndroidResources = true
+        includeAndroidResources = true
-        // workaround HMS test errors https://github.com/robolectric/robolectric/issues/2750
-        unitTests.all { jvmArgs '-noverify' }
     }
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "11"
         freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
-        resources {
+        exclude 'META-INF/library_release.kotlin_module'
-            excludes += ['META-INF/library_release.kotlin_module',
+        exclude 'META-INF/library-core_release.kotlin_module'
-                         'META-INF/library-core_release.kotlin_module',
-                         'META-INF/LICENSE.md',
-                         'META-INF/LICENSE-notice.md']
-        }
     }
 
     aboutLibraries {
@@ -156,15 +148,12 @@ android {
 kapt {
     correctErrorTypes true
 }
-ksp {
-    arg("room.schemaLocation", "$projectDir/schemas".toString())
-}
 
 play {
     defaultToAppBundles = false
     track = 'production'
-    releaseStatus = ReleaseStatus.IN_PROGRESS
+    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.99d
+    userFraction = 0.50d
     updatePriority = 3
     enabled.set(false)
 }
@@ -174,60 +163,54 @@ huaweiPublish {
         hmsRelease {
             credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
             buildFormat = "aab"
-            deployType = "publish"
+            deployType = "draft"
-            releaseNotes = [
-                new ReleaseNote(
-                    "pl-PL",
-                    "$projectDir/src/main/play/release-notes/pl-PL/default.txt"
-                )
-            ]
         }
     }
 }
 
 ext {
-    work_manager = "2.9.0"
+    work_manager = "2.7.1"
-    android_hilt = "1.2.0"
+    android_hilt = "1.0.0"
-    room = "2.6.1"
+    room = "2.4.2"
-    chucker = "4.0.0"
+    chucker = "3.5.2"
-    mockk = "1.13.10"
+    mockk = "1.12.4"
-    coroutines = "1.8.0"
+    coroutines = "1.6.1"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.5.6'
+    implementation "io.github.wulkanowy:sdk:1.6.4"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation "androidx.core:core-ktx:1.7.0"
-    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
-    implementation "androidx.activity:activity-ktx:1.8.2"
+    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation "androidx.appcompat:appcompat:1.4.1"
-    implementation "androidx.fragment:fragment-ktx:1.6.2"
+    implementation "androidx.fragment:fragment-ktx:1.4.1"
-    implementation "androidx.annotation:annotation:1.7.1"
+    implementation "androidx.annotation:annotation:1.3.0"
 
-    implementation "androidx.preference:preference-ktx:1.2.1"
+    implementation "androidx.preference:preference-ktx:1.2.0"
-    implementation "androidx.recyclerview:recyclerview:1.3.2"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
+    implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "com.google.android.material:material:1.10.0"
+    implementation "com.google.android.material:material:1.5.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation 'com.github.lopspower:CircularImageView:4.3.0'
+    implementation 'com.github.lopspower:CircularImageView:4.2.0'
 
-    implementation "androidx.work:work-runtime:$work_manager"
+    implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
-    ksp "androidx.room:room-compiler:$room"
+    kapt "androidx.room:room-compiler:$room"
 
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
@@ -238,38 +221,32 @@ 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:1.0.0"
+    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.9.3"
-    implementation "com.squareup.okhttp3:okhttp-urlconnection:4.12.0"
 
     implementation "com.jakewharton.timber:timber:5.0.1"
-    implementation 'com.github.Faierbel:slf4j-timber:2.0'
+    implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation 'com.github.bastienpaulfr:Treessence:1.1.2'
+    implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation 'io.coil-kt:coil:2.6.0'
+    implementation "io.coil-kt:coil:2.0.0"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
+    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
-    implementation 'com.fredporciuncula:flow-preferences:1.9.1'
+    implementation 'com.fredporciuncula:flow-preferences:1.7.0'
-    implementation 'org.apache.commons:commons-text:1.11.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.7.3')
+    playImplementation platform('com.google.firebase:firebase-bom:30.0.1')
-    playImplementation 'com.google.firebase:firebase-analytics'
+    playImplementation 'com.google.firebase:firebase-analytics-ktx'
-    playImplementation 'com.google.firebase:firebase-messaging'
+    playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
-    playImplementation 'com.google.firebase:firebase-config'
+    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.6.0'
 
-    playImplementation 'com.google.android.gms:play-services-ads:22.6.0'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.5.0.300'
-    playImplementation "com.google.android.play:integrity:1.3.0"
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.6.200'
-    playImplementation 'com.google.android.play:app-update-ktx:2.1.0'
-    playImplementation 'com.google.android.play:review-ktx:2.0.1'
-    playImplementation "com.google.android.ump:user-messaging-platform:2.1.0"
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.12.0.301'
+    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.303'
 
-    releaseImplementation "com.github.chuckerteam.chucker:library-no-op:$chucker"
+    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
-
-    debugImplementation "com.github.chuckerteam.chucker:library:$chucker"
     debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.6'
     debugImplementation 'com.github.haroldadmin:WhatTheStack:1.0.0-alpha04'
 
@@ -278,17 +255,17 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.11.1'
+    testImplementation 'org.robolectric:robolectric:4.8.1'
-    testImplementation "androidx.test:runner:1.5.2"
+    testImplementation "androidx.test:runner:1.4.0"
-    testImplementation "androidx.test.ext:junit:1.1.5"
+    testImplementation "androidx.test.ext:junit:1.1.3"
-    testImplementation "androidx.test:core:1.5.0"
+    testImplementation "androidx.test:core:1.4.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.5.0"
+    androidTestImplementation "androidx.test:core:1.4.0"
-    androidTestImplementation "androidx.test:runner:1.5.2"
+    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }

app/jacoco.gradle

@@ -1,16 +1,16 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.11"
+    toolVersion "0.8.7"
     reportsDirectory.set(file("$buildDir/reports"))
 }
 
-tasks.withType(Test).configureEach {
+tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']
 }
 
-tasks.register('jacocoTestReport', JacocoReport) {
+task jacocoTestReport(type: JacocoReport) {
 
     group = "Reporting"
     description = "Generate Jacoco coverage reports"
@@ -33,19 +33,19 @@ tasks.register('jacocoTestReport', JacocoReport) {
                     '**/*_Factory.*']
 
     classDirectories.setFrom(fileTree(
-        dir: "$buildDir/intermediates/classes/debug",
+            dir: "$buildDir/intermediates/classes/debug",
-        excludes: excludes
+            excludes: excludes
     ) + fileTree(
-        dir: "$buildDir/tmp/kotlin-classes/fdroidDebug",
+            dir: "$buildDir/tmp/kotlin-classes/fdroidDebug",
-        excludes: excludes
+            excludes: excludes
     ))
 
     sourceDirectories.setFrom(files([
-        "src/main/java",
+            "src/main/java",
-        "src/fdroid/java"
+            "src/fdroid/java"
     ]))
     executionData.setFrom(fileTree(
-        dir: project.projectDir,
+            dir: project.projectDir,
-        includes: ["**/*.exec", "**/*.ec"]
+            includes: ["**/*.exec", "**/*.ec"]
     ))
 }

app/proguard-rules.pro

@@ -1,6 +1,5 @@
 # General
 -dontobfuscate
--ignorewarnings
 
 
 #Config for wulkanowy
@@ -25,18 +24,3 @@
 
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
-
-
-#Config for HMS SDK
--keepattributes *Annotation*
--keepattributes Exceptions
--keepattributes InnerClasses
--keepattributes Signature
--keep class com.huawei.agconnect.**{*;}
--keep class com.huawei.hianalytics.**{*;}
--keep class com.huawei.updatesdk.**{*;}
--keep class com.huawei.hms.**{*;}
-
-
-#Config for Wulkanowy SDK
--keep,allowobfuscation,allowshrinking class retrofit2.Response

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

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

app/src/debug/agconnect-services.json

@@ -1,92 +1,33 @@
 {
-  "agcgw": {
+	"agcgw":{
-    "backurl": "connect-dre.hispace.hicloud.com",
+		"backurl":"connect-dre.dbankcloud.cn",
-    "url": "connect-dre.dbankcloud.cn",
+		"url":"connect-dre.hispace.hicloud.com"
-    "websocketbackurl": "connect-ws-dre.hispace.dbankcloud.com",
+	},
-    "websocketurl": "connect-ws-dre.hispace.dbankcloud.cn"
+	"client":{
-  },
+		"cp_id":"890048000024105546",
-  "agcgw_all": {
+		"product_id":"",
-    "CN": "connect-drcn.dbankcloud.cn",
+		"client_id":"",
-    "CN_back": "connect-drcn.hispace.hicloud.com",
+		"client_secret":"",
-    "DE": "connect-dre.dbankcloud.cn",
+		"app_id":"101440411",
-    "DE_back": "connect-dre.hispace.hicloud.com",
+		"package_name":"io.github.wulkanowy.dev",
-    "RU": "connect-drru.hispace.dbankcloud.ru",
+		"api_key":""
-    "RU_back": "connect-drru.hispace.dbankcloud.cn",
+	},
-    "SG": "connect-dra.dbankcloud.cn",
+	"service":{
-    "SG_back": "connect-dra.hispace.hicloud.com"
+		"analytics":{
-  },
+			"collector_url":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-  "websocketgw_all": {
+			"resource_id":"p1",
-    "CN": "connect-ws-drcn.hispace.dbankcloud.cn",
+			"channel_id":""
-    "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": {
+		"cloudstorage":{
-      "storage_url_sg_back": "https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url":"https://ops-dre.agcstorage.link"
-      "storage_url_ru_back": "https://agc-storage-drru.cloud.huawei.ru",
+		},
-      "storage_url_ru": "https://agc-storage-drru.cloud.huawei.ru",
+		"ml":{
-      "storage_url_de_back": "https://agc-storage-dre.cloud.huawei.eu",
+			"mlservice_url":"ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
-      "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",
+	"region":"DE",
-      "storage_url_cn_back": "https://agc-storage-drcn.cloud.huawei.com.cn",
+	"configuration_version":"1.0"
-      "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,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorIcon" />
+    <background android:drawable="@color/colorPrimary" />
     <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground_dev_mono" />
 </adaptive-icon>

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

@@ -0,0 +1,5 @@
+<?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

@@ -1,31 +0,0 @@
-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 kotlinx.coroutines.flow.MutableStateFlow
-import javax.inject.Inject
-
-@Suppress("unused")
-class AdsHelper @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val preferencesRepository: PreferencesRepository
-) {
-
-    val isMobileAdsSdkInitialized = MutableStateFlow(false)
-    val canShowAd = false
-
-    fun initialize() {
-        preferencesRepository.isAdsEnabled = false
-        preferencesRepository.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,7 +8,15 @@ import javax.inject.Singleton
 @Suppress("UNUSED_PARAMETER")
 class AnalyticsHelper @Inject constructor() {
 
-    fun logEvent(name: String, vararg params: Pair<String, Any?>) = Unit
+    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
-    fun setCurrentScreen(activity: Activity, name: String?) = Unit
+        // do nothing
-    fun popCurrentScreen(name: String?) = Unit
+    }
+
+    fun setCurrentScreen(activity: Activity, name: String?) {
+        // do nothing
+    }
+
+    fun popCurrentScreen(name: String?) {
+        // do nothing
+    }
 }

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

@@ -1,13 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.view.View
-import javax.inject.Inject
-
-class InAppUpdateHelper @Inject constructor() {
-
-    lateinit var messageContainer: View
-
-    fun checkAndInstallUpdates() {}
-
-    fun onResume() {}
-}

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

@@ -1,11 +0,0 @@
-package io.github.wulkanowy.utils
-
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class IntegrityHelper @Inject constructor() {
-
-    @Suppress("UNUSED_PARAMETER")
-    fun getIntegrityToken(requestId: String): String? = null
-}

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

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

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

@@ -0,0 +1,17 @@
+package io.github.wulkanowy.utils
+
+import android.app.Activity
+import android.view.View
+import javax.inject.Inject
+
+@Suppress("UNUSED_PARAMETER")
+class UpdateHelper @Inject constructor() {
+
+    lateinit var messageContainer: View
+
+    fun checkAndInstallUpdates(activity: Activity) {}
+
+    fun onActivityResult(requestCode: Int, resultCode: Int) {}
+
+    fun onResume(activity: Activity) {}
+}

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

@@ -1,30 +0,0 @@
-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 kotlinx.coroutines.flow.MutableStateFlow
-import javax.inject.Inject
-
-@Suppress("unused")
-class AdsHelper @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val preferencesRepository: PreferencesRepository
-) {
-    val isMobileAdsSdkInitialized = MutableStateFlow(false)
-    val canShowAd = false
-
-    fun initialize() {
-        preferencesRepository.isAdsEnabled = false
-        preferencesRepository.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,38 +3,26 @@ 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 { (key, value) ->
+            params.forEach {
-                if (value == null) return@forEach
+                if (it.second == null) return@forEach
-                when (value) {
+                when (it.second) {
-                    is String -> putString(key, value)
+                    is String, is String? -> putString(it.first, it.second as String)
-                    is Int -> putInt(key, value)
+                    is Int, is Int? -> putInt(it.first, it.second as Int)
-                    is Boolean -> putBoolean(key, value)
+                    is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
                 }
             }
             analytics.onEvent(name, this)

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

@@ -2,8 +2,7 @@ package io.github.wulkanowy.utils
 
 import android.util.Log
 import com.huawei.agconnect.crash.AGConnectCrash
-import fr.bipi.treessence.base.FormatterPriorityTree
+import fr.bipi.tressence.base.FormatterPriorityTree
-import fr.bipi.treessence.common.StackTraceRecorder
 
 class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
 
@@ -23,10 +22,16 @@ 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/InAppUpdateHelper.kt

@@ -1,13 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.view.View
-import javax.inject.Inject
-
-class InAppUpdateHelper @Inject constructor() {
-
-    lateinit var messageContainer: View
-
-    fun checkAndInstallUpdates() {}
-
-    fun onResume() {}
-}

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

@@ -1,11 +0,0 @@
-package io.github.wulkanowy.utils
-
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class IntegrityHelper @Inject constructor() {
-
-    @Suppress("UNUSED_PARAMETER")
-    fun getIntegrityToken(requestId: String): String? = null
-}

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

@@ -1,7 +0,0 @@
-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/UpdateHelper.kt

@@ -0,0 +1,17 @@
+package io.github.wulkanowy.utils
+
+import android.app.Activity
+import android.view.View
+import javax.inject.Inject
+
+@Suppress("UNUSED_PARAMETER")
+class UpdateHelper @Inject constructor() {
+
+    lateinit var messageContainer: View
+
+    fun checkAndInstallUpdates(activity: Activity) {}
+
+    fun onActivityResult(requestCode: Int, resultCode: Int) {}
+
+    fun onResume(activity: Activity) {}
+}

app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?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" />
@@ -8,8 +9,7 @@
     <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,15 +37,13 @@
     <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"
-        android:resizeableActivity="true"
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
-        tools:ignore="DataExtractionRules,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:exported="true"
@@ -73,7 +71,7 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:theme="@style/WulkanowyTheme.MessageSend"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"

app/src/main/assets/contributors.json

@@ -50,13 +50,5 @@
   {
     "displayName": "Tomasz F.",
     "githubUsername": "Pengwius"
-  },
-  {
-    "displayName": "Antoni Paduch",
-    "githubUsername": "janAte1"
-  },
-  {
-    "displayName": "Kamil Wąsik",
-    "githubUsername": "JestemKamil"
   }
 ]

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

@@ -1,29 +1,24 @@
 package io.github.wulkanowy
 
 import android.app.Application
-import android.util.Log.DEBUG
+import android.util.Log.*
-import android.util.Log.INFO
-import android.util.Log.VERBOSE
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.yariksoffice.lingver.Lingver
 import dagger.hilt.android.HiltAndroidApp
-import fr.bipi.treessence.file.FileLoggerTree
+import fr.bipi.tressence.file.FileLoggerTree
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.base.ThemeManager
-import io.github.wulkanowy.utils.ActivityLifecycleLogger
+import io.github.wulkanowy.utils.*
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.CrashLogExceptionTree
-import io.github.wulkanowy.utils.CrashLogTree
-import io.github.wulkanowy.utils.DebugLogTree
-import io.github.wulkanowy.utils.RemoteConfigHelper
 import timber.log.Timber
 import javax.inject.Inject
 
 @HiltAndroidApp
 class WulkanowyApp : Application(), Configuration.Provider {
 
+    @Inject
+    lateinit var workerFactory: HiltWorkerFactory
+
     @Inject
     lateinit var themeManager: ThemeManager
 
@@ -36,23 +31,10 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
-    @Inject
-    lateinit var remoteConfigHelper: RemoteConfigHelper
-
-    @Inject
-    lateinit var workerFactory: HiltWorkerFactory
-
-    override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder()
-            .setWorkerFactory(workerFactory)
-            .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
-            .build()
-
     override fun onCreate() {
         super.onCreate()
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
-        remoteConfigHelper.initialize()
         initLogging()
     }
 
@@ -84,4 +66,9 @@ class WulkanowyApp : Application(), Configuration.Provider {
             analyticsHelper.logEvent("language", "startup" to preferencesRepository.appLanguage)
         }
     }
+
+    override fun getWorkManagerConfiguration() = Configuration.Builder()
+        .setWorkerFactory(workerFactory)
+        .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
+        .build()
 }

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

@@ -14,17 +14,20 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import io.github.wulkanowy.data.api.AdminMessageService
-import io.github.wulkanowy.data.api.SchoolsService
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AppInfo
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.create
+import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
 
@@ -32,6 +35,18 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 internal class DataModule {
 
+    @Singleton
+    @Provides
+    fun provideSdk(chuckerInterceptor: ChuckerInterceptor) =
+        Sdk().apply {
+            androidVersion = android.os.Build.VERSION.RELEASE
+            buildTag = android.os.Build.MODEL
+            setSimpleHttpLogger { Timber.d(it) }
+
+            // for debug only
+            addInterceptor(chuckerInterceptor, network = true)
+        }
+
     @Singleton
     @Provides
     fun provideChuckerCollector(
@@ -65,31 +80,22 @@ internal class DataModule {
             .readTimeout(30, TimeUnit.SECONDS)
             .build()
 
+    @OptIn(ExperimentalSerializationApi::class)
     @Singleton
     @Provides
-    fun provideAdminMessageService(
+    fun provideRetrofit(
         okHttpClient: OkHttpClient,
         json: Json,
         appInfo: AppInfo
-    ): AdminMessageService = Retrofit.Builder()
+    ): Retrofit = Retrofit.Builder()
         .baseUrl(appInfo.messagesBaseUrl)
         .client(okHttpClient)
         .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
         .build()
-        .create()
 
     @Singleton
     @Provides
-    fun provideSchoolsService(
+    fun provideAdminMessageService(retrofit: Retrofit): AdminMessageService = retrofit.create()
-        okHttpClient: OkHttpClient,
-        json: Json,
-        appInfo: AppInfo,
-    ): SchoolsService = Retrofit.Builder()
-        .baseUrl(appInfo.schoolsBaseUrl)
-        .client(okHttpClient)
-        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
-        .build()
-        .create()
 
     @Singleton
     @Provides
@@ -104,6 +110,7 @@ internal class DataModule {
     fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences =
         PreferenceManager.getDefaultSharedPreferences(context)
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     @Singleton
     @Provides
     fun provideFlowSharedPref(sharedPreferences: SharedPreferences) =
@@ -190,7 +197,7 @@ internal class DataModule {
 
     @Singleton
     @Provides
-    fun provideMailboxesDao(database: AppDatabase) = database.mailboxDao
+    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
 
     @Singleton
     @Provides
@@ -235,12 +242,4 @@ internal class DataModule {
     @Singleton
     @Provides
     fun provideAdminMessageDao(database: AppDatabase) = database.adminMessagesDao
-
-    @Singleton
-    @Provides
-    fun provideMutesDao(database: AppDatabase) = database.mutedMessageSendersDao
-
-    @Singleton
-    @Provides
-    fun provideGradeDescriptiveDao(database: AppDatabase) = database.gradeDescriptiveDao
 }

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

@@ -1,16 +1,6 @@
 package io.github.wulkanowy.data
 
-import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
@@ -30,15 +20,8 @@ val <T> Resource<T>.dataOrNull: T?
     get() = when (this) {
         is Resource.Success -> this.data
         is Resource.Intermediate -> this.data
-        else -> null
+        is Resource.Loading -> null
-    }
+        is Resource.Error -> null
-
-val <T> Resource<T>.dataOrThrow: T
-    get() = when (this) {
-        is Resource.Success -> this.data
-        is Resource.Intermediate -> this.data
-        is Resource.Loading -> throw IllegalStateException("Resource is in loading state")
-        is Resource.Error -> throw this.error
     }
 
 val <T> Resource<T>.errorOrNull: Throwable?
@@ -66,8 +49,8 @@ fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
 
 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.Intermediate -> "intermediate data received" + if (showData) " (data: `${it.data}`)" else ""
         is Resource.Success -> "success" + if (showData) " (data: `${it.data}`)" else ""
         is Resource.Error -> "exception occurred: ${it.error}"
     }
@@ -148,7 +131,7 @@ inline fun <ResultType, RequestType> networkBoundResource(
             query().map { Resource.Success(filterResult(it)) }
         } catch (throwable: Throwable) {
             onFetchFailed(throwable)
-            flowOf(Resource.Error(throwable))
+            query().map { Resource.Error(throwable) }
         }
     } else {
         query().map { Resource.Success(filterResult(it)) }
@@ -165,7 +148,7 @@ inline fun <ResultType, RequestType, T> networkBoundResource(
     crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
     crossinline onFetchFailed: (Throwable) -> Unit = { },
     crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    crossinline mapResult: (ResultType) -> T,
+    crossinline mapResult: (ResultType) -> T
 ) = flow {
     emit(Resource.Loading())
 
@@ -182,7 +165,7 @@ inline fun <ResultType, RequestType, T> networkBoundResource(
             query().map { Resource.Success(mapResult(it)) }
         } catch (throwable: Throwable) {
             onFetchFailed(throwable)
-            flowOf(Resource.Error(throwable))
+            query().map { Resource.Error(throwable) }
         }
     } else {
         query().map { Resource.Success(mapResult(it)) }

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

@@ -1,125 +0,0 @@
-package io.github.wulkanowy.data
-
-import com.chuckerteam.chucker.api.ChuckerInterceptor
-import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentIsEduOne
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.RemoteConfigHelper
-import io.github.wulkanowy.utils.WebkitCookieManagerProxy
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class WulkanowySdkFactory @Inject constructor(
-    private val chuckerInterceptor: ChuckerInterceptor,
-    private val remoteConfig: RemoteConfigHelper,
-    private val webkitCookieManagerProxy: WebkitCookieManagerProxy,
-    private val studentDb: StudentDao,
-) {
-
-    private val eduOneMutex = Mutex()
-    private val migrationFailedStudentIds = mutableSetOf<Long>()
-
-    private val sdk = Sdk().apply {
-        androidVersion = android.os.Build.VERSION.RELEASE
-        buildTag = android.os.Build.MODEL
-        userAgentTemplate = remoteConfig.userAgentTemplate
-        setSimpleHttpLogger { Timber.d(it) }
-        setAdditionalCookieManager(webkitCookieManagerProxy)
-
-        // for debug only
-        addInterceptor(chuckerInterceptor, network = true)
-    }
-
-    fun create() = sdk
-
-    suspend fun create(student: Student, semester: Semester? = null): Sdk {
-        val overrideIsEduOne = checkEduOneAndMigrateIfNecessary(student)
-        return buildSdk(student, semester, overrideIsEduOne)
-    }
-
-    private fun buildSdk(student: Student, semester: Semester?, isStudentEduOne: Boolean): Sdk {
-        return create().apply {
-            email = student.email
-            password = student.password
-            symbol = student.symbol
-            schoolSymbol = student.schoolSymbol
-            studentId = student.studentId
-            classId = student.classId
-            emptyCookieJarInterceptor = true
-            isEduOne = isStudentEduOne
-
-            if (Sdk.Mode.valueOf(student.loginMode) == Sdk.Mode.HEBE) {
-                mobileBaseUrl = student.mobileBaseUrl
-            } else {
-                scrapperBaseUrl = student.scrapperBaseUrl
-                domainSuffix = student.scrapperDomainSuffix
-                loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
-            }
-
-            mode = Sdk.Mode.valueOf(student.loginMode)
-            mobileBaseUrl = student.mobileBaseUrl
-            keyId = student.certificateKey
-            privatePem = student.privateKey
-
-            if (semester != null) {
-                diaryId = semester.diaryId
-                kindergartenDiaryId = semester.kindergartenDiaryId
-                schoolYear = semester.schoolYear
-                unitId = semester.unitId
-            }
-        }
-    }
-
-    private suspend fun checkEduOneAndMigrateIfNecessary(student: Student): Boolean {
-        if (student.isEduOne != null) return student.isEduOne
-
-        if (student.id in migrationFailedStudentIds) {
-            Timber.i("Migration eduOne: skipping because of previous failure")
-            return false
-        }
-
-        eduOneMutex.withLock {
-            if (student.id in migrationFailedStudentIds) {
-                Timber.i("Migration eduOne: skipping because of previous failure")
-                return false
-            }
-
-            val studentFromDatabase = studentDb.loadById(student.id)
-            if (studentFromDatabase?.isEduOne != null) {
-                Timber.i("Migration eduOne: already done")
-                return studentFromDatabase.isEduOne
-            }
-
-            Timber.i("Migration eduOne: flag missing. Running migration...")
-            val initializedSdk = buildSdk(
-                student = student,
-                semester = null,
-                isStudentEduOne = false, // doesn't matter
-            )
-            val newCurrentStudent = runCatching { initializedSdk.getCurrentStudent() }
-                .onFailure { Timber.e(it, "Migration eduOne: can't get current student") }
-                .getOrNull()
-
-            if (newCurrentStudent == null) {
-                Timber.i("Migration eduOne: failed, so skipping")
-                migrationFailedStudentIds.add(student.id)
-                return false
-            }
-
-            Timber.i("Migration eduOne: success. New isEduOne flag: ${newCurrentStudent.isEduOne}")
-
-            val studentIsEduOne = StudentIsEduOne(
-                id = student.id,
-                isEduOne = newCurrentStudent.isEduOne
-            )
-            studentDb.update(studentIsEduOne)
-            return newCurrentStudent.isEduOne
-        }
-    }
-}

app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt

@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.api
-
-import io.github.wulkanowy.data.pojos.IntegrityRequest
-import io.github.wulkanowy.data.pojos.LoginEvent
-import retrofit2.http.Body
-import retrofit2.http.POST
-import javax.inject.Singleton
-
-@Singleton
-interface SchoolsService {
-
-    @POST("/log/loginEvent")
-    suspend fun logLoginEvent(@Body request: IntegrityRequest<LoginEvent>)
-}

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

@@ -1,129 +1,11 @@
 package io.github.wulkanowy.data.db
 
 import android.content.Context
-import androidx.room.AutoMigration
+import androidx.room.*
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
-import androidx.room.TypeConverters
+import io.github.wulkanowy.data.db.dao.*
-import io.github.wulkanowy.data.db.dao.AdminMessageDao
+import io.github.wulkanowy.data.db.entities.*
-import io.github.wulkanowy.data.db.dao.AttendanceDao
+import io.github.wulkanowy.data.db.migrations.*
-import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
-import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
-import io.github.wulkanowy.data.db.dao.ConferenceDao
-import io.github.wulkanowy.data.db.dao.ExamDao
-import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradeDescriptiveDao
-import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.dao.HomeworkDao
-import io.github.wulkanowy.data.db.dao.LuckyNumberDao
-import io.github.wulkanowy.data.db.dao.MailboxDao
-import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
-import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.dao.MobileDeviceDao
-import io.github.wulkanowy.data.db.dao.MutedMessageSendersDao
-import io.github.wulkanowy.data.db.dao.NoteDao
-import io.github.wulkanowy.data.db.dao.NotificationDao
-import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
-import io.github.wulkanowy.data.db.dao.SchoolDao
-import io.github.wulkanowy.data.db.dao.SemesterDao
-import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.data.db.dao.StudentInfoDao
-import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.dao.TeacherDao
-import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
-import io.github.wulkanowy.data.db.dao.TimetableDao
-import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
-import io.github.wulkanowy.data.db.entities.AdminMessage
-import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.db.entities.Conference
-import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeDescriptive
-import io.github.wulkanowy.data.db.entities.GradePartialStatistics
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Mailbox
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.MutedMessageSender
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Notification
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentInfo
-import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.data.db.entities.TimetableHeader
-import io.github.wulkanowy.data.db.migrations.Migration10
-import io.github.wulkanowy.data.db.migrations.Migration11
-import io.github.wulkanowy.data.db.migrations.Migration12
-import io.github.wulkanowy.data.db.migrations.Migration13
-import io.github.wulkanowy.data.db.migrations.Migration14
-import io.github.wulkanowy.data.db.migrations.Migration15
-import io.github.wulkanowy.data.db.migrations.Migration16
-import io.github.wulkanowy.data.db.migrations.Migration17
-import io.github.wulkanowy.data.db.migrations.Migration18
-import io.github.wulkanowy.data.db.migrations.Migration19
-import io.github.wulkanowy.data.db.migrations.Migration2
-import io.github.wulkanowy.data.db.migrations.Migration20
-import io.github.wulkanowy.data.db.migrations.Migration21
-import io.github.wulkanowy.data.db.migrations.Migration22
-import io.github.wulkanowy.data.db.migrations.Migration23
-import io.github.wulkanowy.data.db.migrations.Migration24
-import io.github.wulkanowy.data.db.migrations.Migration25
-import io.github.wulkanowy.data.db.migrations.Migration26
-import io.github.wulkanowy.data.db.migrations.Migration27
-import io.github.wulkanowy.data.db.migrations.Migration28
-import io.github.wulkanowy.data.db.migrations.Migration29
-import io.github.wulkanowy.data.db.migrations.Migration3
-import io.github.wulkanowy.data.db.migrations.Migration30
-import io.github.wulkanowy.data.db.migrations.Migration31
-import io.github.wulkanowy.data.db.migrations.Migration32
-import io.github.wulkanowy.data.db.migrations.Migration33
-import io.github.wulkanowy.data.db.migrations.Migration34
-import io.github.wulkanowy.data.db.migrations.Migration35
-import io.github.wulkanowy.data.db.migrations.Migration36
-import io.github.wulkanowy.data.db.migrations.Migration37
-import io.github.wulkanowy.data.db.migrations.Migration38
-import io.github.wulkanowy.data.db.migrations.Migration39
-import io.github.wulkanowy.data.db.migrations.Migration4
-import io.github.wulkanowy.data.db.migrations.Migration40
-import io.github.wulkanowy.data.db.migrations.Migration41
-import io.github.wulkanowy.data.db.migrations.Migration42
-import io.github.wulkanowy.data.db.migrations.Migration43
-import io.github.wulkanowy.data.db.migrations.Migration44
-import io.github.wulkanowy.data.db.migrations.Migration46
-import io.github.wulkanowy.data.db.migrations.Migration49
-import io.github.wulkanowy.data.db.migrations.Migration5
-import io.github.wulkanowy.data.db.migrations.Migration50
-import io.github.wulkanowy.data.db.migrations.Migration51
-import io.github.wulkanowy.data.db.migrations.Migration53
-import io.github.wulkanowy.data.db.migrations.Migration54
-import io.github.wulkanowy.data.db.migrations.Migration55
-import io.github.wulkanowy.data.db.migrations.Migration57
-import io.github.wulkanowy.data.db.migrations.Migration58
-import io.github.wulkanowy.data.db.migrations.Migration6
-import io.github.wulkanowy.data.db.migrations.Migration63
-import io.github.wulkanowy.data.db.migrations.Migration7
-import io.github.wulkanowy.data.db.migrations.Migration8
-import io.github.wulkanowy.data.db.migrations.Migration9
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Singleton
 
@@ -148,7 +30,7 @@ import javax.inject.Singleton
         Subject::class,
         LuckyNumber::class,
         CompletedLesson::class,
-        Mailbox::class,
+        ReportingUnit::class,
         Recipient::class,
         MobileDevice::class,
         Teacher::class,
@@ -159,24 +41,12 @@ import javax.inject.Singleton
         TimetableHeader::class,
         SchoolAnnouncement::class,
         Notification::class,
-        AdminMessage::class,
+        AdminMessage::class
-        MutedMessageSender::class,
-        GradeDescriptive::class,
     ],
     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),
-        AutoMigration(from = 55, to = 56),
-        AutoMigration(from = 56, to = 57, spec = Migration57::class),
-        AutoMigration(from = 57, to = 58, spec = Migration58::class),
-        AutoMigration(from = 58, to = 59),
-        AutoMigration(from = 59, to = 60),
-        AutoMigration(from = 60, to = 61),
-        AutoMigration(from = 61, to = 62),
-        AutoMigration(from = 62, to = 63, spec = Migration63::class),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -185,7 +55,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 63
+        const val VERSION_SCHEMA = 48
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -232,11 +102,6 @@ abstract class AppDatabase : RoomDatabase() {
             Migration43(),
             Migration44(),
             Migration46(),
-            Migration49(),
-            Migration50(),
-            Migration51(),
-            Migration53(),
-            Migration54(),
         )
 
         fun newInstance(
@@ -287,7 +152,7 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val completedLessonsDao: CompletedLessonsDao
 
-    abstract val mailboxDao: MailboxDao
+    abstract val reportingUnitDao: ReportingUnitDao
 
     abstract val recipientDao: RecipientDao
 
@@ -310,8 +175,4 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val notificationDao: NotificationDao
 
     abstract val adminMessagesDao: AdminMessageDao
-
-    abstract val mutedMessageSendersDao: MutedMessageSendersDao
-
-    abstract val gradeDescriptiveDao: GradeDescriptiveDao
 }

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

@@ -1,7 +1,6 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
-import io.github.wulkanowy.data.enums.MessageType
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.utils.toTimestamp
 import kotlinx.serialization.SerializationException
@@ -69,9 +68,4 @@ class Converters {
     @TypeConverter
     fun stringToDestination(destination: String): Destination = json.decodeFromString(destination)
 
-    @TypeConverter
-    fun messageTypesToString(types: List<MessageType>): String = json.encodeToString(types)
-
-    @TypeConverter
-    fun stringToMessageTypes(text: String): List<MessageType> = json.decodeFromString(text)
 }

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

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

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

@@ -2,13 +2,11 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Transaction
 import androidx.room.Update
 
 interface BaseDao<T> {
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
     suspend fun insertAll(items: List<T>): List<Long>
 
     @Update
@@ -16,10 +14,4 @@ interface BaseDao<T> {
 
     @Delete
     suspend fun deleteAll(items: List<T>)
-
-    @Transaction
-    suspend fun removeOldAndSaveNew(oldItems: List<T>, newItems: List<T>) {
-        deleteAll(oldItems)
-        insertAll(newItems)
-    }
 }

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

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

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

@@ -1,18 +0,0 @@
-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

@@ -5,26 +5,15 @@ import androidx.room.Query
 import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.data.db.entities.MessageWithMutedAuthor
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
-    @Transaction
-    @Query("SELECT * FROM Messages WHERE message_global_key = :messageGlobalKey")
-    fun loadMessageWithAttachment(messageGlobalKey: String): Flow<MessageWithAttachment?>
 
     @Transaction
-    @Query("SELECT * FROM Messages WHERE mailbox_key = :mailboxKey AND folder_id = :folder ORDER BY date DESC")
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
-    fun loadMessagesWithMutedAuthor(mailboxKey: String, folder: Int): Flow<List<MessageWithMutedAuthor>>
+    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Flow<MessageWithAttachment?>
 
-    @Transaction
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    @Query("SELECT * FROM Messages WHERE email = :email AND folder_id = :folder ORDER BY date DESC")
+    fun loadAll(studentId: Int, folder: Int): Flow<List<Message>>
-    fun loadMessagesWithMutedAuthor(folder: Int, email: String): Flow<List<MessageWithMutedAuthor>>
-
-    @Query("SELECT * FROM Messages WHERE mailbox_key = :mailboxKey AND folder_id = :folder ORDER BY date DESC")
-    fun loadAll(mailboxKey: String, folder: Int): Flow<List<Message>>
-
-    @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 user_login_id = :studentId ORDER BY date DESC")
+    @Query("SELECT * FROM MobileDevices WHERE student_id = :userLoginId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Flow<List<MobileDevice>>
+    fun loadAll(userLoginId: Int): Flow<List<MobileDevice>>
 }

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

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

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

@@ -2,7 +2,6 @@ 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
 
@@ -10,6 +9,6 @@ import javax.inject.Singleton
 @Dao
 interface RecipientDao : BaseDao<Recipient> {
 
-    @Query("SELECT * FROM Recipients WHERE type = :type AND studentMailboxGlobalKey = :studentMailboxGlobalKey")
+    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND unit_id = :unitId AND role = :role")
-    suspend fun loadAll(type: MailboxType, studentMailboxGlobalKey: String): List<Recipient>
+    suspend fun loadAll(studentId: Int, unitId: Int, role: Int): List<Recipient>
 }

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

@@ -0,0 +1,17 @@
+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 user_login_id = :studentId ORDER BY date DESC")
+    @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId ORDER BY date DESC")
     fun loadAll(studentId: Int): Flow<List<SchoolAnnouncement>>
 }

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

@@ -14,6 +14,6 @@ interface SemesterDao : BaseDao<Semester> {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertSemesters(items: List<Semester>): List<Long>
 
-    @Query("SELECT * FROM Semesters WHERE (student_id = :studentId AND class_id = :classId) OR (student_id = :studentId AND class_id = 0)")
+    @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
     suspend fun loadAll(studentId: Int, classId: Int): List<Semester>
 }

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

@@ -1,42 +1,25 @@
 package io.github.wulkanowy.data.db.dao
 
-import androidx.room.Dao
+import androidx.room.*
-import androidx.room.Delete
+import androidx.room.OnConflictStrategy.ABORT
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Update
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentIsAuthorized
-import io.github.wulkanowy.data.db.entities.StudentIsEduOne
-import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import javax.inject.Singleton
 
 @Singleton
 @Dao
 abstract class StudentDao {
 
-    @Insert(onConflict = OnConflictStrategy.ABORT)
+    @Insert(onConflict = ABORT)
     abstract suspend fun insertAll(student: List<Student>): List<Long>
 
     @Delete
     abstract suspend fun delete(student: Student)
 
-    @Update(entity = Student::class)
-    abstract suspend fun update(studentIsAuthorized: StudentIsAuthorized)
-
-    @Update(entity = Student::class)
-    abstract suspend fun update(studentIsEduOne: StudentIsEduOne)
-
     @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?
 
@@ -47,12 +30,12 @@ abstract class StudentDao {
     abstract suspend fun loadAll(): List<Student>
 
     @Transaction
-    @Query("SELECT * FROM Students JOIN Semesters ON (Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id) OR (Students.student_id = Semesters.student_id AND Semesters.class_id = 0)")
+    @Query("SELECT * FROM Students")
-    abstract suspend fun loadStudentsWithSemesters(): Map<Student, List<Semester>>
+    abstract suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
 
     @Transaction
-    @Query("SELECT * FROM Students JOIN Semesters ON (Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id) OR (Students.student_id = Semesters.student_id AND Semesters.class_id = 0) WHERE Students.id = :id")
+    @Query("SELECT * FROM Students WHERE id = :id")
-    abstract suspend fun loadStudentWithSemestersById(id: Long): Map<Student, List<Semester>>
+    abstract suspend fun loadStudentWithSemestersById(id: Long): StudentWithSemesters?
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
     abstract suspend fun updateCurrent(id: Long)
@@ -60,9 +43,6 @@ abstract class StudentDao {
     @Query("UPDATE Students SET is_current = 0")
     abstract suspend fun resetCurrent()
 
-    @Query("DELETE FROM Students WHERE email = :email AND user_name = :userName")
-    abstract suspend fun deleteByEmailAndUserName(email: String, userName: String)
-
     @Transaction
     open suspend fun switchCurrent(id: Long) {
         resetCurrent()

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

@@ -13,7 +13,4 @@ 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")
-    suspend fun load(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): List<Timetable>
 }

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

@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import io.github.wulkanowy.data.enums.MessageType
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -34,12 +33,8 @@ data class AdminMessage(
 
     val priority: String,
 
-    @ColumnInfo(name = "types", defaultValue = "[]")
+    val type: String,
-    val types: List<MessageType> = emptyList(),
 
-    @ColumnInfo(name = "is_ok_visible", defaultValue = "0")
+    @ColumnInfo(name = "is_dismissible")
-    val isOkVisible: Boolean = false,
+    val isDismissible: Boolean = false
-
-    @ColumnInfo(name = "is_x_visible", defaultValue = "0")
-    val isXVisible: Boolean = false
 )

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

@@ -22,7 +22,6 @@ 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/GradeDescriptive.kt

@@ -1,27 +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 = "GradesDescriptive")
-data class GradeDescriptive(
-
-    @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    val subject: String,
-
-    val description: String,
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-
-    @ColumnInfo(name = "is_notified")
-    var isNotified: Boolean = true
-}

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

@@ -1,32 +0,0 @@
-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,19 +9,23 @@ import java.time.Instant
 @Entity(tableName = "Messages")
 data class Message(
 
-    @ColumnInfo(name = "email")
+    @ColumnInfo(name = "student_id")
-    val email: String,
+    val studentId: Long,
 
-    @ColumnInfo(name = "message_global_key")
+    @ColumnInfo(name = "real_id")
-    val messageGlobalKey: String,
+    val realId: Int,
-
-    @ColumnInfo(name = "mailbox_key")
-    val mailboxKey: String,
 
     @ColumnInfo(name = "message_id")
     val messageId: Int,
 
-    val correspondents: String,
+    @ColumnInfo(name = "sender_name")
+    val sender: String,
+
+    @ColumnInfo(name = "sender_id")
+    val senderId: Int,
+
+    @ColumnInfo(name = "recipient_name")
+    val recipient: String,
 
     val subject: String,
 
@@ -32,11 +36,7 @@ data class Message(
 
     var unread: Boolean,
 
-    @ColumnInfo(name = "read_by")
+    val removed: Boolean,
-    val readBy: Int?,
-
-    @ColumnInfo(name = "unread_by")
-    val unreadBy: Int?,
 
     @ColumnInfo(name = "has_attachments")
     val hasAttachments: Boolean
@@ -48,7 +48,11 @@ 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,16 +2,21 @@ package io.github.wulkanowy.data.db.entities
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
+import androidx.room.PrimaryKey
 import java.io.Serializable
 
-@Entity(
+@Entity(tableName = "MessageAttachments")
-    tableName = "MessageAttachments",
-    primaryKeys = ["message_global_key", "url", "filename"],
-)
 data class MessageAttachment(
 
-    @ColumnInfo(name = "message_global_key")
+    @PrimaryKey
-    val messageGlobalKey: String,
+    @ColumnInfo(name = "real_id")
+    val realId: Int,
+
+    @ColumnInfo(name = "message_id")
+    val messageId: Int,
+
+    @ColumnInfo(name = "one_drive_id")
+    val oneDriveId: String,
 
     @ColumnInfo(name = "url")
     val url: String,

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

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

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

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

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

@@ -9,8 +9,8 @@ import java.time.Instant
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
 
-    @ColumnInfo(name = "user_login_id") // todo: change column name
+    @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    val userLoginId: Int,
 
     @ColumnInfo(name = "device_id")
     val deviceId: Int,

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

@@ -1,15 +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 = "MutedMessageSenders")
-data class MutedMessageSender(
-    @ColumnInfo(name = "author")
-    val author: String,
-) : Serializable {
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

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

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

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

@@ -0,0 +1,32 @@
+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,16 +9,14 @@ import java.time.LocalDate
 @Entity(tableName = "SchoolAnnouncements")
 data class SchoolAnnouncement(
 
-    @ColumnInfo(name = "user_login_id") // todo: change column name
+    @ColumnInfo(name = "student_id")
     val studentId: Int,
 
     val date: LocalDate,
 
     val subject: String,
 
-    val content: String,
+    val content: String
-
-    val author: String? = null,
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -19,9 +19,6 @@ data class Student(
     @ColumnInfo(name = "scrapper_base_url")
     val scrapperBaseUrl: String,
 
-    @ColumnInfo(name = "scrapper_domain_suffix", defaultValue = "")
-    val scrapperDomainSuffix: String,
-
     @ColumnInfo(name = "mobile_base_url")
     val mobileBaseUrl: String,
 
@@ -49,7 +46,6 @@ data class Student(
     @ColumnInfo(name = "student_id")
     val studentId: Int,
 
-    @Deprecated("not available in VULCAN anymore")
     @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 
@@ -79,13 +75,6 @@ data class Student(
 
     @ColumnInfo(name = "registration_date")
     val registrationDate: Instant,
-
-    @ColumnInfo(name = "is_authorized", defaultValue = "0")
-    val isAuthorized: Boolean,
-
-    @ColumnInfo(name = "is_edu_one", defaultValue = "NULL")
-    val isEduOne: Boolean?,
-
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
@@ -96,22 +85,3 @@ data class Student(
     @ColumnInfo(name = "avatar_color")
     var avatarColor = 0L
 }
-
-@Entity
-data class StudentIsAuthorized(
-
-    @PrimaryKey
-    var id: Long,
-
-    @ColumnInfo(name = "is_authorized", defaultValue = "NULL")
-    val isAuthorized: Boolean?,
-) : Serializable
-
-@Entity
-data class StudentIsEduOne(
-    @PrimaryKey
-    var id: Long,
-
-    @ColumnInfo(name = "is_edu_one", defaultValue = "NULL")
-    val isEduOne: Boolean?,
-) : Serializable

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

@@ -1,18 +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
-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/entities/StudentWithSemesters.kt

@@ -1,8 +1,13 @@
 package io.github.wulkanowy.data.db.entities
 
+import androidx.room.Embedded
+import androidx.room.Relation
 import java.io.Serializable
 
 data class StudentWithSemesters(
+    @Embedded
     val student: Student,
+
+    @Relation(parentColumn = "student_id", entityColumn = "student_id")
     val semesters: List<Semester>
 ) : Serializable

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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