switch to seepine/hash-files for faster hashing

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

.circleci/config.yml

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

.editorconfig

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

.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,80 @@
+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' # See 'Supported distributions' for available options
+                    java-version: '17'
+                    cache: 'gradle'
+
+            -   name: Get hash of Gradle files
+                uses: seepine/hash-files@v1
+                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,74 +0,0 @@
-name: Deploy to app stores
-
-on:
-  release:
-    types: [ created ]
-
-jobs:
-
-  deploy-google-play:
-    name: Deploy to google play
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: google-play
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        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/key.p12.gpg
-          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-      - name: Upload apk to google play
-        env:
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-        run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
-
-  deploy-app-gallery:
-    name: Deploy to AppGallery
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-gallery
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        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/key.p12.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_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-        run: ./gradlew bundleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace

.github/workflows/deploy-test.yml

@@ -1,144 +0,0 @@
-name: Deploy to app tests
-
-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@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        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@v2
-        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@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        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@v2
-        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,34 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches: [ master, develop ]
-    tags: [ '*' ]
-  pull_request:
-    branches: [ master, develop ]
-
-jobs:
-  unit-tests:
-      name: Unit tests
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      steps:
-        - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v2
-        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v1
-          with:
-            java-version: 11
-        - uses: actions/cache@v2
-          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@v1
-          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,11 +117,13 @@ Thumbs.db
 *.ear
 
 ### AndroidStudio Patch ###
-
 !/gradle/wrapper/gradle-wrapper.jar
 .idea/jarRepositories.xml
 
+### Services config files
+agconnect-services.json
+agconnect-credentials.json
+google-services.json
+!app/google-services.json
+
 
-app/src/release/agconnect-services.json
-app/src/release/agconnect-credentials.json
-.idea/deploymentTargetDropDown.xml

.idea/codeStyles/Project.xml

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

.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:

LICENSE

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

README.cs.md

@@ -0,0 +1,33 @@
+Česká verze / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
+
+# Wulkanowy MOD
+
+## Funkce:
+* skrýt známky
+* Skrýt jednotlivé záznamy o docházce.
+* Skrýt komentáře.
+* falešná docházka %
+
+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
+
+|  Název souboru   |    Přizpůsobeno   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
+
+Stáhněte si vybranou verzi z [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+Doporučujeme stáhnout nejnovější dostupnou verzi.
+
+# O projektu Wulkanowy
+
+Chcete si přečíst více o projektu Wulkanowy? [Klikněte sem](https://github.com/wulkanowy/wulkanowy)

README.de.md

@@ -0,0 +1,33 @@
+[Česká verze](README.cs.md) / Deutsche Version / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
+
+# Wulkanowy MOD
+
+## Funktionen:
+* Noten ausblenden
+* Individuelle Anwesenheitslisten ausblenden.
+* Kommentare ausblenden.
+* Anwesenheit fälschen %
+
+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
+
+|    Dateiname     |    Angepasst an   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
+
+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.
+
+# Über das Wulkanowy-Projekt
+
+Möchten Sie mehr über das Wulkanowy-Projekt lesen? [Hier klicken](https://github.com/wulkanowy/wulkanowy)

README.en.md

@@ -1,72 +1,33 @@
-[Polska wersja README](README.md)
+[Č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/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+## 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
-* no ads
+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,73 +1,33 @@
-[English version of README](README.en.md)
+[Č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/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+## 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
-* brak reklam
+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

@@ -0,0 +1,33 @@
+[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / Slovenská verzia
+
+# Wulkanowy MOD
+
+## Funkcie:
+* skryť známky
+* Skryť individuálne záznamy o dochádzke.
+* Skryť komentáre.
+* falošná dochádzka %
+
+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
+
+|   Názov súboru   |    Prispôsobené   |
+| ---------------- | ----------------- |
+| `*-fdroid-*.apk` |      F-Droid      |
+|  `*-hms-*.apk`   | Huawei AppGallery |
+|  `*-play-*.apk`  |     Play Store    |
+
+Stiahnite si vybranú verziu z [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+Odporúčame stiahnuť najnovšiu dostupnú verziu.
+
+# O projekte Wulkanowy
+
+Chcete si prečítať viac o projekte Wulkanowy? [Kliknite sem](https://github.com/wulkanowy/wulkanowy)

app/build.gradle

@@ -1,7 +1,11 @@
+import com.github.triplet.gradle.androidpublisher.ReleaseStatus
+import ru.cian.huawei.publish.ReleaseNote
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
@@ -9,36 +13,34 @@ apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'com.huawei.agconnect'
+apply plugin: 'kotlin-kapt'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 30
+    namespace 'io.github.wulkanowy'
+    compileSdk 34
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 95
-        versionName "1.2.2"
+        targetSdkVersion 34
+        versionCode 165
+        versionName "2.6.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true
 
         resValue "string", "app_name", "Wulkanowy"
-        buildConfigField "long", "BUILD_TIMESTAMP", String.valueOf(System.currentTimeMillis())
+        manifestPlaceholders = [admob_project_id: ""]
 
-        manifestPlaceholders = [
-                firebase_enabled: project.hasProperty("enableFirebase")
-        ]
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments += [
-                        "room.schemaLocation": "$projectDir/schemas".toString(),
-                        "room.incremental"   : "true"
-                ]
-            }
+        buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
+        buildConfigField "String", "DASHBOARD_TILE_AD_ID", "null"
+
+        if (System.env.SET_BUILD_TIMESTAMP) {
+            buildConfigField "long", "BUILD_TIMESTAMP", String.valueOf(System.currentTimeMillis())
+        } else {
+            buildConfigField "long", "BUILD_TIMESTAMP", "1486235849000"
         }
     }
 
@@ -60,64 +62,86 @@ 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"'
         }
         debug {
-            resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
+            minifyEnabled false
+            shrinkResources false
+            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"'
         }
     }
 
-    flavorDimensions "platform"
+    flavorDimensions += "platform"
 
     productFlavors {
         hms {
             dimension "platform"
-            manifestPlaceholders = [
-                    install_channel: "AppGallery"
-            ]
+            manifestPlaceholders = [install_channel: "AppGallery"]
         }
 
         play {
             dimension "platform"
             manifestPlaceholders = [
-                    install_channel: "Google Play"
+                install_channel : "Google Play",
+                admob_project_id: System.getenv("ADMOB_PROJECT_ID") ?: "ca-app-pub-3940256099942544~3347511713"
             ]
+            buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "\"${System.getenv("SINGLE_SUPPORT_AD_ID") ?: "ca-app-pub-3940256099942544/5354046379"}\""
+            buildConfigField "String", "DASHBOARD_TILE_AD_ID", "\"${System.getenv("DASHBOARD_TILE_AD_ID") ?: "ca-app-pub-3940256099942544/6300978111"}\""
+
         }
 
         fdroid {
             dimension "platform"
-            manifestPlaceholders = [
-                    install_channel: "F-Droid"
-            ]
+            manifestPlaceholders = [install_channel: "F-Droid"]
         }
     }
 
+    playConfigs {
+        play { enabled.set(true) }
+    }
+
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
-    testOptions.unitTests {
-        includeAndroidResources = true
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
+    testOptions {
+        unitTests.includeAndroidResources = true
+        // workaround HMS test errors https://github.com/robolectric/robolectric/issues/2750
+        unitTests.all { jvmArgs '-noverify' }
     }
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
+        jvmTarget = "17"
+        freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
-        exclude 'META-INF/library_release.kotlin_module'
-        exclude 'META-INF/library-core_release.kotlin_module'
+        resources {
+            excludes += ['META-INF/library_release.kotlin_module',
+                         'META-INF/library-core_release.kotlin_module',
+                         'META-INF/LICENSE.md',
+                         'META-INF/LICENSE-notice.md']
+        }
     }
 
     aboutLibraries {
@@ -128,13 +152,17 @@ android {
 kapt {
     correctErrorTypes true
 }
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas".toString())
+}
 
 play {
-    serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
-    serviceAccountCredentials = file('key.p12')
     defaultToAppBundles = false
     track = 'production'
+    releaseStatus = ReleaseStatus.IN_PROGRESS
+    userFraction = 0.99d
     updatePriority = 3
+    enabled.set(false)
 }
 
 huaweiPublish {
@@ -142,53 +170,60 @@ huaweiPublish {
         hmsRelease {
             credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
             buildFormat = "aab"
-            deployType = "draft"
+            deployType = "publish"
+            releaseNotes = [
+                new ReleaseNote(
+                    "pl-PL",
+                    "$projectDir/src/main/play/release-notes/pl-PL/default.txt"
+                )
+            ]
         }
     }
 }
 
 ext {
-    work_manager = "2.6.0"
-    android_hilt = "1.0.0"
-    room = "2.3.0"
-    chucker = "3.5.2"
-    mockk = "1.12.0"
-    moshi = "1.12.0"
+    work_manager = "2.9.0"
+    android_hilt = "1.2.0"
+    room = "2.6.1"
+    chucker = "4.0.0"
+    mockk = "1.13.10"
+    coroutines = "1.8.0"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.2.2"
+    implementation 'io.github.wulkanowy:sdk:2.6.4'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.6.0"
-    implementation "androidx.activity:activity-ktx:1.3.1"
-    implementation "androidx.appcompat:appcompat:1.3.1"
-    implementation "androidx.appcompat:appcompat-resources:1.3.1"
-    implementation "androidx.fragment:fragment-ktx:1.3.6"
-    implementation "androidx.annotation:annotation:1.2.0"
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation "androidx.activity:activity-ktx:1.9.0"
+    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation "androidx.fragment:fragment-ktx:1.7.0"
+    implementation "androidx.annotation:annotation:1.7.1"
 
-    implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "androidx.preference:preference-ktx:1.2.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
+    implementation "androidx.viewpager2:viewpager2:1.1.0-rc01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.4.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
+    implementation "com.google.android.material:material:1.10.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation 'com.github.lopspower:CircularImageView:4.2.0'
+    implementation 'com.github.lopspower:CircularImageView:4.3.0'
 
-    implementation "androidx.work:work-runtime-ktx:$work_manager"
+    implementation "androidx.work:work-runtime:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
-    kapt "androidx.room:room-compiler:$room"
+    ksp "androidx.room:room-compiler:$room"
 
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
@@ -198,50 +233,58 @@ dependencies {
     implementation 'com.github.ncapdevi:FragNav:3.3.0'
     implementation "com.github.YarikSOffice:lingver:1.3.0"
 
-    implementation "com.squareup.moshi:moshi:$moshi"
-    implementation "com.squareup.moshi:moshi-adapters:$moshi"
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi"
+    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.bastienpaulfr:Treessence:1.0.4'
+    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:1.3.2"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
-    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
-    implementation 'com.fredporciuncula:flow-preferences:1.5.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.12.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:28.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.android.play:core:1.10.1'
-    playImplementation 'com.google.android.play:core-ktx:1.8.1'
+    playImplementation 'com.google.firebase:firebase-config'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.2.0.301'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.0.300'
+    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"
-    debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:v1.0.6'
+    releaseImplementation "com.github.chuckerteam.chucker:library-no-op:$chucker"
+
+    debugImplementation "com.github.chuckerteam.chucker:library:$chucker"
+    debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.6'
+    debugImplementation 'com.github.haroldadmin:WhatTheStack:1.0.0-alpha04'
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2'
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.6.1'
-    testImplementation "androidx.test:runner:1.4.0"
-    testImplementation "androidx.test.ext:junit:1.1.3"
-    testImplementation "androidx.test:core:1.4.0"
+    testImplementation 'org.robolectric:robolectric:4.12.1'
+    testImplementation "androidx.test:runner:1.5.2"
+    testImplementation "androidx.test.ext:junit:1.1.5"
+    testImplementation "androidx.test:core:1.5.0"
     testImplementation "androidx.room:room-testing:$room"
     testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
     kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
 
-    androidTestImplementation "androidx.test:core:1.4.0"
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation "androidx.test:core:1.5.0"
+    androidTestImplementation "androidx.test:runner:1.5.2"
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }

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

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/proguard-rules.pro

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

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

@@ -14,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,33 +0,0 @@
-{
-	"agcgw":{
-		"backurl":"connect-dre.dbankcloud.cn",
-		"url":"connect-dre.hispace.hicloud.com"
-	},
-	"client":{
-		"cp_id":"890048000024105546",
-		"product_id":"",
-		"client_id":"",
-		"client_secret":"",
-		"app_id":"101440411",
-		"package_name":"io.github.wulkanowy.dev",
-		"api_key":""
-	},
-	"service":{
-		"analytics":{
-			"collector_url":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-			"resource_id":"p1",
-			"channel_id":""
-		},
-		"search":{
-			"url":"https://search-dre.cloud.huawei.com"
-		},
-		"cloudstorage":{
-			"storage_url":"https://ops-dre.agcstorage.link"
-		},
-		"ml":{
-			"mlservice_url":"ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
-		}
-	},
-	"region":"DE",
-	"configuration_version":"1.0"
-}

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

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

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

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

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

@@ -0,0 +1,31 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import android.view.View
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import kotlinx.coroutines.flow.MutableStateFlow
+import javax.inject.Inject
+
+@Suppress("unused")
+class AdsHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val preferencesRepository: PreferencesRepository
+) {
+
+    val isMobileAdsSdkInitialized = MutableStateFlow(false)
+    val canShowAd = false
+
+    fun initialize() {
+        preferencesRepository.isAdsEnabled = false
+        preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
+    }
+
+    @Suppress("RedundantSuspendModifier", "UNUSED_PARAMETER")
+    suspend fun getDashboardTileAdBanner(width: Int): AdBanner {
+        throw IllegalStateException("Can't get ad banner (F-droid)")
+    }
+}
+
+data class AdBanner(val view: View)

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

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

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

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

app/src/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/IntegrityHelper.kt

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

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

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

app/src/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

@@ -0,0 +1,30 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import android.view.View
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import kotlinx.coroutines.flow.MutableStateFlow
+import javax.inject.Inject
+
+@Suppress("unused")
+class AdsHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val preferencesRepository: PreferencesRepository
+) {
+    val isMobileAdsSdkInitialized = MutableStateFlow(false)
+    val canShowAd = false
+
+    fun initialize() {
+        preferencesRepository.isAdsEnabled = false
+        preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
+    }
+
+    @Suppress("RedundantSuspendModifier", "UNUSED_PARAMETER")
+    suspend fun getDashboardTileAdBanner(width: Int): AdBanner {
+        throw IllegalStateException("Can't get ad banner (HMS)")
+    }
+}
+
+data class AdBanner(val view: View)

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

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

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

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

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

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

app/src/hms/java/io/github/wulkanowy/utils/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/IntegrityHelper.kt

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

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

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

app/src/hms/java/io/github/wulkanowy/utils/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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -9,6 +8,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <queries>
         <intent>
@@ -36,18 +37,21 @@
     <application
         android:name=".WulkanowyApp"
         android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
-        android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        android:resizeableActivity="true"
+        tools:ignore="DataExtractionRules,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
+            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" />
@@ -69,11 +73,12 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.MessageSend"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:noHistory="true"
             android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
             <intent-filter>
@@ -83,6 +88,7 @@
         <activity
             android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:noHistory="true"
             android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
             <intent-filter>
@@ -93,6 +99,22 @@
         <service
             android:name=".services.widgets.TimetableWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service
+            android:name=".services.piggyback.VulcanNotificationListenerService"
+            android:exported="true"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".services.messaging.AppMessagingService"
+            android:exported="false"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
 
         <receiver
             android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
@@ -107,6 +129,7 @@
         </receiver>
         <receiver
             android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider"
+            android:exported="true"
             android:label="@string/lucky_number_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -135,41 +158,17 @@
         <meta-data
             android:name="install_channel"
             android:value="${install_channel}" />
-
-        <!-- 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" />
-
-        <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" />
-
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="push_channel" />
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="${admob_project_id}" />
+        <meta-data
+            android:name="com.google.android.gms.ads.DELAY_APP_MEASUREMENT_INIT"
+            android:value="true" />
     </application>
 </manifest>

app/src/main/assets/contributors.json

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

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

@@ -1,17 +1,14 @@
 package io.github.wulkanowy
 
-import android.annotation.SuppressLint
 import android.app.Application
 import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
-import android.webkit.WebView
-import androidx.fragment.app.FragmentManager
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.yariksoffice.lingver.Lingver
 import dagger.hilt.android.HiltAndroidApp
-import fr.bipi.tressence.file.FileLoggerTree
+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.ActivityLifecycleLogger
@@ -20,15 +17,13 @@ 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
 
@@ -41,14 +36,24 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
-    @SuppressLint("UnsafeOptInUsageWarning")
+    @Inject
+    lateinit var remoteConfigHelper: RemoteConfigHelper
+
+    @Inject
+    lateinit var workerFactory: HiltWorkerFactory
+
+    override val workManagerConfiguration: Configuration
+        get() = Configuration.Builder()
+            .setWorkerFactory(workerFactory)
+            .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
+            .build()
+
     override fun onCreate() {
         super.onCreate()
-        FragmentManager.enableNewStateManager(false)
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
+        remoteConfigHelper.initialize()
         initLogging()
-        fixWebViewLocale()
     }
 
     private fun initLogging() {
@@ -79,18 +84,4 @@ class WulkanowyApp : Application(), Configuration.Provider {
             analyticsHelper.logEvent("language", "startup" to preferencesRepository.appLanguage)
         }
     }
-
-    private fun fixWebViewLocale() {
-        //https://stackoverflow.com/questions/40398528/android-webview-language-changes-abruptly-on-android-7-0-and-above
-        try {
-            WebView(this).destroy()
-        } catch (e: Throwable) {
-            //Ignore exceptions
-        }
-    }
-
-    override fun getWorkManagerConfiguration() = Configuration.Builder()
-        .setWorkerFactory(workerFactory)
-        .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
-        .build()
 }

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

@@ -2,62 +2,94 @@ package io.github.wulkanowy.data
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.content.res.AssetManager
-import android.content.res.Resources
 import androidx.preference.PreferenceManager
 import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
 import com.chuckerteam.chucker.api.RetentionManager
-import com.squareup.moshi.Moshi
 import com.fredporciuncula.flow.preferences.FlowSharedPreferences
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+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 kotlinx.coroutines.ExperimentalCoroutinesApi
-import timber.log.Timber
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.create
+import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-internal class RepositoryModule {
-
-    @Singleton
-    @Provides
-    fun provideSdk(chuckerCollector: ChuckerCollector, @ApplicationContext context: Context): Sdk {
-        return Sdk().apply {
-            androidVersion = android.os.Build.VERSION.RELEASE
-            buildTag = android.os.Build.MODEL
-            setSimpleHttpLogger { Timber.d(it) }
-
-            // for debug only
-            addInterceptor(
-                ChuckerInterceptor.Builder(context)
-                    .collector(chuckerCollector)
-                    .alwaysReadResponseBody(true)
-                    .build(), network = true
-            )
-        }
-    }
+internal class DataModule {
 
     @Singleton
     @Provides
     fun provideChuckerCollector(
         @ApplicationContext context: Context,
         prefRepository: PreferencesRepository
-    ): ChuckerCollector {
-        return ChuckerCollector(
-            context = context,
-            showNotification = prefRepository.isDebugNotificationEnable,
-            retentionPeriod = RetentionManager.Period.ONE_HOUR
-        )
-    }
+    ) = ChuckerCollector(
+        context = context,
+        showNotification = prefRepository.isDebugNotificationEnable,
+        retentionPeriod = RetentionManager.Period.ONE_HOUR
+    )
+
+    @Singleton
+    @Provides
+    fun provideChuckerInterceptor(
+        @ApplicationContext context: Context,
+        chuckerCollector: ChuckerCollector
+    ) = ChuckerInterceptor.Builder(context)
+        .collector(chuckerCollector)
+        .alwaysReadResponseBody(true)
+        .build()
+
+    @Singleton
+    @Provides
+    fun provideOkHttpClient(chuckerInterceptor: ChuckerInterceptor): OkHttpClient =
+        OkHttpClient.Builder()
+            .addNetworkInterceptor(chuckerInterceptor)
+            .addInterceptor(HttpLoggingInterceptor().apply {
+                level = HttpLoggingInterceptor.Level.BASIC
+            })
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .build()
+
+    @Singleton
+    @Provides
+    fun provideAdminMessageService(
+        okHttpClient: OkHttpClient,
+        json: Json,
+        appInfo: AppInfo
+    ): WulkanowyService = Retrofit.Builder()
+        .baseUrl(appInfo.messagesBaseUrl)
+        .client(okHttpClient)
+        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+        .build()
+        .create()
+
+    @Singleton
+    @Provides
+    fun provideSchoolsService(
+        okHttpClient: OkHttpClient,
+        json: Json,
+        appInfo: AppInfo,
+    ): SchoolsService = Retrofit.Builder()
+        .baseUrl(appInfo.schoolsBaseUrl)
+        .client(okHttpClient)
+        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+        .build()
+        .create()
 
     @Singleton
     @Provides
@@ -67,20 +99,11 @@ internal class RepositoryModule {
         appInfo: AppInfo
     ) = AppDatabase.newInstance(context, sharedPrefProvider, appInfo)
 
-    @Singleton
-    @Provides
-    fun provideResources(@ApplicationContext context: Context): Resources = context.resources
-
-    @Singleton
-    @Provides
-    fun provideAssets(@ApplicationContext context: Context): AssetManager = context.assets
-
     @Singleton
     @Provides
     fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences =
         PreferenceManager.getDefaultSharedPreferences(context)
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Singleton
     @Provides
     fun provideFlowSharedPref(sharedPreferences: SharedPreferences) =
@@ -88,7 +111,9 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideMoshi() = Moshi.Builder().build()
+    fun provideJson() = Json {
+        ignoreUnknownKeys = true
+    }
 
     @Singleton
     @Provides
@@ -165,7 +190,7 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
+    fun provideMailboxesDao(database: AppDatabase) = database.mailboxDao
 
     @Singleton
     @Provides
@@ -202,4 +227,20 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideSchoolAnnouncementDao(database: AppDatabase) = database.schoolAnnouncementDao
+
+    @Singleton
+    @Provides
+    fun provideNotificationDao(database: AppDatabase) = database.notificationDao
+
+    @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,23 +1,285 @@
 package io.github.wulkanowy.data
 
-data class Resource<T>(val status: Status, val data: T?, val error: Throwable?) {
-    companion object {
-        fun <T> success(data: T?): Resource<T> {
-            return Resource(Status.SUCCESS, data, null)
-        }
+import kotlinx.coroutines.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
 
-        fun <T> error(error: Throwable?, data: T? = null): Resource<T> {
-            return Resource(Status.ERROR, data, error)
-        }
+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>
 
-        fun <T> loading(data: T? = null): Resource<T> {
-            return Resource(Status.LOADING, data, null)
+    /**
+     * 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>()
+
+    /**
+     * 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>
+
+    /**
+     * 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
+        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?
+    get() = when (this) {
+        is Resource.Error -> this.error
+        else -> null
+    }
+
+fun <T> resourceFlow(block: suspend () -> T) = flow {
+    emit(Resource.Loading())
+    emit(Resource.Success(block()))
+}.catch { emit(Resource.Error(it)) }
+
+fun <T> flatResourceFlow(block: suspend () -> Flow<Resource<T>>) = flow {
+    emit(Resource.Loading())
+    emitAll(block().filter { it is Resource.Intermediate || it !is Resource.Loading })
+}.catch { emit(Resource.Error(it)) }
+
+fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
+    is Resource.Success -> Resource.Success(block(this.data))
+    is Resource.Intermediate -> Resource.Intermediate(block(this.data))
+    is Resource.Loading -> Resource.Loading()
+    is Resource.Error -> Resource.Error(this.error)
+}
+
+/**
+ * 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 ""
+        is Resource.Loading -> "started"
+        is Resource.Success -> "success" + if (showData) " (data: `${it.data}`)" else ""
+        is Resource.Error -> "exception occurred: ${it.error}"
+    }
+    Timber.i("$name: $description")
+}
+
+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)
+    }
 }
 
-enum class Status {
-    LOADING,
-    SUCCESS,
-    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 {
+    when (it) {
+        is Resource.Success -> block(it.data)
+        is Resource.Intermediate -> block(it.data)
+        is Resource.Error,
+        is Resource.Loading -> Unit
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceLoading(block: suspend () -> Unit) = onEach {
+    if (it is Resource.Loading) {
+        block()
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceIntermediate(block: suspend (T) -> Unit) = onEach {
+    if (it is Resource.Intermediate) {
+        block(it.data)
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceSuccess(block: suspend (T) -> Unit) = onEach {
+    if (it is Resource.Success) {
+        block(it.data)
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceError(block: suspend (Throwable) -> Unit) = onEach {
+    if (it is Resource.Error) {
+        block(it.error)
+    }
+}
+
+fun <T> Flow<Resource<T>>.onResourceNotLoading(block: suspend () -> Unit) = onEach {
+    if (it !is Resource.Loading) {
+        block()
+    }
+}
+
+suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it !is Resource.Loading }.first()
+
+suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it is Resource.Loading }.collect()
+
+// 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)
+                }
+
+                is Resource.Loading -> return@combine Resource.Loading()
+                is Resource.Error -> continue
+            }
+        }
+        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
+        }
+    })
+}
+
+
+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 <DatabaseType, ApiType, OutputType> networkBoundResource(
+    mutex: Mutex = Mutex(),
+    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()
+    if (shouldFetch(data)) {
+        emit(Resource.Intermediate(data))
+
+        try {
+            val newData = fetch()
+            mutex.withLock { saveFetchResult(query().first(), newData) }
+        } catch (throwable: Throwable) {
+            emit(Resource.Error(throwable))
+            return@flow
+        }
+    }
+
+    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,142 @@
+package io.github.wulkanowy.data
+
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import io.github.wulkanowy.data.db.dao.StudentDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentIsEduOne
+import io.github.wulkanowy.data.repositories.WulkanowyRepository
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.RemoteConfigHelper
+import io.github.wulkanowy.utils.WebkitCookieManagerProxy
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WulkanowySdkFactory @Inject constructor(
+    private val chuckerInterceptor: ChuckerInterceptor,
+    private val remoteConfig: RemoteConfigHelper,
+    private val webkitCookieManagerProxy: WebkitCookieManagerProxy,
+    private val studentDb: StudentDao,
+    private val wulkanowyRepository: WulkanowyRepository,
+) {
+
+    private val eduOneMutex = Mutex()
+    private val migrationFailedStudentIds = mutableSetOf<Long>()
+
+    private val sdk = Sdk().apply {
+        androidVersion = android.os.Build.VERSION.RELEASE
+        buildTag = android.os.Build.MODEL
+        userAgentTemplate = remoteConfig.userAgentTemplate
+        setSimpleHttpLogger { Timber.d(it) }
+        setAdditionalCookieManager(webkitCookieManagerProxy)
+
+        // for debug only
+        addInterceptor(chuckerInterceptor, network = true)
+    }
+
+    fun createBase() = sdk
+
+    suspend fun create(): Sdk {
+        val mapping = wulkanowyRepository.getMapping()
+
+        return createBase().apply {
+            if (mapping != null) {
+                endpointsMapping = mapping.endpoints
+                vTokenMapping = mapping.vTokens
+            }
+        }
+    }
+
+    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,14 @@
+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>>>,
+)

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

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

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

@@ -0,0 +1,16 @@
+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 WulkanowyService {
+
+    @GET("/v1.json")
+    suspend fun getAdminMessages(): List<AdminMessage>
+
+    @GET("/mapping1.json")
+    suspend fun getMapping(): Mapping
+}

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

@@ -1,30 +1,35 @@
 package io.github.wulkanowy.data.db
 
 import android.content.Context
+import androidx.room.AutoMigration
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
+import io.github.wulkanowy.data.db.dao.AdminMessageDao
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ConferenceDao
-import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
 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.ReportingUnitDao
+import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
 import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
@@ -34,26 +39,30 @@ 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.SchoolAnnouncement
 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.ReportingUnit
 import io.github.wulkanowy.data.db.entities.School
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentInfo
@@ -95,8 +104,23 @@ 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
@@ -124,7 +148,7 @@ import javax.inject.Singleton
         Subject::class,
         LuckyNumber::class,
         CompletedLesson::class,
-        ReportingUnit::class,
+        Mailbox::class,
         Recipient::class,
         MobileDevice::class,
         Teacher::class,
@@ -134,6 +158,26 @@ import javax.inject.Singleton
         StudentInfo::class,
         TimetableHeader::class,
         SchoolAnnouncement::class,
+        Notification::class,
+        AdminMessage::class,
+        MutedMessageSender::class,
+        GradeDescriptive::class,
+    ],
+    autoMigrations = [
+        AutoMigration(from = 44, to = 45),
+        AutoMigration(from = 46, to = 47),
+        AutoMigration(from = 47, to = 48),
+        AutoMigration(from = 51, to = 52),
+        AutoMigration(from = 54, to = 55, spec = Migration55::class),
+        AutoMigration(from = 55, to = 56),
+        AutoMigration(from = 56, to = 57, spec = Migration57::class),
+        AutoMigration(from = 57, to = 58, spec = Migration58::class),
+        AutoMigration(from = 58, to = 59),
+        AutoMigration(from = 59, to = 60),
+        AutoMigration(from = 60, to = 61),
+        AutoMigration(from = 61, to = 62),
+        AutoMigration(from = 62, to = 63, spec = Migration63::class),
+        AutoMigration(from = 63, to = 64),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -142,7 +186,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 39
+        const val VERSION_SCHEMA = 64
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -183,6 +227,17 @@ abstract class AppDatabase : RoomDatabase() {
             Migration37(),
             Migration38(),
             Migration39(),
+            Migration40(),
+            Migration41(sharedPrefProvider),
+            Migration42(),
+            Migration43(),
+            Migration44(),
+            Migration46(),
+            Migration49(),
+            Migration50(),
+            Migration51(),
+            Migration53(),
+            Migration54(),
         )
 
         fun newInstance(
@@ -233,7 +288,7 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val completedLessonsDao: CompletedLessonsDao
 
-    abstract val reportingUnitDao: ReportingUnitDao
+    abstract val mailboxDao: MailboxDao
 
     abstract val recipientDao: RecipientDao
 
@@ -252,4 +307,12 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val timetableHeaderDao: TimetableHeaderDao
 
     abstract val schoolAnnouncementDao: SchoolAnnouncementDao
+
+    abstract val notificationDao: NotificationDao
+
+    abstract val adminMessagesDao: AdminMessageDao
+
+    abstract val mutedMessageSendersDao: MutedMessageSendersDao
+
+    abstract val gradeDescriptiveDao: GradeDescriptiveDao
 }

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

@@ -1,47 +1,37 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
-import io.github.wulkanowy.data.db.adapters.PairAdapterFactory
+import io.github.wulkanowy.data.enums.MessageType
+import io.github.wulkanowy.ui.modules.Destination
+import io.github.wulkanowy.utils.toTimestamp
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.time.*
+import java.util.*
 import java.time.Instant
 import java.time.LocalDate
-import java.time.LocalDateTime
 import java.time.Month
 import java.time.ZoneOffset
-import java.util.Date
+import java.util.*
 
 class Converters {
 
-    private val moshi by lazy { Moshi.Builder().add(PairAdapterFactory).build() }
-
-    private val integerListAdapter by lazy {
-        moshi.adapter<List<Int>>(Types.newParameterizedType(List::class.java, Integer::class.java))
-    }
-
-    private val stringListPairAdapter by lazy {
-        moshi.adapter<List<Pair<String, String>>>(Types.newParameterizedType(List::class.java, Pair::class.java, String::class.java, String::class.java))
-    }
+    private val json = Json
 
     @TypeConverter
-    fun timestampToDate(value: Long?): LocalDate? = value?.run {
-        Date(value).toInstant().atZone(ZoneOffset.UTC).toLocalDate()
-    }
+    fun timestampToLocalDate(value: Long?): LocalDate? =
+        value?.let(::Date)?.toInstant()?.atZone(ZoneOffset.UTC)?.toLocalDate()
 
     @TypeConverter
-    fun dateToTimestamp(date: LocalDate?): Long? {
-        return date?.atStartOfDay()?.toInstant(ZoneOffset.UTC)?.toEpochMilli()
-    }
+    fun dateToTimestamp(date: LocalDate?): Long? = date?.toTimestamp()
 
     @TypeConverter
-    fun timestampToTime(value: Long?): LocalDateTime? = value?.let {
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(value), ZoneOffset.UTC)
-    }
+    fun instantToTimestamp(instant: Instant?): Long? = instant?.toEpochMilli()
 
     @TypeConverter
-    fun timeToTimestamp(date: LocalDateTime?): Long? {
-        return date?.atZone(ZoneOffset.UTC)?.toInstant()?.toEpochMilli()
-    }
+    fun timestampToInstant(timestamp: Long?): Instant? = timestamp?.let(Instant::ofEpochMilli)
 
     @TypeConverter
     fun monthToInt(month: Month?) = month?.value
@@ -51,21 +41,37 @@ class Converters {
 
     @TypeConverter
     fun intListToJson(list: List<Int>): String {
-        return integerListAdapter.toJson(list)
+        return json.encodeToString(list)
     }
 
     @TypeConverter
     fun jsonToIntList(value: String): List<Int> {
-        return integerListAdapter.fromJson(value).orEmpty()
+        return json.decodeFromString(value)
     }
 
     @TypeConverter
     fun stringPairListToJson(list: List<Pair<String, String>>): String {
-        return stringListPairAdapter.toJson(list)
+        return json.encodeToString(list)
     }
 
     @TypeConverter
     fun jsonToStringPairList(value: String): List<Pair<String, String>> {
-        return stringListPairAdapter.fromJson(value).orEmpty()
+        return try {
+            json.decodeFromString(value)
+        } catch (e: SerializationException) {
+            emptyList() // handle errors from old gson Pair serialized data
+        }
     }
+
+    @TypeConverter
+    fun destinationToString(destination: Destination) = json.encodeToString(destination)
+
+    @TypeConverter
+    fun stringToDestination(destination: String): Destination = json.decodeFromString(destination)
+
+    @TypeConverter
+    fun messageTypesToString(types: List<MessageType>): String = json.encodeToString(types)
+
+    @TypeConverter
+    fun stringToMessageTypes(text: String): List<MessageType> = json.decodeFromString(text)
 }

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

@@ -22,11 +22,14 @@ class SharedPrefProvider @Inject constructor(
 
     fun getString(key: String) = sharedPref.getString(key, null)
 
-    fun getString(key: String, defaultValue: String): String = sharedPref.getString(key, defaultValue) ?: defaultValue
+    fun getString(key: String, defaultValue: String): String =
+        sharedPref.getString(key, defaultValue) ?: defaultValue
 
-    fun getBoolean(key: String, defaultValue: Boolean): Boolean = sharedPref.getBoolean(key, defaultValue)
+    fun getBoolean(key: String, defaultValue: Boolean): Boolean =
+        sharedPref.getBoolean(key, defaultValue)
 
-    fun putBoolean(key: String, value: Boolean, sync: Boolean = false) = sharedPref.edit(sync) { putBoolean(key, value) }
+    fun putBoolean(key: String, value: Boolean, sync: Boolean = false) =
+        sharedPref.edit(sync) { putBoolean(key, value) }
 
     fun putString(key: String, value: String?, sync: Boolean = false) {
         sharedPref.edit(sync) { putString(key, value) }

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

@@ -1,68 +0,0 @@
-package io.github.wulkanowy.data.db.adapters
-
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.JsonReader
-import com.squareup.moshi.JsonWriter
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
-import java.lang.reflect.ParameterizedType
-import java.lang.reflect.Type
-
-object PairAdapterFactory : JsonAdapter.Factory {
-
-    override fun create(type: Type, annotations: MutableSet<out Annotation>, moshi: Moshi): JsonAdapter<*>? {
-        if (type !is ParameterizedType || List::class.java != type.rawType) return null
-        if (type.actualTypeArguments[0] != Pair::class.java) return null
-
-        val listType = Types.newParameterizedType(List::class.java, Map::class.java, String::class.java)
-        val listAdapter = moshi.adapter<List<Map<String, String>>>(listType)
-
-        val mapType = Types.newParameterizedType(MutableMap::class.java, String::class.java, String::class.java)
-        val mapAdapter = moshi.adapter<Map<String, String>>(mapType)
-
-        return PairAdapter(listAdapter, mapAdapter)
-    }
-
-    private class PairAdapter(
-        private val listAdapter: JsonAdapter<List<Map<String, String>>>,
-        private val mapAdapter: JsonAdapter<Map<String, String>>,
-    ) : JsonAdapter<List<Pair<String, String>>>() {
-
-        override fun toJson(writer: JsonWriter, value: List<Pair<String, String>>?) {
-            writer.beginArray()
-            value?.forEach {
-                writer.beginObject()
-                writer.name("first").value(it.first)
-                writer.name("second").value(it.second)
-                writer.endObject()
-            }
-            writer.endArray()
-        }
-
-        override fun fromJson(reader: JsonReader): List<Pair<String, String>>? {
-            return if (reader.peek() == JsonReader.Token.BEGIN_OBJECT) deserializeMoshiMap(reader)
-            else deserializeGsonPair(reader)
-        }
-
-        // for compatibility with 0.21.0
-        private fun deserializeMoshiMap(reader: JsonReader): List<Pair<String, String>>? {
-            val map = mapAdapter.fromJson(reader) ?: return null
-
-            return map.entries.map {
-                it.key to it.value
-            }
-        }
-
-        private fun deserializeGsonPair(reader: JsonReader): List<Pair<String, String>>? {
-            val list = listAdapter.fromJson(reader) ?: return null
-
-            return list.map {
-                require(it.size == 2) {
-                    "pair with more or less than two elements: $list"
-                }
-
-                it["first"].orEmpty() to it["second"].orEmpty()
-            }
-        }
-    }
-}

app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.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.AdminMessage
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface AdminMessageDao : BaseDao<AdminMessage> {
+
+    @Query("SELECT * FROM AdminMessages")
+    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
@@ -11,6 +12,11 @@ import javax.inject.Singleton
 @Dao
 interface AttendanceDao : BaseDao<Attendance> {
 
-    @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Attendance>>
+    @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :start AND date <= :end")
+    fun loadAll(
+        diaryId: Int,
+        studentId: Int,
+        start: LocalDate,
+        end: LocalDate
+    ): Flow<List<Attendance>>
 }

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

@@ -2,11 +2,13 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Delete
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Transaction
 import androidx.room.Update
 
 interface BaseDao<T> {
 
-    @Insert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(items: List<T>): List<Long>
 
     @Update
@@ -14,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/ConferenceDao.kt

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

app/src/main/java/io/github/wulkanowy/data/db/dao/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/MailboxDao.kt

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

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

@@ -5,15 +5,26 @@ 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 student_id = :studentId AND message_id = :messageId")
-    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Flow<MessageWithAttachment?>
+    @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>>
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun loadAll(studentId: Int, folder: Int): Flow<List<Message>>
+    @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>>
+
+    @Query("SELECT * FROM Messages WHERE email = :email AND folder_id = :folder ORDER BY date DESC")
+    fun loadAll(folder: Int, email: String): Flow<List<Message>>
 }

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

@@ -8,6 +8,6 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
-    @Query("SELECT * FROM MobileDevices WHERE student_id = :userLoginId ORDER BY date DESC")
-    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/NotificationDao.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.Notification
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface NotificationDao : BaseDao<Notification> {
+
+    @Query("SELECT * FROM Notifications WHERE student_id = :studentId OR student_id = -1")
+    fun loadAll(studentId: Long): Flow<List<Notification>>
+}