merge: v2.6.13 (#8)

Reviewed-on: #8

.circleci/config.yml

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

.editorconfig

@@ -1,7 +1,7 @@
 [*]
 charset=utf-8
 end_of_line=lf
-insert_final_newline=true
+insert_final_newline=Advanced
 indent_style=space
 indent_size=4
 

.gitea/FUNDING.yml

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

.gitea/release.yml

@@ -0,0 +1,18 @@
+changelog:
+  exclude:
+    labels:
+      - "release ignore"
+  categories:
+    - title: breaking changes
+      labels:
+        - major
+    - title: new features
+      labels:
+        - minor
+        - fr:approved
+    - title: translation updates
+      labels:
+        - translation
+    - title: features
+      labels:
+        - "*"

.gitea/workflows/build_android.yml

@@ -0,0 +1,84 @@
+name: Generate APK
+
+env:
+    main_project_module: app
+
+on:
+    pull_request:
+        types:
+            - closed
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        env:
+            RUNNER_TOOL_CACHE: /toolcache
+
+        steps:
+            -   name: Checkout the repository
+                uses: actions/checkout@v3
+
+            -   name: Set current date as env variable
+                run: echo "date_today=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+            -   name: Set repository name as env variable
+                run: echo "repository_name=$(echo '${{ gitea.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+
+            -   name: Set up JDK
+                uses: actions/setup-java@v3
+                with:
+                    distribution: 'zulu'
+                    java-version: '17'
+                    cache: 'gradle'
+
+            -   name: Set up Go environment
+                uses: actions/setup-go@v3
+                with:
+                    go-version: '1.22'
+
+            -   name: Get hash of Gradle files
+                uses: https://gitea.com/actions/go-hashfiles@v0.0.1
+                id: get-hash
+                with: 
+                    patterns: |-
+                        **/*.gradle*
+
+            -   name: Cache Gradle
+                uses: actions/cache@v3
+                with:
+                    path: |
+                        ~/.gradle/caches
+                        ~/.gradle/wrapper
+                    key: gradle-${{ runner.os }}-${{ steps.get-hash.outputs.hash }}
+
+            -   name: Get app version
+                id: get_version
+                run: echo "VERSION_NAME=$(grep -m1 "versionName" app/build.gradle | awk '{print $2}' | tr -d \'\'\"\')" >> $GITHUB_ENV
+
+            -   name: Change wrapper permissions
+                run: chmod +x ./gradlew
+
+            -   name: Setup Android SDK
+                uses: android-actions/setup-android@v3
+
+            -   name: Build debug APK
+                run: ./gradlew assembleDebug
+
+            -   name: Upload artifacts
+                uses: actions/upload-artifact@v3 # not v4 because of GHES
+                with:
+                    name: wulkanowy_mod_debug_builds
+                    path: |
+                        app/build/outputs/**/*-debug.apk
+
+            -   name: Create release
+                uses: akkuman/gitea-release-action@v1
+                env:
+                    NODE_OPTIONS: '--experimental-fetch'
+                with:
+                    files: |
+                        app/build/outputs/**/*-debug.apk                        
+
+                    name: Release ${{ env.VERSION_NAME }} (${{ env.date_today }})
+                    tag_name: v${{ env.VERSION_NAME }}

.github/workflows/deploy-store.yml

@@ -1,79 +0,0 @@
-name: Deploy release
-
-on:
-  release:
-    types: [ created ]
-
-jobs:
-
-  deploy-google-play:
-    name: Google Play
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: google-play
-    steps:
-      - uses: actions/checkout@v3
-      - 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: Decrypt keys
-        env:
-          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg
-          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-      - name: Upload apk to google play
-        env:
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          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
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-gallery
-    steps:
-      - uses: actions/checkout@v3
-      - 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: Decrypt keys
-        env:
-          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg
-          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-      - name: Prepare credentials
-        env:
-          AGC_CREDENTIALS: ${{ secrets.AGC_CREDENTIALS }}
-        run: echo $AGC_CREDENTIALS > ./app/src/release/agconnect-credentials.json
-      - name: Build and publish HMS version
-        env:
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
-        run: ./gradlew bundleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace

.github/workflows/deploy-test.yml

@@ -1,146 +0,0 @@
-name: Deploy DEV
-
-on:
-  push:
-#    branches: [ develop ]
-    branches: [ '!*' ]
-  pull_request_target:
-#    branches: [ develop ]
-    branches: [ '!*' ]
-
-  workflow_dispatch:
-
-jobs:
-
-  deploy-appcenter:
-    name: App Center
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-center
-    steps:
-      - uses: actions/checkout@v3
-      - 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: Set run number with offset
-        env:
-          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
-        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
-      - name: Prepare build configuration
-        run: |
-          sed -i -e "s#applicationIdSuffix \".dev\"#applicationIdSuffix \".${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/build.gradle
-          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/google-services.json
-          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/agconnect-services.json
-          sed -i -e '/versionNameSuffix/d' app/build.gradle
-      - name: Add signing config
-        run: |
-          cat >> app/build.gradle <<EOF
-          android.signingConfigs.debug {
-              storeFile file("bitrise.jks")
-              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
-              keyAlias System.getenv("BITRISE_KEY_ALIAS")
-              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
-          }
-          EOF
-      - name: Decrypt keys
-        env:
-          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
-      - name: Bump version
-        uses: chkfung/android-version-actions@v1.1
-        with:
-          gradlePath: app/build.gradle
-          versionCode: ${{ env.RUN_NUMBER }}
-          versionName: ${{ env.RUN_NUMBER }}-${{ github.head_ref }}
-      - name: Build apk
-        env:
-          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
-          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
-          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-        run: ./gradlew assembleFdroidDebug --stacktrace
-      - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: wulkanowyDEV-${{ env.RUN_NUMBER }}.apk
-          path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
-      - name: Deploy to app center
-        uses: wzieba/AppCenter-Github-Action@v1
-        with:
-          appName: wulkanowy/wulkanowy
-          token: ${{ secrets.APP_CENTER_TOKEN }}
-          group: Testers
-          file: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
-          notifyTesters: true
-          debug: true
-
-  deploy-app-distribution:
-    name: App Distribution
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-distribution
-    if: github.event_name != 'pull_request_target'
-    steps:
-      - uses: actions/checkout@v3
-      - 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: Set run number with offset
-        env:
-          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
-        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
-      - name: Add signing config
-        run: |
-          cat >> app/build.gradle <<EOF
-          android.signingConfigs.debug {
-              storeFile file("bitrise.jks")
-              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
-              keyAlias System.getenv("BITRISE_KEY_ALIAS")
-              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
-          }
-          EOF
-      - name: Decrypt keys
-        env:
-          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
-          BITRISE_SERVICES_ENCRYPT_KEY: ${{ secrets.BITRISE_SERVICES_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$BITRISE_SERVICES_ENCRYPT_KEY ./app/src/debug/google-services.json.gpg
-          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
-      - name: Bump version
-        uses: chkfung/android-version-actions@v1.1
-        with:
-          gradlePath: app/build.gradle
-          versionCode: ${{ env.RUN_NUMBER }}
-          versionName: ${{ env.RUN_NUMBER }}
-      - name: Build apk
-        env:
-          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
-          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
-          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-        run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
-      - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: wulkanowyDEV-${{ env.RUN_NUMBER }}-dev.apk
-          path: app/build/outputs/apk/play/debug/app-play-debug.apk
-      - name: Deploy to app distribution
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{ secrets.FIREBASE_APP_ID }}
-          token: ${{ secrets.FIREBASE_TOKEN }}
-          groups: discord
-          file: app/build/outputs/apk/play/debug/app-play-debug.apk

.github/workflows/test.yml

@@ -1,90 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-      - 'hotfix/**'
-    tags: [ '*' ]
-  pull_request:
-
-jobs:
-
-  tests-fdroid:
-      name: F-Droid
-      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 testFdroidDebugUnitTest --stacktrace
-            ./gradlew jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v3
-          with:
-              flags: unit
-
-  tests-play:
-      name: Play
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      steps:
-        - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v3
-        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@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,6 +65,12 @@ captures/
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
 .idea/discord.xml
+.idea/migrations.xml
+.idea/androidTestResultsUserPreferences.xml
+.idea/copilot
+.idea/deploymentTargetDropDown.xml
+.idea/deploymentTargetSelector.xml
+.idea/kotlinc.xml
 
 # Keystore files
 *.jks
@@ -111,12 +117,14 @@ Thumbs.db
 *.ear
 
 ### AndroidStudio Patch ###
-
 !/gradle/wrapper/gradle-wrapper.jar
 .idea/jarRepositories.xml
 
+### Services config files
+agconnect-services.json
+agconnect-credentials.json
+google-services.json
+!app/google-services.json
 
-app/src/release/agconnect-services.json
-app/src/release/agconnect-credentials.json
-.idea/deploymentTargetDropDown.xml
-.idea/kotlinc.xml
+
+.idea/appInsightsSettings.xml

.travis.yml

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

README.cs.md

@@ -1,73 +1,33 @@
 Česká verze / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Funkce:
+* skrýt známky
+* Skrýt jednotlivé záznamy o docházce.
+* Skrýt komentáře.
+* falešná docházka %
 
-Neoficiální klient deníku VULCAN UONET+ pro žáka a rodiče
+Chcete-li se dostat na skrytý panel:
+1. Přejděte na kartu „Další“.
+2. Přejděte na panel „Nastavení“.
+3. Přejděte na panel „O aplikaci“.
+4. Klikněte 5x na logo aplikace
+5. Přejděte na domovskou obrazovku
+6. Přejděte do nastavení
+7. Zadejte „tajná nastavení“
+ 
+# Instalace
 
-## Funkce
+|  Název souboru   |    Přizpůsobeno   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
 
-* přihlášení pomocí emailu a hesla
-* funkce z webové stránky deníku:
-    * známky
-    * statistiky známek
-    * frekvence
-    * procento frekvence
-    * zkoušky
-    * plán lekce
-    * dokončené lekce
-    * zprávy
-    * domácí úkoly
-    * poznámky
-    * šťastné číslo
-    * další lekce
-    * školní setkání
-    * informace o žáku a škole
-* výpočet průměru nezávisle na preferencích školy
-* upozornění, např. o nových známkách
-* podpora více účtů s možností přejmenování žáků
-* tmavý a černý (AMOLED) motiv
-* offline režim
-* volitelné reklamy na podporu projektu
+Stáhněte si vybranou verzi z [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+Doporučujeme stáhnout nejnovější dostupnou verzi.
 
-## Stáhnout
+# O projektu Wulkanowy
 
-Aktuální verzi si můžete stáhnout z Google Play, F-Droid nebo Huawei AppGallery
-
-[<img src="https://play.google.com/intl/cs-CZ/badges/images/generic/cs_badge_web_generic.png"
-    alt="Nyní na Google Play"
-    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Stáhnout s F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="https://i.imgur.com/baTGiDP.png"
-    alt="Objevuj v AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-
-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í
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager)
-
-## Spolupráce
-
-Přispějte do projektu vytvořením PR nebo odesláním issue na GitHub.
-
-Pro zájemce o překlad aplikace do různých jazyků poskytujeme Crowdin:
-https://crowdin.com/project/wulkanowy2
-
-## Licence
-
-Tento projekt je licencován pod licencí Apache License 2.0 - podrobnosti v souboru [LICENSE](LICENSE)
+Chcete si přečíst více o projektu Wulkanowy? [Klikněte sem](https://github.com/wulkanowy/wulkanowy)

README.de.md

@@ -1,73 +1,33 @@
 [Česká verze](README.cs.md) / Deutsche Version / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Funktionen:
+* Noten ausblenden
+* Individuelle Anwesenheitslisten ausblenden.
+* Kommentare ausblenden.
+* Anwesenheit fälschen %
 
-Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre Eltern
+So gelangen Sie zum ausgeblendeten Bereich:
+1. Gehen Sie zur Registerkarte „Mehr“.
+2. Gehen Sie zum Bereich „Einstellungen“.
+3. Gehen Sie zum Bereich „Über die Anwendung“.
+4. Klicken Sie fünfmal auf das Anwendungslogo
+5. Gehen Sie zum Startbildschirm
+6. Gehen Sie zu den Einstellungen
+7. Geben Sie „Geheime Einstellungen“ ein
+ 
+# Installation
 
-## Merkmale
+|    Dateiname     |    Angepasst an   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
 
-* Einloggen mit E-Mail und Passwort
-* Funktionen von der Registerwebsite:
-    * Noten
-    * Notenstatistik
-    * Anwesenheit
-    * Prozentsatz der Anwesenheit
-    * Prüfungen
-    * Stundenplan
-    * abgeschlossene Unterrichtsstunden
-    * Nachrichten
-    * Hausaufgaben
-    * Anmerkungen
-    * Glückszahl
-    * Zusätzliche Lektionen
-    * Schulkonferenzen
-    * Schüler- und Schulinformationen
-* Berechnung des Durchschnitts unabhängig von den Präferenzen der Schule
-* Benachrichtigungen, z. B. über eine neue Note
-* 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
+Laden Sie die ausgewählte Version von [hier](https://git.sador.me/sadorowo/wulkanowy-mod/releases) herunter.
+Wir empfehlen, die neueste verfügbare Version herunterzuladen.
 
-## Herunterladen
+# Über das Wulkanowy-Projekt
 
-Die aktuelle Version können Sie von der Google Play, F-Droid oder Huawei AppGallery store herunterladen
-
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-    alt="Get it on Google Play"
-    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Get it on F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="appgallery_badge.png"
-    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
-
-## Gebaut mit
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
-
-## Beitragen
-
-Bitte tragen Sie zum Projekt bei, indem Sie entweder eine PR erstellen oder ein Issue auf GitHub einreichen.
-
-Für Personen, die daran interessiert sind, die Anwendung in verschiedene Sprachen zu übersetzen, bieten wir Crowdin
-https://crowdin.com/project/wulkanowy2
-
-## Lizenz
-
-Dieses Projekt ist unter der Apache License 2.0 lizenziert - siehe die [LIZENZ](LICENSE) Datei für Details
+Möchten Sie mehr über das Wulkanowy-Projekt lesen? [Hier klicken](https://github.com/wulkanowy/wulkanowy)

README.en.md

@@ -1,73 +1,33 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / English version / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Functions:
+* hide grades
+* hide individual attendance entries
+* hide comments
+* fake attendance %.
 
-Unofficial android VULCAN UONET+ register client for both students and their parents
+To get to the hidden panel:
+1. Go to the "More" tab
+2. Go to the "Settings" panel
+3. Go to the "About application" panel
+4. Click on the application logo 5 times
+5. Go to the home screen
+6. Go to settings
+7. Enter "secret settings"
+ 
+# Installation
 
-## Features
+|    File name     |    Adapted to     |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
 
-* logging in using the email and password
-* functions from the register website:
-    * grades
-    * grade statistics
-    * attendance
-    * percentage of attendance
-    * exams
-    * timetable
-    * completed lessons
-    * messages
-    * homework
-    * notes
-    * lucky number
-    * additional lessons
-    * school conferences
-    * student and school information
-* calculation of the average independently of school's preferences
-* notifications, e.g. about a new grade
-* 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
+Download application from [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+We recommend downloading the latest available version.
 
-## Download
+# About the Wulkanowy project
 
-You can download the current version from the Google Play, F-Droid or Huawei AppGallery store
-
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-    alt="Get it on Google Play"
-    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Get it on F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="appgallery_badge.png"
-    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=)
-    
-You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features being prepared for the next release
-
-## Built With
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
-
-## Contributing
-
-Please contribute to the project either by creating a PR or submitting an issue on GitHub.
-
-For people interested in translating the application into different languages, we provide Crowdin
-https://crowdin.com/project/wulkanowy2
-
-## License
-
-This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details
+Want to read more about the Wulkanowy project? [Click here](https://github.com/wulkanowy/wulkanowy)

README.md

@@ -1,74 +1,33 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / Polska wersja / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Funkcje:
+* ukryj oceny
+* ukryj poszczególne wpisy frekwencji
+* ukryj uwagi
+* sfałszuj % frekwencji
 
-Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
+Aby dostać się do ukrytego panelu:
+1. Przejdź do karty "Więcej"
+2. Przejdź do panelu "Ustawienia"
+3. Przejdź do panelu "O aplikacji"
+4. Kliknij 5 razy w logo aplikacji
+5. Przejdź na ekran główny
+6. Wejdź w ustawienia
+7. Wejdź w "sekretne ustawienia"
+ 
+# Instalacja
 
-## Funkcje
+|   Nazwa pliku    | Przystosowana do  |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Sklep Play    |
 
-* logowanie za pomocą e-maila i hasła
-* funkcje ze strony internetowej dziennika:
-    * oceny
-    * statystyki ocen
-    * frekwencja
-    * procent frekwencji
-    * sprawdziany
-    * plan lekcji
-    * lekcje zrealizowane
-    * wiadomości
-    * zadania domowe
-    * uwagi
-    * szczęśliwy numerek
-    * dodatkowe lekcje
-    * zebrania w szkole
-    * informacje o uczniu i szkole
-* obliczanie średniej niezależnie od preferencji szkoły
-* powiadomienia np. o nowej ocenie
-* 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
+Pobierz wybraną wersję z [wydań](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+Zalecamy pobranie najnowszej dostępnej wersji.
 
-## Pobierz
+# O projekcie Wulkanowy
 
-Aktualną wersję możesz pobrać ze sklepu Google Play, F-Droid lub Huawei AppGallery
-
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-    alt="Pobierz z Google Play"
-    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Pobierz z F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="appgallery_badge.png"
-    alt="Odkrywaj w AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-
-
-Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
-
-
-## Zbudowana za pomocą
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
-
-## Współpraca
-
-Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
-
-Dla osób zainteresowanych tłumaczeniem aplikacji na różne języki udostępniamy Crowdina
-https://crowdin.com/project/wulkanowy2
-
-## Licencja
-
-Ten projekt udostępniany jest na licencji Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
+Chcesz poczytać więcej o projekcie Wulkanowy? [Kliknij tutaj](https://github.com/wulkanowy/wulkanowy)

README.sk.md

@@ -1,73 +1,33 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / Slovenská verzia
 
-# Wulkanowy
+# Wulkanowy MOD
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
+## Funkcie:
+* skryť známky
+* Skryť individuálne záznamy o dochádzke.
+* Skryť komentáre.
+* falošná dochádzka %
 
-Neoficiálny klient denníka VULCAN UONET+ pre žiaka a rodičov
+Ak chcete prejsť na skrytý panel:
+1. Prejdite na kartu „Viac“.
+2. Prejdite na panel „Nastavenia“.
+3. Prejdite na panel „O aplikácii“.
+4. Kliknite 5-krát na logo aplikácie
+5. Prejdite na domovskú obrazovku
+6. Prejdite do nastavení
+7. Zadajte „tajné nastavenia“
+ 
+# Inštalácia
 
-## Funkcie
+|   Názov súboru   |    Prispôsobené   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
 
-* prihlásenie pomocou emailu a hesla
-* funkcie z webovej stránky denníka:
-    * známky
-    * štatistiky známok
-    * frekvencia
-    * percento frekvencie
-    * skúšky
-    * plán lekcie
-    * dokončené lekcie
-    * správy
-    * domáce úlohy
-    * poznámky
-    * šťastné číslo
-    * ďalšie lekcie
-    * školské stretnutie
-    * informácie o žiakovi a škole
-* výpočet priemeru nezávisle od preferencií školy
-* upozornenia, napr. o nových známkach
-* 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
+Stiahnite si vybranú verziu z [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+Odporúčame stiahnuť najnovšiu dostupnú verziu.
 
-## Stiahnuť
+# O projekte Wulkanowy
 
-Aktuálnu verziu si môžete stiahnuť z Google Play, F-Droid alebo Huawei AppGallery
-
-[<img src="https://play.google.com/intl/sk/badges/images/generic/sk_badge_web_generic.png"
-    alt="Nyní na Google Play"
-    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Stiahnuť s F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="https://i.imgur.com/sX8UyAw.png"
-    alt="Objavíte v AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-
-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
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager)
-
-## Spolupráca
-
-Prispejte do projektu vytvorením PR alebo odoslaním issue na GitHub.
-
-Pre záujemcov o preklad aplikácie do rôznych jazykov poskytujeme Crowdin:
-https://crowdin.com/project/wulkanowy2
-
-## Licencia
-
-Tento projekt je licencovaný pod licenciou Apache License 2.0 - podrobnosti v súbore [LICENSE](LICENSE)
+Chcete si prečítať viac o projekte Wulkanowy? [Kliknite sem](https://github.com/wulkanowy/wulkanowy)

app/build.gradle

@@ -27,15 +27,12 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 135
-        versionName "2.2.3"
+        versionCode 173
+        versionName "2.6.13"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
-        manifestPlaceholders = [
-            firebase_enabled: project.hasProperty("enableFirebase"),
-            admob_project_id: ""
-        ]
+        manifestPlaceholders = [admob_project_id: ""]
 
         buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
         buildConfigField "String", "DASHBOARD_TILE_AD_ID", "null"
@@ -65,8 +62,8 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+            // 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"'
         }
@@ -76,7 +73,6 @@ android {
             resValue "string", "app_name", "Wulkanowy DEV"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            ext.enableCrashlytics = project.hasProperty("enableFirebase")
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
             buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
@@ -113,6 +109,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     bundle {
@@ -141,7 +138,9 @@ android {
     packagingOptions {
         resources {
             excludes += ['META-INF/library_release.kotlin_module',
-                         'META-INF/library-core_release.kotlin_module']
+                         'META-INF/library-core_release.kotlin_module',
+                         'META-INF/LICENSE.md',
+                         'META-INF/LICENSE-notice.md']
         }
     }
 
@@ -161,8 +160,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
-    userFraction = 0.01d
-    updatePriority = 3
+    userFraction = 0.1d
+    updatePriority = 2
     enabled.set(false)
 }
 
@@ -183,32 +182,34 @@ huaweiPublish {
 }
 
 ext {
-    work_manager = "2.8.1"
-    android_hilt = "1.0.0"
-    room = "2.6.0"
-    chucker = "3.5.2"
-    mockk = "1.13.8"
-    coroutines = "1.7.3"
+    work_manager = "2.9.0"
+    android_hilt = "1.2.0"
+    room = "2.6.1"
+    chucker = "4.0.0"
+    mockk = "1.13.10"
+    coroutines = "1.8.1"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.2.3'
+    implementation 'io.github.wulkanowy:sdk:2.6.11'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutines"
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation "androidx.activity:activity-ktx:1.8.0"
+    implementation "androidx.activity:activity-ktx:1.9.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.6.1"
-    implementation "androidx.annotation:annotation:1.7.0"
+    implementation "androidx.fragment:fragment-ktx:1.7.0"
+    implementation "androidx.annotation:annotation:1.7.1"
+    implementation "androidx.javascriptengine:javascriptengine:1.0.0-beta01"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
+    implementation "androidx.viewpager2:viewpager2:1.1.0-rc01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
@@ -217,10 +218,10 @@ dependencies {
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.3.0'
 
-    implementation "androidx.work:work-runtime-ktx:$work_manager"
+    implementation "androidx.work:work-runtime:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -234,36 +235,39 @@ dependencies {
     implementation 'com.github.ncapdevi:FragNav:3.3.0'
     implementation "com.github.YarikSOffice:lingver:1.3.0"
 
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.11.0'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
     implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
+    implementation "com.squareup.okhttp3:okhttp-urlconnection:4.12.0"
 
     implementation "com.jakewharton.timber:timber:5.0.1"
-    implementation "at.favre.lib:slf4j-timber:1.0.1"
+    implementation 'com.github.Faierbel:slf4j-timber:2.0'
     implementation 'com.github.bastienpaulfr:Treessence:1.1.2'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:2.4.0"
+    implementation 'io.coil-kt:coil:2.6.0'
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
-    implementation 'org.apache.commons:commons-text:1.10.0'
+    implementation 'org.apache.commons:commons-text:1.12.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.4.0')
-    playImplementation 'com.google.firebase:firebase-analytics-ktx'
-    playImplementation 'com.google.firebase:firebase-messaging:'
+    playImplementation platform('com.google.firebase:firebase-bom:33.0.0')
+    playImplementation 'com.google.firebase:firebase-analytics'
+    playImplementation 'com.google.firebase:firebase-messaging'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
-    playImplementation 'com.google.firebase:firebase-config-ktx'
-    playImplementation 'com.google.android.play:core:1.10.3'
-    playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:22.4.0'
-    playImplementation "com.google.android.play:integrity:1.2.0"
+    playImplementation 'com.google.firebase:firebase-config'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.12.0.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.301'
+    playImplementation 'com.google.android.gms:play-services-ads:22.6.0'
+    playImplementation "com.google.android.play:integrity:1.3.0"
+    playImplementation 'com.google.android.play:app-update-ktx:2.1.0'
+    playImplementation 'com.google.android.play:review-ktx:2.0.1'
+    playImplementation "com.google.android.ump:user-messaging-platform:2.1.0"
 
-    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
+    hmsImplementation 'com.huawei.hms:hianalytics:6.12.0.301'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.303'
 
-    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
+    releaseImplementation "com.github.chuckerteam.chucker:library-no-op:$chucker"
+
+    debugImplementation "com.github.chuckerteam.chucker:library:$chucker"
     debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.6'
     debugImplementation 'com.github.haroldadmin:WhatTheStack:1.0.0-alpha04'
 
@@ -272,7 +276,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'org.robolectric:robolectric:4.12.1'
     testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"

app/google-services.json

@@ -36,6 +36,37 @@
           "status": 2
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1091101852179:android:b558a25f65d088b1",
+        "android_client_info": {
+          "package_name": "io.github.wulkanowy"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": ""
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
     }
   ],
   "configuration_version": "1"

app/jacoco.gradle

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

app/play-publish-lint.sh

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

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

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

app/src/debug/agconnect-services.json

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

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

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

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

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

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

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

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

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

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

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="internalOnly">
 
+    <uses-sdk tools:overrideLibrary="androidx.javascriptengine" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -42,6 +44,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:resizeableActivity="true"
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         tools:ignore="DataExtractionRules,UnusedAttribute">
@@ -50,7 +53,7 @@
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/WulkanowyTheme.SplashScreen"
-            tools:ignore="LockedOrientationActivity">
+            tools:ignore="DiscouragedApi,LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -154,33 +157,9 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
-        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
-        <provider
-            android:name="com.google.firebase.provider.FirebaseInitProvider"
-            android:authorities="${applicationId}.firebaseinitprovider"
-            android:enabled="${firebase_enabled}"
-            android:exported="false"
-            tools:ignore="MissingClass" />
-
         <meta-data
             android:name="install_channel"
             android:value="${install_channel}" />
-        <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="google_analytics_adid_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="firebase_crashlytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="firebase_messaging_auto_init_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
-            android:value="${firebase_enabled}" />
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/ic_stat_all" />

app/src/main/assets/contributors.json

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

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

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

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

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

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

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

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

@@ -0,0 +1,171 @@
+package io.github.wulkanowy.data
+
+import android.content.Context
+import android.os.Build
+import androidx.javascriptengine.JavaScriptSandbox
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.google.common.util.concurrent.ListenableFuture
+import dagger.hilt.android.qualifiers.ApplicationContext
+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.data.repositories.WulkanowyRepository
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.scrapper.EvaluateHandler
+import io.github.wulkanowy.utils.RemoteConfigHelper
+import io.github.wulkanowy.utils.WebkitCookieManagerProxy
+import kotlinx.coroutines.guava.await
+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(
+    @ApplicationContext private val context: Context,
+    private val chuckerInterceptor: ChuckerInterceptor,
+    private val remoteConfig: RemoteConfigHelper,
+    private val webkitCookieManagerProxy: WebkitCookieManagerProxy,
+    private val studentDb: StudentDao,
+    private val wulkanowyRepository: WulkanowyRepository,
+) {
+
+    private val eduOneMutex = Mutex()
+    private val migrationFailedStudentIds = mutableSetOf<Long>()
+    private val sandbox: ListenableFuture<JavaScriptSandbox>? =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && JavaScriptSandbox.isSupported())
+            JavaScriptSandbox.createConnectedInstanceAsync(context)
+        else null
+
+    private val sdk = Sdk().apply {
+        androidVersion = Build.VERSION.RELEASE
+        buildTag = Build.MODEL
+        userAgentTemplate = remoteConfig.userAgentTemplate
+        setSimpleHttpLogger { Timber.d(it) }
+        setAdditionalCookieManager(webkitCookieManagerProxy)
+
+        // for debug only
+        addInterceptor(chuckerInterceptor, network = true)
+    }
+
+    fun createBase() = sdk
+
+    suspend fun create(): Sdk {
+        val mapping = wulkanowyRepository.getMapping()
+
+        return createBase().apply {
+            if (mapping != null) {
+                endpointsMapping = mapping.endpoints
+                vTokenMapping = mapping.vTokens
+                vHeaders = mapping.vHeaders
+                vParamsEvaluation = createIsolate()
+            }
+        }
+    }
+
+    private suspend fun createIsolate(): suspend () -> EvaluateHandler {
+        return {
+            val isolate = sandbox?.await()?.createIsolate()
+            object : EvaluateHandler {
+                override suspend fun evaluate(code: String): String? {
+                    return isolate?.evaluateJavaScriptAsync(code)?.await()
+                }
+
+                override fun close() {
+                    isolate?.close()
+                }
+            }
+        }
+    }
+
+    suspend fun create(student: Student, semester: Semester? = null): Sdk {
+        val overrideIsEduOne = checkEduOneAndMigrateIfNecessary(student)
+        return buildSdk(student, semester, overrideIsEduOne)
+    }
+
+    private suspend 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/models/Mapping.kt

@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.api.models
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Mapping(
+
+    @SerialName("endpoints")
+    val endpoints: Map<String, Map<String, Map<String, String>>>,
+
+    @SerialName("vTokens")
+    val vTokens: Map<String, Map<String, Map<String, String>>>,
+
+    @SerialName("vTokenScheme")
+    val vTokenScheme: Map<String, Map<String, String>> = emptyMap(),
+
+    @SerialName("vHeaders")
+    val vHeaders: Map<String, Map<String, Map<String, String>>> = emptyMap(),
+)

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

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.api
+package io.github.wulkanowy.data.api.services
 
 import io.github.wulkanowy.data.pojos.IntegrityRequest
 import io.github.wulkanowy.data.pojos.LoginEvent

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

@@ -1,12 +1,16 @@
-package io.github.wulkanowy.data.api
+package io.github.wulkanowy.data.api.services
 
+import io.github.wulkanowy.data.api.models.Mapping
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import retrofit2.http.GET
 import javax.inject.Singleton
 
 @Singleton
-interface AdminMessageService {
+interface WulkanowyService {
 
     @GET("/v1.json")
     suspend fun getAdminMessages(): List<AdminMessage>
-}
+
+    @GET("/mapping2.json")
+    suspend fun getMapping(): Mapping
+}

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

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

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

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

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import kotlinx.coroutines.flow.Flow
 import java.time.LocalDate
 import javax.inject.Singleton

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

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

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

@@ -12,4 +12,8 @@ interface GradeDao : BaseDao<Grade> {
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Flow<List<Grade>>
+
+    @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId " +
+        "AND entry NOT IN(:censoredEntries)")
+    fun loadAllCensored(semesterId: Int, studentId: Int, censoredEntries: Array<String>): Flow<List<Grade>>
 }

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

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

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

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

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

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

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

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

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

@@ -9,7 +9,6 @@ import javax.inject.Singleton
 @Singleton
 @Dao
 interface NoteDao : BaseDao<Note> {
-
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
     fun loadAll(studentId: Int): Flow<List<Note>>
 }

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 = :userLoginId ORDER BY date DESC")
-    fun loadAll(userLoginId: Int): Flow<List<SchoolAnnouncement>>
+    @Query("SELECT * FROM SchoolAnnouncements WHERE user_login_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")
+    @Query("SELECT * FROM Semesters WHERE (student_id = :studentId AND class_id = :classId) OR (student_id = :studentId AND class_id = 0)")
     suspend fun loadAll(studentId: Int, classId: Int): List<Semester>
 }

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

@@ -1,11 +1,18 @@
 package io.github.wulkanowy.data.db.dao
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.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
@@ -18,6 +25,12 @@ abstract class StudentDao {
     @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)
 
@@ -34,11 +47,11 @@ 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")
+    @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)")
     abstract suspend fun loadStudentsWithSemesters(): Map<Student, List<Semester>>
 
     @Transaction
-    @Query("SELECT * FROM Students JOIN Semesters ON Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id WHERE Students.id = :id")
+    @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")
     abstract suspend fun loadStudentWithSemestersById(id: Long): Map<Student, List<Semester>>
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
@@ -47,6 +60,9 @@ abstract class StudentDao {
     @Query("UPDATE Students SET is_current = 0")
     abstract suspend fun resetCurrent()
 
+    @Query("DELETE FROM Students WHERE email = :email AND user_name = :userName")
+    abstract suspend fun deleteByEmailAndUserName(email: String, userName: String)
+
     @Transaction
     open suspend fun switchCurrent(id: Long) {
         resetCurrent()

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

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

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

@@ -4,6 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import io.github.wulkanowy.data.enums.MessageType
+import io.github.wulkanowy.data.serializers.SafeMessageTypeEnumListSerializer
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -34,9 +36,14 @@ data class AdminMessage(
 
     val priority: String,
 
+    @SerialName("messageTypes")
+    @Serializable(with = SafeMessageTypeEnumListSerializer::class)
     @ColumnInfo(name = "types", defaultValue = "[]")
     val types: List<MessageType> = emptyList(),
 
-    @ColumnInfo(name = "is_dismissible")
-    val isDismissible: Boolean = false
+    @ColumnInfo(name = "is_ok_visible", defaultValue = "0")
+    val isOkVisible: Boolean = false,
+
+    @ColumnInfo(name = "is_x_visible", defaultValue = "0")
+    val isXVisible: Boolean = false
 )

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

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

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

@@ -33,7 +33,13 @@ data class GradeSummary(
     @ColumnInfo(name = "points_sum")
     val pointsSum: String,
 
-    val average: Double
+    @ColumnInfo(name = "points_sum_all_year")
+    val pointsSumAllYear: String?,
+
+    val average: Double,
+
+    @ColumnInfo(name = "average_all_year")
+    val averageAllYear: Double? = null,
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0

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

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

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

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

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

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

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

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

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

@@ -9,14 +9,16 @@ import java.time.LocalDate
 @Entity(tableName = "SchoolAnnouncements")
 data class SchoolAnnouncement(
 
-    @ColumnInfo(name = "user_login_id")
-    val userLoginId: Int,
+    @ColumnInfo(name = "user_login_id") // todo: change column name
+    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

@@ -49,6 +49,7 @@ data class Student(
     @ColumnInfo(name = "student_id")
     val studentId: Int,
 
+    @Deprecated("not available in VULCAN anymore")
     @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 
@@ -78,6 +79,13 @@ 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)
@@ -88,3 +96,22 @@ 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/migrations/Migration10.kt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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