Merge branch 'release/2.2.5'

.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 -PdisablePreDex
+          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
 
 workflows:
   version: 2

.github/FUNDING.yml

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

.github/workflows/deploy-store.yml

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

.github/workflows/deploy-test.yml

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

.gitignore

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

.travis.yml

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

app/build.gradle

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

app/jacoco.gradle

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

app/play-publish-lint.sh

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

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

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

app/src/debug/agconnect-services.json

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

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

@@ -5,7 +5,6 @@ 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")
@@ -14,11 +13,9 @@ class AdsHelper @Inject constructor(
     private val preferencesRepository: PreferencesRepository
 ) {
 
-    val isMobileAdsSdkInitialized = MutableStateFlow(false)
-    val canShowAd = false
-
     fun initialize() {
         preferencesRepository.isAdsEnabled = false
+        preferencesRepository.isAgreeToProcessData = false
         preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
     }
 

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

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

app/src/main/AndroidManifest.xml

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

app/src/main/assets/contributors.json

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

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

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

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

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

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

@@ -1,73 +1,27 @@
 package io.github.wulkanowy.data
 
-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.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
 
-sealed 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>
+sealed class Resource<T> {
+
+    open class Loading<T> : Resource<T>()
 
-    /**
-     * A semi-loading state with some data available to be displayed (usually cached data loaded from
-     * the database). Still not the target state and it's expected to transition into another one soon.
-     */
     data class Intermediate<T>(val data: T) : Loading<T>()
 
-    /**
-     * The happy-path target state. Data can either be:
-     * - loaded from the database - while it may seem like this case is already handled by the
-     *   Intermediate state, the difference here is semantic. Cached data is returned as Intermediate
-     *   when there's a API request in progress (or soon expected to be), however when there is no
-     *   intention of immediately querying the API, the cached data is returned as a Success.
-     * - fetched from the API.
-     */
-    data class Success<T>(val data: T) : Resource<T>
+    data class 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>
+    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
+        is Resource.Loading -> null
+        is Resource.Error -> null
     }
 
 val <T> Resource<T>.errorOrNull: Throwable?
@@ -93,22 +47,6 @@ fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
     is Resource.Error -> Resource.Error(this.error)
 }
 
-/**
- * Injects another flow into this flow's resource data.
- */
-inline fun <T1, T2, R> Flow<Resource<T1>>.combineWithResourceData(
-    flow: Flow<T2>,
-    crossinline block: suspend (T1, T2) -> R
-): Flow<Resource<R>> =
-    combine(flow) { resource, inject ->
-        when (resource) {
-            is Resource.Success -> Resource.Success(block(resource.data, inject))
-            is Resource.Intermediate -> Resource.Intermediate(block(resource.data, inject))
-            is Resource.Loading -> Resource.Loading()
-            is Resource.Error -> Resource.Error(resource.error)
-        }
-    }
-
 fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = false) = onEach {
     val description = when (it) {
         is Resource.Intermediate -> "intermediate data received" + if (showData) " (data: `${it.data}`)" else ""
@@ -119,29 +57,8 @@ fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = fa
     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)
-    }
-}
-
-@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, U> Flow<Resource<T>>.mapResourceData(block: (T) -> U) = map {
+    it.mapData(block)
 }
 
 fun <T> Flow<Resource<T>>.onResourceData(block: suspend (T) -> Unit) = onEach {
@@ -171,13 +88,13 @@ fun <T> Flow<Resource<T>>.onResourceSuccess(block: suspend (T) -> Unit) = onEach
     }
 }
 
-fun <T> Flow<Resource<T>>.onResourceError(block: suspend (Throwable) -> Unit) = onEach {
+fun <T> Flow<Resource<T>>.onResourceError(block: (Throwable) -> Unit) = onEach {
     if (it is Resource.Error) {
         block(it.error)
     }
 }
 
-fun <T> Flow<Resource<T>>.onResourceNotLoading(block: suspend () -> Unit) = onEach {
+fun <T> Flow<Resource<T>>.onResourceNotLoading(block: () -> Unit) = onEach {
     if (it !is Resource.Loading) {
         block()
     }
@@ -187,99 +104,70 @@ suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it !is Resource.Loa
 
 suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it is Resource.Loading }.collect()
 
-// 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(
+inline fun <ResultType, RequestType> 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,
+    showSavedOnLoading: Boolean = true,
+    crossinline isResultEmpty: (ResultType) -> Boolean,
+    crossinline query: () -> Flow<ResultType>,
+    crossinline fetch: suspend (ResultType) -> RequestType,
+    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
+    crossinline onFetchFailed: (Throwable) -> Unit = { },
+    crossinline shouldFetch: (ResultType) -> Boolean = { true },
+    crossinline filterResult: (ResultType) -> ResultType = { it }
 ) = flow {
     emit(Resource.Loading())
 
     val data = query().first()
-    if (shouldFetch(data)) {
-        emit(Resource.Intermediate(data))
+    emitAll(if (shouldFetch(data)) {
+        val filteredResult = filterResult(data)
+
+        if (showSavedOnLoading && !isResultEmpty(filteredResult)) {
+            emit(Resource.Intermediate(filteredResult))
+        }
 
         try {
-            val newData = fetch()
+            val newData = fetch(data)
             mutex.withLock { saveFetchResult(query().first(), newData) }
+            query().map { Resource.Success(filterResult(it)) }
         } catch (throwable: Throwable) {
-            emit(Resource.Error(throwable))
-            return@flow
+            onFetchFailed(throwable)
+            query().map { Resource.Error(throwable) }
         }
-    }
-
-    emitAll(query().map { Resource.Success(it) })
+    } else {
+        query().map { Resource.Success(filterResult(it)) }
+    })
+}
+
+@JvmName("networkBoundResourceWithMap")
+inline fun <ResultType, RequestType, T> networkBoundResource(
+    mutex: Mutex = Mutex(),
+    showSavedOnLoading: Boolean = true,
+    crossinline isResultEmpty: (T) -> Boolean,
+    crossinline query: () -> Flow<ResultType>,
+    crossinline fetch: suspend (ResultType) -> RequestType,
+    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
+    crossinline onFetchFailed: (Throwable) -> Unit = { },
+    crossinline shouldFetch: (ResultType) -> Boolean = { true },
+    crossinline mapResult: (ResultType) -> T,
+) = flow {
+    emit(Resource.Loading())
+
+    val data = query().first()
+    emitAll(if (shouldFetch(data)) {
+        val mappedResult = mapResult(data)
+
+        if (showSavedOnLoading && !isResultEmpty(mappedResult)) {
+            emit(Resource.Intermediate(mappedResult))
+        }
+        try {
+            val newData = fetch(data)
+            mutex.withLock { saveFetchResult(query().first(), newData) }
+            query().map { Resource.Success(mapResult(it)) }
+        } catch (throwable: Throwable) {
+            onFetchFailed(throwable)
+            query().map { Resource.Error(throwable) }
+        }
+    } else {
+        query().map { Resource.Success(mapResult(it)) }
+    })
 }
-    .mapResourceData { mapResult(it) }
-    .filterNot { it is Resource.Intermediate && isResultEmpty(it.data) }

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

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

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

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

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

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

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

@@ -3,7 +3,6 @@ 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> {
@@ -16,10 +15,4 @@ interface BaseDao<T> {
 
     @Delete
     suspend fun deleteAll(items: List<T>)
-
-    @Transaction
-    suspend fun removeOldAndSaveNew(oldItems: List<T>, newItems: List<T>) {
-        deleteAll(oldItems)
-        insertAll(newItems)
-    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,5 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
@@ -13,11 +12,13 @@ import io.github.wulkanowy.data.mappers.mapPointsToStatisticsItems
 import io.github.wulkanowy.data.mappers.mapSemesterToStatisticItems
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
-import java.util.Locale
+import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -26,7 +27,7 @@ class GradeStatisticsRepository @Inject constructor(
     private val gradePartialStatisticsDb: GradePartialStatisticsDao,
     private val gradePointsStatisticsDb: GradePointsStatisticsDao,
     private val gradeSemesterStatisticsDb: GradeSemesterStatisticsDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -54,15 +55,14 @@ class GradeStatisticsRepository @Inject constructor(
         },
         query = { gradePartialStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesPartialStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            gradePartialStatisticsDb.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = new uniqueSubtract old,
-            )
+            gradePartialStatisticsDb.deleteAll(old uniqueSubtract new)
+            gradePartialStatisticsDb.insertAll(new uniqueSubtract old)
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(partialCacheKey, semester))
         },
         mapResult = { items ->
@@ -79,7 +79,6 @@ class GradeStatisticsRepository @Inject constructor(
                     )
                     listOf(summaryItem) + items
                 }
-
                 else -> items.filter { it.subject == subjectName }
             }.mapPartialToStatisticItems()
         }
@@ -101,15 +100,14 @@ class GradeStatisticsRepository @Inject constructor(
         },
         query = { gradeSemesterStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesSemesterStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            gradeSemesterStatisticsDb.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = new uniqueSubtract old,
-            )
+            gradeSemesterStatisticsDb.deleteAll(old uniqueSubtract new)
+            gradeSemesterStatisticsDb.insertAll(new uniqueSubtract old)
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(semesterCacheKey, semester))
         },
         mapResult = { items ->
@@ -139,7 +137,6 @@ class GradeStatisticsRepository @Inject constructor(
                     }
                     listOf(summaryItem) + itemsWithAverage
                 }
-
                 else -> itemsWithAverage.filter { it.subject == subjectName }
             }.mapSemesterToStatisticItems()
         }
@@ -159,15 +156,14 @@ class GradeStatisticsRepository @Inject constructor(
         },
         query = { gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesPointsStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            gradePointsStatisticsDb.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = new uniqueSubtract old,
-            )
+            gradePointsStatisticsDb.deleteAll(old uniqueSubtract new)
+            gradePointsStatisticsDb.insertAll(new uniqueSubtract old)
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(pointsCacheKey, semester))
         },
         mapResult = { items ->

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

@@ -1,17 +1,13 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
@@ -20,7 +16,7 @@ import javax.inject.Singleton
 @Singleton
 class HomeworkRepository @Inject constructor(
     private val homeworkDb: HomeworkDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -53,19 +49,20 @@ class HomeworkRepository @Inject constructor(
             )
         },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getHomework(start.monday, end.sunday)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
+            val homeWorkToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
             val filteredOld = old.filterNot { it.isAddedByUser }
 
-            homeworkDb.removeOldAndSaveNew(
-                oldItems = filteredOld uniqueSubtract new,
-                newItems = (new uniqueSubtract old).onEach {
-                    if (notify) it.isNotified = false
-                },
-            )
+            homeworkDb.deleteAll(filteredOld uniqueSubtract new)
+            homeworkDb.insertAll(homeWorkToSave)
+
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         }
     )

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

@@ -1,11 +1,12 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.networkBoundResource
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
@@ -17,7 +18,7 @@ import javax.inject.Singleton
 @Singleton
 class LuckyNumberRepository @Inject constructor(
     private val luckyNumberDb: LuckyNumberDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -32,18 +33,14 @@ class LuckyNumberRepository @Inject constructor(
         shouldFetch = { it == null || forceRefresh },
         query = { luckyNumberDb.load(student.studentId, now()) },
         fetch = {
-            wulkanowySdkFactory.create(student)
-                .getLuckyNumber(student.schoolShortName)
-                ?.mapToEntity(student)
+            sdk.init(student).getLuckyNumber(student.schoolShortName)?.mapToEntity(student)
         },
-        saveFetchResult = { oldLuckyNumber, newLuckyNumber ->
-            newLuckyNumber ?: return@networkBoundResource
-
-            if (newLuckyNumber != oldLuckyNumber) {
-                luckyNumberDb.removeOldAndSaveNew(
-                    oldItems = listOfNotNull(oldLuckyNumber),
-                    newItems = listOf(newLuckyNumber.apply { if (notify) isNotified = false }),
-                )
+        saveFetchResult = { old, new ->
+            if (new != old) {
+                old?.let { luckyNumberDb.deleteAll(listOfNotNull(it)) }
+                luckyNumberDb.insertAll(listOfNotNull((new?.apply {
+                    if (notify) isNotified = false
+                })))
             }
         }
     )

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

@@ -4,22 +4,17 @@ import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MailboxDao
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.dao.MutedMessageSendersDao
 import io.github.wulkanowy.data.db.entities.Mailbox
 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 io.github.wulkanowy.data.db.entities.MutedMessageSender
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.enums.MessageFolder.SENT
 import io.github.wulkanowy.data.enums.MessageFolder.TRASHED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
@@ -27,14 +22,16 @@ import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.pojos.MessageDraft
-import io.github.wulkanowy.data.toFirstResult
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.domain.messages.GetMailboxByStudentUseCase
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -45,9 +42,8 @@ import javax.inject.Singleton
 @Singleton
 class MessageRepository @Inject constructor(
     private val messagesDb: MessagesDao,
-    private val mutedMessageSendersDao: MutedMessageSendersDao,
     private val messageAttachmentDao: MessageAttachmentDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     @ApplicationContext private val context: Context,
     private val refreshHelper: AutoRefreshHelper,
     private val sharedPrefProvider: SharedPrefProvider,
@@ -55,6 +51,7 @@ class MessageRepository @Inject constructor(
     private val mailboxDao: MailboxDao,
     private val getMailboxByStudentUseCase: GetMailboxByStudentUseCase,
 ) {
+
     private val saveFetchResultMutex = Mutex()
 
     private val messagesCacheKey = "message"
@@ -66,7 +63,7 @@ class MessageRepository @Inject constructor(
         folder: MessageFolder,
         forceRefresh: Boolean,
         notify: Boolean = false,
-    ): Flow<Resource<List<MessageWithMutedAuthor>>> = networkBoundResource(
+    ): Flow<Resource<List<Message>>> = networkBoundResource(
         mutex = saveFetchResultMutex,
         isResultEmpty = { it.isEmpty() },
         shouldFetch = {
@@ -77,30 +74,21 @@ class MessageRepository @Inject constructor(
         },
         query = {
             if (mailbox == null) {
-                messagesDb.loadMessagesWithMutedAuthor(folder.id, student.email)
-            } else messagesDb.loadMessagesWithMutedAuthor(mailbox.globalKey, folder.id)
+                messagesDb.loadAll(folder.id, student.email)
+            } else messagesDb.loadAll(mailbox.globalKey, folder.id)
         },
         fetch = {
-            wulkanowySdkFactory.create(student)
-                .getMessages(
-                    folder = Folder.valueOf(folder.name),
-                    mailboxKey = mailbox?.globalKey,
-                )
-                .mapToEntities(
-                    student = student,
-                    mailbox = mailbox,
-                    allMailboxes = mailboxDao.loadAll(student.email)
-                )
+            sdk.init(student).getMessages(
+                folder = Folder.valueOf(folder.name),
+                mailboxKey = mailbox?.globalKey,
+            ).mapToEntities(student, mailbox, mailboxDao.loadAll(student.email))
         },
-        saveFetchResult = { oldWithAuthors, new ->
-            val old = oldWithAuthors.map { it.message }
-            messagesDb.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = (new uniqueSubtract old).onEach {
-                    val muted = isMuted(it.correspondents)
-                    it.isNotified = !notify || muted
-                },
-            )
+        saveFetchResult = { old, new ->
+            messagesDb.deleteAll(old uniqueSubtract new)
+            messagesDb.insertAll((new uniqueSubtract old).onEach {
+                it.isNotified = !notify
+            })
+
             refreshHelper.updateLastRefreshTimestamp(
                 getRefreshKey(messagesCacheKey, mailbox, folder)
             )
@@ -118,13 +106,14 @@ class MessageRepository @Inject constructor(
             Timber.d("Message content in db empty: ${it.message.content.isBlank()}")
             (it.message.unread && markAsRead) || it.message.content.isBlank()
         },
-        query = { messagesDb.loadMessageWithAttachment(message.messageGlobalKey) },
+        query = {
+            messagesDb.loadMessageWithAttachment(message.messageGlobalKey)
+        },
         fetch = {
-            wulkanowySdkFactory.create(student)
-                .getMessageDetails(
-                    messageKey = message.messageGlobalKey,
-                    markAsRead = message.unread && markAsRead,
-                )
+            sdk.init(student).getMessageDetails(
+                messageKey = it!!.message.messageGlobalKey,
+                markAsRead = message.unread && markAsRead,
+            )
         },
         saveFetchResult = { old, new ->
             checkNotNull(old) { "Fetched message no longer exist!" }
@@ -163,36 +152,22 @@ class MessageRepository @Inject constructor(
         subject: String,
         content: String,
         recipients: List<Recipient>,
-        mailbox: Mailbox,
+        mailboxId: String,
     ) {
-        wulkanowySdkFactory.create(student)
-            .sendMessage(
-                subject = subject,
-                content = content,
-                recipients = recipients.mapFromEntities(),
-                mailboxId = mailbox.globalKey,
-            )
-        refreshFolders(student, mailbox, listOf(SENT))
+        sdk.init(student).sendMessage(
+            subject = subject,
+            content = content,
+            recipients = recipients.mapFromEntities(),
+            mailboxId = mailboxId,
+        )
     }
 
-    suspend fun restoreMessages(student: Student, mailbox: Mailbox?, messages: List<Message>) {
-        wulkanowySdkFactory.create(student)
-            .restoreMessages(messages = messages.map { it.messageGlobalKey })
-
-        refreshFolders(student, mailbox)
-    }
-
-    suspend fun deleteMessage(student: Student, message: Message) {
-        deleteMessages(student, listOf(message))
-    }
-
-    suspend fun deleteMessages(student: Student, messages: List<Message>) {
+    suspend fun deleteMessages(student: Student, mailbox: Mailbox?, messages: List<Message>) {
         val firstMessage = messages.first()
-        wulkanowySdkFactory.create(student)
-            .deleteMessages(
-                messages = messages.map { it.messageGlobalKey },
-                removeForever = firstMessage.folderId == TRASHED.id,
-            )
+        sdk.init(student).deleteMessages(
+            messages = messages.map { it.messageGlobalKey },
+            removeForever = firstMessage.folderId == TRASHED.id,
+        )
 
         if (firstMessage.folderId != TRASHED.id) {
             val deletedMessages = messages.map {
@@ -206,24 +181,18 @@ class MessageRepository @Inject constructor(
             }
 
             messagesDb.updateAll(deletedMessages)
-        } else {
-            messagesDb.deleteAll(messages)
-        }
+        } else messagesDb.deleteAll(messages)
+
+        getMessages(
+            student = student,
+            mailbox = mailbox,
+            folder = TRASHED,
+            forceRefresh = true,
+        ).first()
     }
 
-    private suspend fun refreshFolders(
-        student: Student,
-        mailbox: Mailbox?,
-        folders: List<MessageFolder> = MessageFolder.entries
-    ) {
-        folders.forEach {
-            getMessages(
-                student = student,
-                mailbox = mailbox,
-                folder = it,
-                forceRefresh = true,
-            ).toFirstResult()
-        }
+    suspend fun deleteMessage(student: Student, mailbox: Mailbox?, message: Message) {
+        deleteMessages(student, mailbox, listOf(message))
     }
 
     suspend fun getMailboxes(student: Student, forceRefresh: Boolean) = networkBoundResource(
@@ -237,9 +206,7 @@ class MessageRepository @Inject constructor(
         },
         query = { mailboxDao.loadAll(student.email, student.symbol, student.schoolSymbol) },
         fetch = {
-            wulkanowySdkFactory.create(student)
-                .getMailboxes()
-                .mapToEntities(student)
+            sdk.init(student).getMailboxes().mapToEntities(student)
         },
         saveFetchResult = { old, new ->
             mailboxDao.deleteAll(old uniqueSubtract new)
@@ -269,18 +236,4 @@ class MessageRepository @Inject constructor(
             context.getString(R.string.pref_key_message_draft),
             value?.let { json.encodeToString(it) }
         )
-
-    private suspend fun isMuted(author: String): Boolean {
-        return mutedMessageSendersDao.checkMute(author)
-    }
-
-    suspend fun muteMessage(author: String) {
-        if (isMuted(author)) return
-        mutedMessageSendersDao.insertMute(MutedMessageSender(author))
-    }
-
-    suspend fun unmuteMessage(author: String) {
-        if (!isMuted(author)) return
-        mutedMessageSendersDao.deleteMute(author)
-    }
 }

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

@@ -1,6 +1,5 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
@@ -9,8 +8,10 @@ import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.mappers.mapToMobileDeviceToken
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -19,7 +20,7 @@ import javax.inject.Singleton
 @Singleton
 class MobileDeviceRepository @Inject constructor(
     private val mobileDb: MobileDeviceDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -40,28 +41,30 @@ class MobileDeviceRepository @Inject constructor(
         },
         query = { mobileDb.loadAll(student.userLoginId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getRegisteredDevices()
                 .mapToEntities(student)
         },
         saveFetchResult = { old, new ->
-            mobileDb.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = new uniqueSubtract old,
-            )
+            mobileDb.deleteAll(old uniqueSubtract new)
+            mobileDb.insertAll(new uniqueSubtract old)
+
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
         }
     )
 
     suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
-        wulkanowySdkFactory.create(student, semester)
+        sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .unregisterDevice(device.deviceId)
 
         mobileDb.deleteAll(listOf(device))
     }
 
     suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
-        return wulkanowySdkFactory.create(student, semester)
+        return sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .getToken()
             .mapToMobileDeviceToken()
     }

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

@@ -1,16 +1,13 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.toLocalDate
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -19,7 +16,7 @@ import javax.inject.Singleton
 @Singleton
 class NoteRepository @Inject constructor(
     private val noteDb: NoteDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -43,21 +40,20 @@ class NoteRepository @Inject constructor(
         },
         query = { noteDb.loadAll(student.studentId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getNotes()
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            val notesToAdd = (new uniqueSubtract old).onEach {
+            noteDb.deleteAll(old uniqueSubtract new)
+            noteDb.insertAll((new uniqueSubtract old).onEach {
                 if (it.date >= student.registrationDate.toLocalDate()) it.apply {
                     isRead = false
                     if (notify) isNotified = false
                 }
-            }
-            noteDb.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = notesToAdd,
-            )
+            })
+
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )

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

@@ -9,13 +9,7 @@ import com.fredporciuncula.flow.preferences.Preference
 import com.fredporciuncula.flow.preferences.Serializer
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.enums.AppTheme
-import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode
-import io.github.wulkanowy.data.enums.GradeColorTheme
-import io.github.wulkanowy.data.enums.GradeExpandMode
-import io.github.wulkanowy.data.enums.GradeSortingMode
-import io.github.wulkanowy.data.enums.TimetableGapsMode
-import io.github.wulkanowy.data.enums.TimetableMode
+import io.github.wulkanowy.data.enums.*
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
 import io.github.wulkanowy.ui.modules.settings.appearance.menuorder.AppMenuItem
@@ -24,7 +18,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.Instant
-import java.util.UUID
+import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -42,27 +36,6 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_attendance_present
         )
 
-    val targetAttendanceFlow: Flow<Int>
-        get() = flowSharedPref.getInt(
-            context.getString(R.string.pref_key_attendance_target),
-            context.resources.getInteger(R.integer.pref_default_attendance_target)
-        ).asFlow()
-
-    val attendanceCalculatorSortingModeFlow: Flow<AttendanceCalculatorSortingMode>
-        get() = flowSharedPref.getString(
-            context.getString(R.string.pref_key_attendance_calculator_sorting_mode),
-            context.resources.getString(R.string.pref_default_attendance_calculator_sorting_mode)
-        ).asFlow().map(AttendanceCalculatorSortingMode::getByValue)
-
-    /**
-     * Subjects are empty when they don't have any attendances (total = 0, attendances = 0, absences = 0).
-     */
-    val attendanceCalculatorShowEmptySubjects: Flow<Boolean>
-        get() = flowSharedPref.getBoolean(
-            context.getString(R.string.pref_key_attendance_calculator_show_empty_subjects),
-            context.resources.getBoolean(R.bool.pref_default_attendance_calculator_show_empty_subjects)
-        ).asFlow()
-
     private val gradeAverageModePref: Preference<GradeAverageMode>
         get() = getObjectFlow(
             R.string.pref_key_grade_average_mode,
@@ -330,6 +303,19 @@ class PreferencesRepository @Inject constructor(
         get() = sharedPref.getBoolean(PREF_KEY_APP_SUPPORT_SHOWN, false)
         set(value) = sharedPref.edit { putBoolean(PREF_KEY_APP_SUPPORT_SHOWN, value) }
 
+    var isAgreeToProcessData: Boolean
+        get() = getBoolean(
+            R.string.pref_key_ads_consent_data_processing,
+            R.bool.pref_default_ads_consent_data_processing
+        )
+        set(value) = sharedPref.edit {
+            putBoolean(context.getString(R.string.pref_key_ads_consent_data_processing), value)
+        }
+
+    var isPersonalizedAdsEnabled: Boolean
+        get() = sharedPref.getBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, false)
+        set(value) = sharedPref.edit { putBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, value) }
+
     val isAdsEnabledFlow = flowSharedPref.getBoolean(
         context.getString(R.string.pref_key_ads_enabled),
         context.resources.getBoolean(R.bool.pref_default_ads_enabled)
@@ -412,6 +398,7 @@ class PreferencesRepository @Inject constructor(
         private const val PREF_KEY_IN_APP_REVIEW_DATE = "in_app_review_date"
         private const val PREF_KEY_IN_APP_REVIEW_DONE = "in_app_review_done"
         private const val PREF_KEY_APP_SUPPORT_SHOWN = "app_support_shown"
+        private const val PREF_KEY_PERSONALIZED_ADS_ENABLED = "personalized_ads_enabled"
         private const val PREF_KEY_ADMIN_DISMISSED_MESSAGE_IDS = "admin_message_dismissed_ids"
     }
 }

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

@@ -1,15 +1,12 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.entities.Mailbox
-import io.github.wulkanowy.data.db.entities.MailboxType
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -17,22 +14,19 @@ import javax.inject.Singleton
 @Singleton
 class RecipientRepository @Inject constructor(
     private val recipientDb: RecipientDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
     private val cacheKey = "recipient"
 
     suspend fun refreshRecipients(student: Student, mailbox: Mailbox, type: MailboxType) {
-        val new = wulkanowySdkFactory.create(student)
-            .getRecipients(mailbox.globalKey)
+        val new = sdk.init(student).getRecipients(mailbox.globalKey)
             .mapToEntities(mailbox.globalKey)
         val old = recipientDb.loadAll(type, mailbox.globalKey)
 
-        recipientDb.removeOldAndSaveNew(
-            oldItems = old uniqueSubtract new,
-            newItems = new uniqueSubtract old,
-        )
+        recipientDb.deleteAll(old uniqueSubtract new)
+        recipientDb.insertAll(new uniqueSubtract old)
 
         refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
     }
@@ -60,7 +54,7 @@ class RecipientRepository @Inject constructor(
     ): List<Recipient> {
         mailbox ?: return emptyList()
 
-        return wulkanowySdkFactory.create(student)
+        return sdk.init(student)
             .getMessageReplayDetails(message.messageGlobalKey)
             .sender
             .let(::listOf)

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

@@ -1,23 +1,17 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
+import io.github.wulkanowy.sdk.Sdk
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class RecoverRepository @Inject constructor(
-    private val wulkanowySdkFactory: WulkanowySdkFactory
-) {
+class RecoverRepository @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> =
-        wulkanowySdkFactory.create()
-            .getPasswordResetCaptchaCode(host, symbol)
+    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> {
+        return sdk.getPasswordResetCaptchaCode(host, symbol)
+    }
 
     suspend fun sendRecoverRequest(
-        url: String,
-        symbol: String,
-        email: String,
-        reCaptchaResponse: String
-    ): String = wulkanowySdkFactory.create()
-        .sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
+        url: String, symbol: String, email: String, reCaptchaResponse: String
+    ): String = sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
 }

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

@@ -1,13 +1,14 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -17,7 +18,7 @@ import javax.inject.Singleton
 @Singleton
 class SchoolAnnouncementRepository @Inject constructor(
     private val schoolAnnouncementDb: SchoolAnnouncementDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -40,18 +41,17 @@ class SchoolAnnouncementRepository @Inject constructor(
             schoolAnnouncementDb.loadAll(student.userLoginId)
         },
         fetch = {
-            val sdk = wulkanowySdkFactory.create(student)
-            val lastAnnouncements = sdk.getLastAnnouncements().mapToEntities(student)
-            val directorInformation = sdk.getDirectorInformation().mapToEntities(student)
-            lastAnnouncements + directorInformation
+            sdk.init(student)
+                .getDirectorInformation()
+                .mapToEntities(student)
         },
         saveFetchResult = { old, new ->
-            schoolAnnouncementDb.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = (new uniqueSubtract old).onEach {
-                    if (notify) it.isNotified = false
-                },
-            )
+            val schoolAnnouncementsToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
+
+            schoolAnnouncementDb.deleteAll(old uniqueSubtract new)
+            schoolAnnouncementDb.insertAll(schoolAnnouncementsToSave)
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
         }
     )

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

@@ -1,13 +1,14 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.networkBoundResource
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -15,7 +16,7 @@ import javax.inject.Singleton
 @Singleton
 class SchoolRepository @Inject constructor(
     private val schoolDb: SchoolDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -38,16 +39,17 @@ class SchoolRepository @Inject constructor(
         },
         query = { schoolDb.load(semester.studentId, semester.classId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getSchool()
                 .mapToEntity(semester)
         },
         saveFetchResult = { old, new ->
             if (old != null && new != old) {
-                schoolDb.removeOldAndSaveNew(
-                    oldItems = listOf(old),
-                    newItems = listOf(new)
-                )
+                with(schoolDb) {
+                    deleteAll(listOf(old))
+                    insertAll(listOf(new))
+                }
             } else if (old == null) {
                 schoolDb.insertAll(listOf(new))
             }

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

@@ -1,15 +1,16 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.api.SchoolsService
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.pojos.IntegrityRequest
 import io.github.wulkanowy.data.pojos.LoginEvent
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.utils.IntegrityHelper
 import io.github.wulkanowy.utils.getCurrentOrLast
+import io.github.wulkanowy.utils.init
 import kotlinx.coroutines.withTimeout
 import timber.log.Timber
 import java.util.UUID
@@ -21,7 +22,7 @@ import kotlin.time.Duration.Companion.seconds
 class SchoolsRepository @Inject constructor(
     private val integrityHelper: IntegrityHelper,
     private val schoolsService: SchoolsService,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
 ) {
 
     suspend fun logSchoolLogin(loginData: LoginData, students: List<StudentWithSemesters>) {
@@ -38,9 +39,14 @@ class SchoolsRepository @Inject constructor(
     private suspend fun logLogin(loginData: LoginData, student: Student, semester: Semester) {
         val requestId = UUID.randomUUID().toString()
         val token = integrityHelper.getIntegrityToken(requestId) ?: return
-        val updatedStudent = student.copy(password = loginData.password)
 
-        val schoolInfo = wulkanowySdkFactory.create(updatedStudent, semester)
+        val schoolInfo = sdk
+            .init(student.copy(password = loginData.password))
+            .switchDiary(
+                diaryId = semester.diaryId,
+                kindergartenDiaryId = semester.kindergartenDiaryId,
+                schoolYear = semester.schoolYear
+            )
             .getSchool()
 
         schoolsService.logLoginEvent(

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

@@ -1,15 +1,11 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.getCurrentOrLast
-import io.github.wulkanowy.utils.isCurrent
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
@@ -18,8 +14,8 @@ import javax.inject.Singleton
 @Singleton
 class SemesterRepository @Inject constructor(
     private val semesterDb: SemesterDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
-    private val dispatchers: DispatchersProvider,
+    private val sdk: Sdk,
+    private val dispatchers: DispatchersProvider
 ) {
 
     suspend fun getSemesters(
@@ -49,7 +45,6 @@ class SemesterRepository @Inject constructor(
                     0 == it.diaryId && 0 == it.kindergartenDiaryId
                 } == true
             }
-
             else -> false
         }
 
@@ -60,17 +55,12 @@ class SemesterRepository @Inject constructor(
     }
 
     private suspend fun refreshSemesters(student: Student) {
-        val new = wulkanowySdkFactory.create(student)
-            .getSemesters()
-            .mapToEntities(student.studentId)
-
+        val new = sdk.init(student).getSemesters().mapToEntities(student.studentId)
         if (new.isEmpty()) return Timber.i("Empty semester list!")
 
         val old = semesterDb.loadAll(student.studentId, student.classId)
-        semesterDb.removeOldAndSaveNew(
-            oldItems = old uniqueSubtract new,
-            newItems = new uniqueSubtract old,
-        )
+        semesterDb.deleteAll(old.uniqueSubtract(new))
+        semesterDb.insertSemesters(new.uniqueSubtract(old))
     }
 
     suspend fun getCurrentSemester(student: Student, forceRefresh: Boolean = false) =

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

@@ -1,11 +1,12 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.StudentInfoDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.networkBoundResource
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,7 +14,7 @@ import javax.inject.Singleton
 @Singleton
 class StudentInfoRepository @Inject constructor(
     private val studentInfoDao: StudentInfoDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -28,16 +29,16 @@ class StudentInfoRepository @Inject constructor(
         shouldFetch = { it == null || forceRefresh },
         query = { studentInfoDao.loadStudentInfo(student.studentId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
-                .getStudentInfo()
-                .mapToEntity(semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .getStudentInfo().mapToEntity(semester)
         },
         saveFetchResult = { old, new ->
             if (old != null && new != old) {
-                studentInfoDao.removeOldAndSaveNew(
-                    oldItems = listOf(old),
-                    newItems = listOf(new),
-                )
+                with(studentInfoDao) {
+                    deleteAll(listOf(old))
+                    insertAll(listOf(new))
+                }
             } else if (old == null) {
                 studentInfoDao.insertAll(listOf(new))
             }

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

@@ -1,7 +1,8 @@
 package io.github.wulkanowy.data.repositories
 
+import android.content.Context
 import androidx.room.withTransaction
-import io.github.wulkanowy.data.WulkanowySdkFactory
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
@@ -15,19 +16,21 @@ import io.github.wulkanowy.data.mappers.mapToPojo
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.security.Scrambler
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.security.decrypt
+import io.github.wulkanowy.utils.security.encrypt
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class StudentRepository @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val dispatchers: DispatchersProvider,
     private val studentDb: StudentDao,
     private val semesterDb: SemesterDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
-    private val appDatabase: AppDatabase,
-    private val scrambler: Scrambler,
+    private val sdk: Sdk,
+    private val appDatabase: AppDatabase
 ) {
 
     suspend fun isCurrentStudentSet() = studentDb.loadCurrent()?.isCurrent ?: false
@@ -36,7 +39,7 @@ class StudentRepository @Inject constructor(
         pin: String,
         symbol: String,
         token: String
-    ): RegisterUser = wulkanowySdkFactory.create()
+    ): RegisterUser = sdk
         .getStudentsFromHebe(token, pin, symbol, "")
         .mapToPojo(null)
 
@@ -46,7 +49,7 @@ class StudentRepository @Inject constructor(
         scrapperBaseUrl: String,
         domainSuffix: String,
         symbol: String
-    ): RegisterUser = wulkanowySdkFactory.create()
+    ): RegisterUser = sdk
         .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, domainSuffix, symbol)
         .mapToPojo(password)
 
@@ -55,7 +58,7 @@ class StudentRepository @Inject constructor(
         password: String,
         scrapperBaseUrl: String,
         symbol: String
-    ): RegisterUser = wulkanowySdkFactory.create()
+    ): RegisterUser = sdk
         .getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
         .mapToPojo(password)
 
@@ -65,7 +68,7 @@ class StudentRepository @Inject constructor(
                 student = student.apply {
                     if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
                         student.password = withContext(dispatchers.io) {
-                            scrambler.decrypt(student.password)
+                            decrypt(student.password)
                         }
                     }
                 },
@@ -83,7 +86,7 @@ class StudentRepository @Inject constructor(
         }.apply {
             if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
                 student.password = withContext(dispatchers.io) {
-                    scrambler.decrypt(student.password)
+                    decrypt(student.password)
                 }
             }
         }
@@ -93,7 +96,7 @@ class StudentRepository @Inject constructor(
 
         if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
             student.password = withContext(dispatchers.io) {
-                scrambler.decrypt(student.password)
+                decrypt(student.password)
             }
         }
         return student
@@ -104,7 +107,7 @@ class StudentRepository @Inject constructor(
 
         if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
             student.password = withContext(dispatchers.io) {
-                scrambler.decrypt(student.password)
+                decrypt(student.password)
             }
         }
         return student
@@ -117,7 +120,7 @@ class StudentRepository @Inject constructor(
                 it.apply {
                     if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.HEBE) {
                         password = withContext(dispatchers.io) {
-                            scrambler.encrypt(password)
+                            encrypt(password, context)
                         }
                     }
                 }
@@ -148,11 +151,13 @@ class StudentRepository @Inject constructor(
         .distinctBy { it.student.studentName }.size == 1
 
     suspend fun authorizePermission(student: Student, semester: Semester, pesel: String) =
-        wulkanowySdkFactory.create(student, semester)
+        sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .authorizePermission(pesel)
 
     suspend fun refreshStudentName(student: Student, semester: Semester) {
-        val newCurrentApiStudent = wulkanowySdkFactory.create(student, semester)
+        val newCurrentApiStudent = sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .getCurrentStudent() ?: return
 
         val studentName = StudentName(
@@ -161,15 +166,4 @@ class StudentRepository @Inject constructor(
 
         studentDb.update(studentName)
     }
-
-    suspend fun deleteStudentsAssociatedWithAccount(student: Student) {
-        studentDb.deleteByEmailAndUserName(student.email, student.userName)
-    }
-
-    suspend fun clearAll() {
-        withContext(dispatchers.io) {
-            scrambler.clearKeyPair()
-            appDatabase.clearAllTables()
-        }
-    }
 }

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

@@ -1,13 +1,14 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -16,7 +17,7 @@ import javax.inject.Singleton
 @Singleton
 class SubjectRepository @Inject constructor(
     private val subjectDao: SubjectDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -37,15 +38,14 @@ class SubjectRepository @Inject constructor(
         },
         query = { subjectDao.loadAll(semester.diaryId, semester.studentId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
-                .getSubjects()
-                .mapToEntities(semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .getSubjects().mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            subjectDao.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = new uniqueSubtract old
-            )
+            subjectDao.deleteAll(old uniqueSubtract new)
+            subjectDao.insertAll(new uniqueSubtract old)
+
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )

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

@@ -1,13 +1,14 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -16,7 +17,7 @@ import javax.inject.Singleton
 @Singleton
 class TeacherRepository @Inject constructor(
     private val teacherDb: TeacherDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
@@ -37,15 +38,15 @@ class TeacherRepository @Inject constructor(
         },
         query = { teacherDb.loadAll(semester.studentId, semester.classId) },
         fetch = {
-            wulkanowySdkFactory.create(student, semester)
+            sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getTeachers()
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
-            teacherDb.removeOldAndSaveNew(
-                oldItems = old uniqueSubtract new,
-                newItems = new uniqueSubtract old,
-            )
+            teacherDb.deleteAll(old uniqueSubtract new)
+            teacherDb.insertAll(new uniqueSubtract old)
+
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )

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

@@ -1,23 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.WulkanowySdkFactory
 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.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.data.db.entities.TimetableHeader
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.TimetableFull
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.sync.Mutex
@@ -31,7 +23,7 @@ class TimetableRepository @Inject constructor(
     private val timetableDb: TimetableDao,
     private val timetableAdditionalDb: TimetableAdditionalDao,
     private val timetableHeaderDb: TimetableHeaderDao,
-    private val wulkanowySdkFactory: WulkanowySdkFactory,
+    private val sdk: Sdk,
     private val schedulerHelper: TimetableNotificationSchedulerHelper,
     private val refreshHelper: AutoRefreshHelper,
 ) {
@@ -72,7 +64,8 @@ class TimetableRepository @Inject constructor(
         },
         query = { getFullTimetableFromDatabase(student, semester, start, end) },
         fetch = {
-            val timetableFull = wulkanowySdkFactory.create(student, semester)
+            val timetableFull = sdk.init(student)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getTimetable(start.monday, end.sunday)
 
             timetableFull.mapToEntities(semester)
@@ -128,12 +121,12 @@ class TimetableRepository @Inject constructor(
         }
     }
 
-    suspend fun getTimetableFromDatabase(
+    fun getTimetableFromDatabase(
         semester: Semester,
-        start: LocalDate,
+        from: LocalDate,
         end: LocalDate
-    ): List<Timetable> {
-        return timetableDb.load(semester.diaryId, semester.studentId, start, end)
+    ): Flow<List<Timetable>> {
+        return timetableDb.loadAll(semester.diaryId, semester.studentId, from, end)
     }
 
     suspend fun updateTimetable(timetable: List<Timetable>) {
@@ -151,10 +144,8 @@ class TimetableRepository @Inject constructor(
             new.apply { if (notify) isNotified = false }
         }
 
-        timetableDb.removeOldAndSaveNew(
-            oldItems = lessonsToRemove,
-            newItems = lessonsToAdd,
-        )
+        timetableDb.deleteAll(lessonsToRemove)
+        timetableDb.insertAll(lessonsToAdd)
 
         schedulerHelper.cancelScheduled(lessonsToRemove, student)
         schedulerHelper.scheduleNotifications(lessonsToAdd, student)
@@ -165,17 +156,13 @@ class TimetableRepository @Inject constructor(
         new: List<TimetableAdditional>
     ) {
         val oldFiltered = old.filter { !it.isAddedByUser }
-        timetableAdditionalDb.removeOldAndSaveNew(
-            oldItems = oldFiltered uniqueSubtract new,
-            newItems = new uniqueSubtract old,
-        )
+        timetableAdditionalDb.deleteAll(oldFiltered uniqueSubtract new)
+        timetableAdditionalDb.insertAll(new uniqueSubtract old)
     }
 
     private suspend fun refreshDayHeaders(old: List<TimetableHeader>, new: List<TimetableHeader>) {
-        timetableHeaderDb.removeOldAndSaveNew(
-            oldItems = old uniqueSubtract new,
-            newItems = new uniqueSubtract old,
-        )
+        timetableHeaderDb.deleteAll(old uniqueSubtract new)
+        timetableHeaderDb.insertAll(new uniqueSubtract old)
     }
 
     fun getLastRefreshTimestamp(semester: Semester, start: LocalDate, end: LocalDate): Instant {

app/src/main/java/io/github/wulkanowy/domain/attendance/GetAttendanceCalculatorDataUseCase.kt

@@ -1,106 +0,0 @@
-package io.github.wulkanowy.domain.attendance
-
-import io.github.wulkanowy.data.*
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode
-import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode.*
-import io.github.wulkanowy.data.pojos.AttendanceData
-import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SubjectRepository
-import io.github.wulkanowy.utils.allAbsences
-import io.github.wulkanowy.utils.allPresences
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import kotlin.math.ceil
-import kotlin.math.floor
-
-class GetAttendanceCalculatorDataUseCase @Inject constructor(
-    private val subjectRepository: SubjectRepository,
-    private val attendanceSummaryRepository: AttendanceSummaryRepository,
-    private val preferencesRepository: PreferencesRepository,
-) {
-
-    operator fun invoke(
-        student: Student,
-        semester: Semester,
-        forceRefresh: Boolean,
-    ): Flow<Resource<List<AttendanceData>>> =
-        subjectRepository.getSubjects(student, semester, forceRefresh)
-            .mapResourceData { subjects -> subjects.sortedBy(Subject::name) }
-            .combineWithResourceData(preferencesRepository.targetAttendanceFlow, ::Pair)
-            .flatMapResourceData { (subjects, targetFreq) ->
-                combineResourceFlows(subjects.map { subject ->
-                    attendanceSummaryRepository.getAttendanceSummary(
-                        student = student,
-                        semester = semester,
-                        subjectId = subject.realId,
-                        forceRefresh = forceRefresh
-                    ).mapResourceData { summaries ->
-                        summaries.toAttendanceData(subject.name, targetFreq)
-                    }
-                })
-                    // Every individual combined flow causes separate network requests to update data.
-                    // When there is N child flows, they can cause up to N-1 items to be emitted. Since all
-                    // requests are usually completed in less than 5s, there is no need to emit multiple
-                    // intermediates that will be visible for barely any time.
-                    .debounceIntermediates()
-            }
-            .combineWithResourceData(preferencesRepository.attendanceCalculatorShowEmptySubjects) { attendanceDataList, showEmptySubjects ->
-                attendanceDataList.filter { it.total != 0 || showEmptySubjects }
-            }
-            .combineWithResourceData(preferencesRepository.attendanceCalculatorSortingModeFlow, List<AttendanceData>::sortedBy)
-}
-
-private fun List<AttendanceSummary>.toAttendanceData(subjectName: String, targetFreq: Int): AttendanceData {
-    val presences = sumOf { it.allPresences }
-    val absences = sumOf { it.allAbsences }
-    return AttendanceData(
-        subjectName = subjectName,
-        lessonBalance = calcLessonBalance(
-            targetFreq.toDouble() / 100, presences, absences
-        ),
-        presences = presences,
-        absences = absences,
-    )
-}
-
-private fun calcLessonBalance(targetFreq: Double, presences: Int, absences: Int): Int {
-    val total = presences + absences
-    // The `+ 1` is to avoid false positives in close cases. Eg.:
-    // target frequency 99%, 1 presence. Without the `+ 1` this would be reported shown as
-    // a positive balance of +1, however that is not actually true as skipping one class
-    // would make it so that the balance would actually be negative (-98). The `+ 1`
-    // fixes this and makes sure that in situations like these, it's not reporting incorrect
-    // balances
-    return when {
-        presences / (total + 1f) >= targetFreq -> calcMissingAbsences(
-            targetFreq, absences, presences
-        )
-        presences / (total + 0f) < targetFreq -> -calcMissingPresences(
-            targetFreq, absences, presences
-        )
-        else -> 0
-    }
-}
-
-private fun calcMissingPresences(targetFreq: Double, absences: Int, presences: Int) =
-    calcMinRequiredPresencesFor(targetFreq, absences) - presences
-
-private fun calcMinRequiredPresencesFor(targetFreq: Double, absences: Int) =
-    ceil((targetFreq / (1 - targetFreq)) * absences).toInt()
-
-private fun calcMissingAbsences(targetFreq: Double, absences: Int, presences: Int) =
-    calcMinRequiredAbsencesFor(targetFreq, presences) - absences
-
-private fun calcMinRequiredAbsencesFor(targetFreq: Double, presences: Int) =
-    floor((presences * (1 - targetFreq)) / targetFreq).toInt()
-
-private fun List<AttendanceData>.sortedBy(mode: AttendanceCalculatorSortingMode) = when (mode) {
-    ALPHABETIC -> sortedBy(AttendanceData::subjectName)
-    ATTENDANCE -> sortedByDescending(AttendanceData::presencePercentage)
-    LESSON_BALANCE -> sortedBy(AttendanceData::lessonBalance)
-}

app/src/main/java/io/github/wulkanowy/domain/timetable/IsStudentHasLessonsOnWeekendUseCase.kt

@@ -1,26 +0,0 @@
-package io.github.wulkanowy.domain.timetable
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.TimetableRepository
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import java.time.LocalDate
-import javax.inject.Inject
-
-class IsStudentHasLessonsOnWeekendUseCase @Inject constructor(
-    private val timetableRepository: TimetableRepository,
-    private val isWeekendHasLessonsUseCase: IsWeekendHasLessonsUseCase,
-) {
-
-    suspend operator fun invoke(
-        semester: Semester,
-        currentDate: LocalDate = LocalDate.now(),
-    ): Boolean {
-        val lessons = timetableRepository.getTimetableFromDatabase(
-            semester = semester,
-            start = currentDate.monday,
-            end = currentDate.sunday,
-        )
-        return isWeekendHasLessonsUseCase(lessons)
-    }
-}

app/src/main/java/io/github/wulkanowy/domain/timetable/IsWeekendHasLessonsUseCase.kt

@@ -1,17 +0,0 @@
-package io.github.wulkanowy.domain.timetable
-
-import io.github.wulkanowy.data.db.entities.Timetable
-import java.time.DayOfWeek
-import javax.inject.Inject
-
-class IsWeekendHasLessonsUseCase @Inject constructor() {
-
-    operator fun invoke(
-        lessons: List<Timetable>,
-    ): Boolean = lessons.any {
-        it.date.dayOfWeek in listOf(
-            DayOfWeek.SATURDAY,
-            DayOfWeek.SUNDAY,
-        )
-    }
-}

app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt

@@ -65,6 +65,8 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
                     range = lesson.start..lesson.end,
                     requestCode = getRequestCode(lesson.start, studentId)
                 )
+
+                Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
             }
         }
     }

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt

@@ -4,12 +4,12 @@ import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeDescriptive
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.GroupNotificationData
 import io.github.wulkanowy.data.pojos.NotificationData
 import io.github.wulkanowy.ui.modules.Destination
+import io.github.wulkanowy.ui.modules.splash.SplashActivity
 import io.github.wulkanowy.utils.getPlural
 import javax.inject.Inject
 
@@ -88,28 +88,4 @@ class NewGradeNotification @Inject constructor(
 
         appNotificationManager.sendMultipleNotifications(groupNotificationData, student)
     }
-
-    suspend fun notifyDescriptive(items: List<GradeDescriptive>, student: Student) {
-        val notificationDataList = items.map {
-            NotificationData(
-                title = context.getPlural(R.plurals.grade_new_items_descriptive, 1),
-                content = "${it.subject}: ${it.description}",
-                destination = Destination.Grade,
-            )
-        }
-
-        val groupNotificationData = GroupNotificationData(
-            notificationDataList = notificationDataList,
-            title = context.getPlural(R.plurals.grade_new_items_descriptive, items.size),
-            content = context.getPlural(
-                R.plurals.grade_notify_new_items_descriptive,
-                items.size,
-                items.size
-            ),
-            destination = Destination.Grade,
-            type = NotificationType.NEW_GRADE_DESCRIPTIVE
-        )
-
-        appNotificationManager.sendMultipleNotifications(groupNotificationData, student)
-    }
 }

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NotificationType.kt

@@ -37,10 +37,6 @@ enum class NotificationType(
         channel = NewGradesChannel.CHANNEL_ID,
         icon = R.drawable.ic_stat_grade,
     ),
-    NEW_GRADE_DESCRIPTIVE(
-        channel = NewGradesChannel.CHANNEL_ID,
-        icon = R.drawable.ic_stat_grade,
-    ),
     NEW_HOMEWORK(
         channel = NewHomeworkChannel.CHANNEL_ID,
         icon = R.drawable.ic_more_homework,

app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt

@@ -16,24 +16,17 @@ class AttendanceWork @Inject constructor(
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
-        val startDate = now().previousOrSameSchoolDay
-        val endDate = startDate.plusDays(7)
-
         attendanceRepository.getAttendance(
             student = student,
             semester = semester,
-            start = startDate,
-            end = endDate,
+            start = now().previousOrSameSchoolDay,
+            end = now().previousOrSameSchoolDay,
             forceRefresh = true,
             notify = notify,
         )
             .waitForResult()
 
-        attendanceRepository.getAttendanceFromDatabase(
-            semester = semester,
-            start = startDate,
-            end = endDate,
-        )
+        attendanceRepository.getAttendanceFromDatabase(semester, now().minusDays(7), now())
             .first()
             .filterNot { it.isNotified }
             .let {

app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt

@@ -5,8 +5,6 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.ExamRepository
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewExamNotification
-import io.github.wulkanowy.utils.endExamsDay
-import io.github.wulkanowy.utils.startExamsDay
 import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
@@ -17,24 +15,16 @@ class ExamWork @Inject constructor(
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
-        val startDate = now().startExamsDay
-        val endDate = startDate.endExamsDay
-
         examRepository.getExams(
             student = student,
             semester = semester,
-            start = startDate,
-            end = endDate,
+            start = now(),
+            end = now(),
             forceRefresh = true,
             notify = notify,
         ).waitForResult()
 
-        examRepository.getExamsFromDatabase(
-            semester = semester,
-            start = startDate,
-            end = endDate,
-        )
-            .first()
+        examRepository.getExamsFromDatabase(semester, now()).first()
             .filter { !it.isNotified }.let {
                 if (it.isNotEmpty()) newExamNotification.notify(it, student)
 

app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt

@@ -45,15 +45,5 @@ class GradeWork @Inject constructor(
                     grade.isFinalGradeNotified = true
                 })
             }
-
-        gradeRepository.getGradesDescriptiveFromDatabase(semester).first()
-            .filter { !it.isNotified }
-            .let {
-                if (it.isNotEmpty()) newGradeNotification.notifyDescriptive(it, student)
-
-                gradeRepository.updateGradesDescriptive(it.onEach { grade ->
-                    grade.isNotified = true
-                })
-            }
     }
 }

app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt

@@ -5,9 +5,7 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.HomeworkRepository
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewHomeworkNotification
-import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.sunday
 import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
@@ -18,24 +16,16 @@ class HomeworkWork @Inject constructor(
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
-        val startDate = now().nextOrSameSchoolDay.monday
-        val endDate = startDate.sunday
-
         homeworkRepository.getHomework(
             student = student,
             semester = semester,
-            start = startDate,
-            end = endDate,
+            start = now().nextOrSameSchoolDay,
+            end = now().nextOrSameSchoolDay,
             forceRefresh = true,
             notify = notify,
         ).waitForResult()
 
-        homeworkRepository.getHomeworkFromDatabase(
-            semester = semester,
-            start = startDate,
-            end = endDate
-        )
-            .first()
+        homeworkRepository.getHomeworkFromDatabase(semester, now(), now().plusDays(7)).first()
             .filter { !it.isNotified }.let {
                 if (it.isNotEmpty()) newHomeworkNotification.notify(it, student)
 

app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt

@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.repositories.TimetableRepository
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.ChangeTimetableNotification
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
 
@@ -15,24 +16,18 @@ class TimetableWork @Inject constructor(
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
-        val startDate = now().nextOrSameSchoolDay
-        val endDate = startDate.plusDays(7)
-
         timetableRepository.getTimetable(
             student = student,
             semester = semester,
-            start = startDate,
-            end = endDate,
+            start = now().nextOrSameSchoolDay,
+            end = now().nextOrSameSchoolDay,
             forceRefresh = true,
             notify = notify,
         )
             .waitForResult()
 
-        timetableRepository.getTimetableFromDatabase(
-            semester = semester,
-            start = startDate,
-            end = endDate,
-        )
+        timetableRepository.getTimetableFromDatabase(semester, now(), now().plusDays(7))
+            .first()
             .filterNot { it.isNotified }
             .let {
                 if (it.isNotEmpty()) changeTimetableNotification.notify(it, student)

app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt

@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.base
 
 import android.app.ActivityManager
-import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -12,14 +11,11 @@ import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.auth.AuthDialog
-import io.github.wulkanowy.ui.modules.captcha.CaptchaDialog
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.openInternetBrowser
-import timber.log.Timber
-import java.time.Instant
 import javax.inject.Inject
 
 abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
@@ -39,26 +35,16 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
 
     abstract var presenter: T
 
-    private var lastDialogOpenTime = mutableMapOf<String, Instant>()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         inject()
         themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
-        applyCustomTaskDescription()
-    }
 
-    @Suppress("DEPRECATION")
-    private fun applyCustomTaskDescription() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) return
-        try {
-            val newColor = getThemeAttrColor(R.attr.colorSurface)
-            val taskDescription = ActivityManager.TaskDescription(null, null, newColor)
-            setTaskDescription(taskDescription)
-        } catch (e: Exception) {
-            Timber.e(e)
-        }
+        @Suppress("DEPRECATION")
+        setTaskDescription(
+            ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface))
+        )
     }
 
     override fun showError(text: String, error: Throwable) {
@@ -82,28 +68,11 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         } else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
     }
 
-    override fun showExpiredCredentialsDialog() {
-        if (!shouldShowDialog(DIALOG_ERROR_BAD_CREDENTIALS)) return
-
-        MaterialAlertDialogBuilder(this)
-            .setTitle(R.string.main_expired_credentials_title)
-            .setMessage(R.string.main_expired_credentials_description)
-            .setPositiveButton(R.string.main_log_in) { _, _ -> presenter.onConfirmExpiredCredentialsSelected() }
-            .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            .show()
-    }
-
-    override fun onCaptchaVerificationRequired(url: String?) {
-        CaptchaDialog.newInstance(url).show(supportFragmentManager, "captcha_dialog")
-    }
-
-    override fun showDecryptionFailedDialog() {
-        if (!shouldShowDialog(DIALOG_ERROR_DECRYPTION_FAILED)) return
-
+    override fun showExpiredDialog() {
         MaterialAlertDialogBuilder(this)
             .setTitle(R.string.main_session_expired)
             .setMessage(R.string.main_session_relogin)
-            .setPositiveButton(R.string.main_log_in) { _, _ -> presenter.onConfirmDecryptionFailedSelected() }
+            .setPositiveButton(R.string.main_log_in) { _, _ -> presenter.onExpiredLoginSelected() }
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
             .show()
     }
@@ -136,21 +105,4 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
     protected open fun inject() {
         throw UnsupportedOperationException()
     }
-
-    private fun shouldShowDialog(name: String): Boolean {
-        val lastOpenTime = lastDialogOpenTime[name]
-        val now = Instant.now()
-
-        if (lastOpenTime != null && now.isBefore(lastOpenTime.plusSeconds(1))) {
-            Timber.i("Dialog $name was shown less than a second ago. Skip")
-            return false
-        }
-        lastDialogOpenTime[name] = Instant.now()
-        return true
-    }
-
-    companion object {
-        private const val DIALOG_ERROR_BAD_CREDENTIALS = "dialog_error_bad_credentials"
-        private const val DIALOG_ERROR_DECRYPTION_FAILED = "dialog_error_decryption_failed"
-    }
 }

app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt

@@ -8,6 +8,7 @@ import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.elevation.SurfaceColors
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import javax.inject.Inject
@@ -27,16 +28,8 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
         Toast.makeText(context, text, Toast.LENGTH_LONG).show()
     }
 
-    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
-    }
-
-    override fun onCaptchaVerificationRequired(url: String?) {
-        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
-    }
-
-    override fun showDecryptionFailedDialog() {
-        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
+    override fun showExpiredDialog() {
+        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
@@ -48,7 +41,7 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
     }
 
     override fun showAuthDialog() {
-        (activity as? BaseActivity<*, *>)?.showAuthDialog()
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
     }
 
     override fun showErrorDetailsDialog(error: Throwable) {

app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt

@@ -7,6 +7,7 @@ import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 
 abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragment(layoutId),
@@ -38,20 +39,12 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragme
         }
     }
 
-    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
-    }
-
-    override fun onCaptchaVerificationRequired(url: String?) {
-        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
-    }
-
-    override fun showDecryptionFailedDialog() {
-        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
+    override fun showExpiredDialog() {
+        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
     override fun showAuthDialog() {
-        (activity as? BaseActivity<*, *>)?.showAuthDialog()
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
     }
 
     override fun openClearLoginView() {

app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt

@@ -28,38 +28,20 @@ open class BasePresenter<T : BaseView>(
         this.view = view
         errorHandler.apply {
             showErrorMessage = view::showError
-            onExpiredCredentials = view::showExpiredCredentialsDialog
-            onCaptchaVerificationRequired = view::onCaptchaVerificationRequired
-            onDecryptionFailed = view::showDecryptionFailedDialog
+            onSessionExpired = view::showExpiredDialog
             onNoCurrentStudent = view::openClearLoginView
             onPasswordChangeRequired = view::showChangePasswordSnackbar
             onAuthorizationRequired = view::showAuthDialog
         }
     }
 
-    fun onConfirmDecryptionFailedSelected() {
-        Timber.i("Attempt to clear all data")
-
-        presenterScope.launch {
-            runCatching { studentRepository.clearAll() }
-                .onFailure {
-                    Timber.i("Clear data result: An exception occurred")
-                    errorHandler.dispatch(it)
-                }
-                .onSuccess {
-                    Timber.i("Clear data result: Open login view")
-                    view?.openClearLoginView()
-                }
-        }
-    }
-
-    fun onConfirmExpiredCredentialsSelected() {
-        Timber.i("Attempt to delete students associated with the account and switch to new student")
+    fun onExpiredLoginSelected() {
+        Timber.i("Attempt to switch the student after the session expires")
 
         presenterScope.launch {
             runCatching {
                 val student = studentRepository.getCurrentStudent(false)
-                studentRepository.deleteStudentsAssociatedWithAccount(student)
+                studentRepository.logoutStudent(student)
 
                 val students = studentRepository.getSavedStudents(false)
                 if (students.isNotEmpty()) {
@@ -68,11 +50,11 @@ open class BasePresenter<T : BaseView>(
                 }
             }
                 .onFailure {
-                    Timber.i("Delete students result: An exception occurred")
+                    Timber.i("Switch student result: An exception occurred")
                     errorHandler.dispatch(it)
                 }
                 .onSuccess {
-                    Timber.i("Delete students result: Open login view")
+                    Timber.i("Switch student result: Open login view")
                     view?.openClearLoginView()
                 }
         }

app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt

@@ -6,11 +6,7 @@ interface BaseView {
 
     fun showMessage(text: String)
 
-    fun showExpiredCredentialsDialog()
-
-    fun onCaptchaVerificationRequired(url: String?)
-
-    fun showDecryptionFailedDialog()
+    fun showExpiredDialog()
 
     fun showAuthDialog()
 

app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.sdk.scrapper.exception.AuthorizationRequiredException
-import io.github.wulkanowy.sdk.scrapper.exception.CloudflareVerificationException
 import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
 import io.github.wulkanowy.utils.getErrorString
@@ -16,9 +15,7 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
 
     var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
 
-    var onExpiredCredentials: () -> Unit = {}
-
-    var onDecryptionFailed: () -> Unit = {}
+    var onSessionExpired: () -> Unit = {}
 
     var onNoCurrentStudent: () -> Unit = {}
 
@@ -26,33 +23,24 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
 
     var onAuthorizationRequired: () -> Unit = {}
 
-    var onCaptchaVerificationRequired: (url: String?) -> Unit = {}
-
     fun dispatch(error: Throwable) {
         Timber.e(error, "An exception occurred while the Wulkanowy was running")
         proceed(error)
     }
 
     protected open fun proceed(error: Throwable) {
-        showDefaultMessage(error)
+        showErrorMessage(context.resources.getErrorString(error), error)
         when (error) {
             is PasswordChangeRequiredException -> onPasswordChangeRequired(error.redirectUrl)
-            is ScramblerException -> onDecryptionFailed()
-            is BadCredentialsException -> onExpiredCredentials()
+            is ScramblerException, is BadCredentialsException -> onSessionExpired()
             is NoCurrentStudentException -> onNoCurrentStudent()
             is AuthorizationRequiredException -> onAuthorizationRequired()
-            is CloudflareVerificationException -> onCaptchaVerificationRequired(error.originalUrl)
         }
     }
 
-    fun showDefaultMessage(error: Throwable) {
-        showErrorMessage(context.resources.getErrorString(error), error)
-    }
-
     open fun clear() {
         showErrorMessage = { _, _ -> }
-        onExpiredCredentials = {}
-        onDecryptionFailed = {}
+        onSessionExpired = {}
         onNoCurrentStudent = {}
         onPasswordChangeRequired = {}
         onAuthorizationRequired = {}

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt

@@ -1,7 +1,5 @@
 package io.github.wulkanowy.ui.modules.attendance
 
-import android.content.res.ColorStateList
-import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,7 +10,6 @@ import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.enums.SentExcuseStatus
 import io.github.wulkanowy.databinding.ItemAttendanceBinding
 import io.github.wulkanowy.utils.descriptionRes
-import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.isExcusableOrNotExcused
 import javax.inject.Inject
 
@@ -34,43 +31,15 @@ class AttendanceAdapter @Inject constructor() :
     )
 
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val context = holder.binding.root.context
         val item = items[position]
 
         with(holder.binding) {
             attendanceItemNumber.text = item.number.toString()
-            attendanceItemSubject.text = item.subject
-                .ifBlank { context.getString(R.string.all_no_data) }
-            attendanceItemDescription.setText(item.descriptionRes)
-
-            attendanceItemDescription.setTextColor(
-                context.getThemeAttrColor(
-                    when {
-                        item.absence && !item.excused -> R.attr.colorAttendanceAbsence
-                        item.lateness && !item.excused -> R.attr.colorAttendanceLateness
-                        else -> android.R.attr.textColorSecondary
-                    }
-                )
-            )
-
-            if (item.exemption || item.excused) {
-                attendanceItemDescription.setTypeface(null, Typeface.BOLD)
-            } else {
-                attendanceItemDescription.setTypeface(null, Typeface.NORMAL)
+            attendanceItemSubject.text = item.subject.ifBlank {
+                root.context.getString(R.string.all_no_data)
             }
-
-            attendanceItemAlert.isVisible =
-                item.let { (it.absence && !it.excused) || (it.lateness && !it.excused) }
-
-            attendanceItemAlert.imageTintList = ColorStateList.valueOf(
-                context.getThemeAttrColor(
-                    when {
-                        item.absence && !item.excused -> R.attr.colorAttendanceAbsence
-                        item.lateness && !item.excused -> R.attr.colorAttendanceLateness
-                        else -> android.R.attr.colorPrimary
-                    }
-                )
-            )
+            attendanceItemDescription.setText(item.descriptionRes)
+            attendanceItemAlert.isVisible = item.let { it.absence && !it.excused }
             attendanceItemNumber.visibility = View.GONE
             attendanceItemExcuseInfo.visibility = View.GONE
             attendanceItemExcuseCheckbox.visibility = View.GONE
@@ -85,12 +54,10 @@ class AttendanceAdapter @Inject constructor() :
                     attendanceItemExcuseInfo.visibility = View.VISIBLE
                     attendanceItemAlert.visibility = View.INVISIBLE
                 }
-
                 SentExcuseStatus.DENIED -> {
                     attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_denied)
                     attendanceItemExcuseInfo.visibility = View.VISIBLE
                 }
-
                 else -> {
                     if (item.isExcusableOrNotExcused && excuseActionMode) {
                         attendanceItemNumber.visibility = View.GONE

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt

@@ -6,12 +6,10 @@ import android.view.View
 import androidx.core.os.bundleOf
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.databinding.DialogAttendanceBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.descriptionRes
-import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
@@ -46,16 +44,6 @@ class AttendanceDialog : BaseDialogFragment<DialogAttendanceBinding>() {
         with(binding) {
             attendanceDialogSubjectValue.text = attendance.subject
             attendanceDialogDescriptionValue.setText(attendance.descriptionRes)
-            attendanceDialogDescriptionValue.setTextColor(
-                root.context.getThemeAttrColor(
-                    when {
-                        attendance.absence && !attendance.excused -> R.attr.colorAttendanceAbsence
-                        attendance.lateness && !attendance.excused -> R.attr.colorAttendanceLateness
-                        else -> android.R.attr.textColorSecondary
-                    }
-                )
-            )
-
             attendanceDialogDateValue.text = attendance.date.toFormattedString()
             attendanceDialogNumberValue.text = attendance.number.toString()
             attendanceDialogClose.setOnClickListener { dismiss() }

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt

@@ -14,7 +14,6 @@ import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.databinding.DialogExcuseBinding
 import io.github.wulkanowy.databinding.FragmentAttendanceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.attendance.calculator.AttendanceCalculatorFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -135,7 +134,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return if (item.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
-        else if (item.itemId == R.id.attendanceMenuCalculator) presenter.onCalculatorSwitchSelected()
         else false
     }
 
@@ -255,10 +253,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         (activity as? MainActivity)?.pushView(AttendanceSummaryFragment.newInstance())
     }
 
-    override fun openCalculatorView() {
-        (activity as? MainActivity)?.pushView(AttendanceCalculatorFragment.newInstance())
-    }
-
     override fun startActionMode() {
         actionMode = (activity as MainActivity?)?.startSupportActionMode(actionModeCallback)
     }

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt

@@ -1,37 +1,21 @@
 package io.github.wulkanowy.ui.modules.attendance
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.flatResourceFlow
-import io.github.wulkanowy.data.logResourceStatus
-import io.github.wulkanowy.data.mapResourceData
-import io.github.wulkanowy.data.onResourceData
-import io.github.wulkanowy.data.onResourceError
-import io.github.wulkanowy.data.onResourceIntermediate
-import io.github.wulkanowy.data.onResourceLoading
-import io.github.wulkanowy.data.onResourceNotLoading
-import io.github.wulkanowy.data.onResourceSuccess
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.repositories.AttendanceRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.resourceFlow
+import io.github.wulkanowy.data.repositories.TimetableRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.capitalise
-import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
-import io.github.wulkanowy.utils.isExcusableOrNotExcused
-import io.github.wulkanowy.utils.isHolidays
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.nextSchoolDay
-import io.github.wulkanowy.utils.previousOrSameSchoolDay
-import io.github.wulkanowy.utils.previousSchoolDay
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.firstOrNull
+import io.github.wulkanowy.utils.*
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.time.DayOfWeek
@@ -215,11 +199,6 @@ class AttendancePresenter @Inject constructor(
         return true
     }
 
-    fun onCalculatorSwitchSelected(): Boolean {
-        view?.openCalculatorView()
-        return true
-    }
-
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
 
@@ -231,7 +210,7 @@ class AttendancePresenter @Inject constructor(
 
             val semester = semesterRepository.getCurrentSemester(student)
 
-            checkInitialAndCurrentDate(semester)
+            checkInitialAndCurrentDate(student, semester)
             attendanceRepository.getAttendance(
                 student = student,
                 semester = semester,
@@ -287,13 +266,15 @@ class AttendancePresenter @Inject constructor(
             .launch()
     }
 
-    private suspend fun checkInitialAndCurrentDate(semester: Semester) {
+    private suspend fun checkInitialAndCurrentDate(student: Student, semester: Semester) {
         if (initialDate == null) {
-            val lessons = attendanceRepository.getAttendanceFromDatabase(
+            val lessons = attendanceRepository.getAttendance(
+                student = student,
                 semester = semester,
                 start = now().monday,
                 end = now().sunday,
-            ).firstOrNull().orEmpty()
+                forceRefresh = false,
+            ).toFirstResult().dataOrNull.orEmpty()
             isWeekendHasLessons = isWeekendHasLessons(lessons)
             initialDate = getInitialDate(semester)
         }
@@ -335,7 +316,6 @@ class AttendancePresenter @Inject constructor(
                     showContent(false)
                     showExcuseButton(false)
                 }
-
                 is Resource.Success -> {
                     Timber.i("Excusing for absence result: Success")
                     analytics.logEvent("excuse_absence", "items" to attendanceToExcuseList.size)
@@ -348,7 +328,6 @@ class AttendancePresenter @Inject constructor(
                     }
                     loadData(forceRefresh = true)
                 }
-
                 is Resource.Error -> {
                     Timber.i("Excusing for absence result: An exception occurred")
                     errorHandler.dispatch(it.error)

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt

@@ -56,8 +56,6 @@ interface AttendanceView : BaseView {
 
     fun openSummaryView()
 
-    fun openCalculatorView()
-
     fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String)
 
     fun startActionMode()

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorAdapter.kt

@@ -1,67 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.calculator
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.pojos.AttendanceData
-import io.github.wulkanowy.databinding.ItemAttendanceCalculatorHeaderBinding
-import javax.inject.Inject
-import kotlin.math.abs
-import kotlin.math.roundToInt
-
-class AttendanceCalculatorAdapter @Inject constructor() :
-    RecyclerView.Adapter<AttendanceCalculatorAdapter.ViewHolder>() {
-
-    var items = emptyList<AttendanceData>()
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
-        ItemAttendanceCalculatorHeaderBinding.inflate(
-            LayoutInflater.from(parent.context), parent, false
-        )
-    )
-
-    override fun onBindViewHolder(parent: ViewHolder, position: Int) {
-        val context = parent.binding.root.context
-        val item = items[position]
-
-        with(parent.binding) {
-            attendanceCalculatorPercentage.text = "${item.presencePercentage.roundToInt()}"
-
-            attendanceCalculatorSummaryBalance.text = when {
-                item.lessonBalance > 0 -> {
-                    context.getString(
-                        R.string.attendance_calculator_summary_balance_positive,
-                        item.lessonBalance
-                    )
-                }
-
-                item.lessonBalance < 0 -> {
-                    context.getString(
-                        R.string.attendance_calculator_summary_balance_negative,
-                        abs(item.lessonBalance)
-                    )
-                }
-
-                else -> context.getString(R.string.attendance_calculator_summary_balance_neutral)
-            }
-            attendanceCalculatorWarning.isVisible = item.lessonBalance < 0
-            attendanceCalculatorTitle.text = item.subjectName
-            attendanceCalculatorSummaryValues.text = if (item.total == 0) {
-                context.getString(R.string.attendance_calculator_summary_values_empty)
-            } else {
-                context.getString(
-                    R.string.attendance_calculator_summary_values,
-                    item.presences,
-                    item.total
-                )
-            }
-        }
-    }
-
-    class ViewHolder(val binding: ItemAttendanceCalculatorHeaderBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorFragment.kt

@@ -1,105 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.calculator
-
-import android.os.Bundle
-import android.view.View
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.pojos.AttendanceData
-import io.github.wulkanowy.databinding.FragmentAttendanceCalculatorBinding
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AttendanceCalculatorFragment :
-    BaseFragment<FragmentAttendanceCalculatorBinding>(R.layout.fragment_attendance_calculator),
-    AttendanceCalculatorView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: AttendanceCalculatorPresenter
-
-    @Inject
-    lateinit var attendanceCalculatorAdapter: AttendanceCalculatorAdapter
-
-    override val titleStringId get() = R.string.attendance_title
-
-    companion object {
-        fun newInstance() = AttendanceCalculatorFragment()
-    }
-
-    override val isViewEmpty get() = attendanceCalculatorAdapter.items.isEmpty()
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAttendanceCalculatorBinding.bind(view)
-        messageContainer = binding.attendanceCalculatorRecycler
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        with(binding.attendanceCalculatorRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = attendanceCalculatorAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-
-        with(binding) {
-            attendanceCalculatorSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            attendanceCalculatorSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            attendanceCalculatorSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
-            attendanceCalculatorErrorRetry.setOnClickListener { presenter.onRetry() }
-            attendanceCalculatorErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
-    }
-
-    override fun updateData(data: List<AttendanceData>) {
-        with(attendanceCalculatorAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun clearView() {
-        with(attendanceCalculatorAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun showEmpty(show: Boolean) {
-        binding.attendanceCalculatorEmpty.isVisible = show
-    }
-
-    override fun showErrorView(show: Boolean) {
-        binding.attendanceCalculatorError.isVisible = show
-    }
-
-    override fun setErrorDetails(message: String) {
-        binding.attendanceCalculatorErrorMessage.text = message
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.attendanceCalculatorProgress.isVisible = show
-    }
-
-    override fun enableSwipe(enable: Boolean) {
-        binding.attendanceCalculatorSwipe.isEnabled = enable
-    }
-
-    override fun showContent(show: Boolean) {
-        binding.attendanceCalculatorRecycler.isVisible = show
-    }
-
-    override fun showRefresh(show: Boolean) {
-        binding.attendanceCalculatorSwipe.isRefreshing = show
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorPresenter.kt

@@ -1,84 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.calculator
-
-import io.github.wulkanowy.data.*
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.domain.attendance.GetAttendanceCalculatorDataUseCase
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import timber.log.Timber
-import javax.inject.Inject
-
-class AttendanceCalculatorPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val semesterRepository: SemesterRepository,
-    private val getAttendanceCalculatorData: GetAttendanceCalculatorDataUseCase,
-) : BasePresenter<AttendanceCalculatorView>(errorHandler, studentRepository) {
-
-    private lateinit var lastError: Throwable
-
-    override fun onAttachView(view: AttendanceCalculatorView) {
-        super.onAttachView(view)
-        view.initView()
-        Timber.i("Attendance calculator view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData()
-    }
-
-    fun onSwipeRefresh() {
-        Timber.i("Force refreshing the attendance calculator")
-        loadData(forceRefresh = true)
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    private fun loadData(forceRefresh: Boolean = false) {
-        flatResourceFlow {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            getAttendanceCalculatorData(student, semester, forceRefresh)
-        }
-            .logResourceStatus("load attendance calculator")
-            .onResourceData {
-                view?.run {
-                    showProgress(false)
-                    showErrorView(false)
-                    showContent(it.isNotEmpty())
-                    showEmpty(it.isEmpty())
-                    updateData(it)
-                }
-            }
-            .onResourceIntermediate { view?.showRefresh(true) }
-            .onResourceNotLoading {
-                view?.run {
-                    enableSwipe(true)
-                    showRefresh(false)
-                    showProgress(false)
-                }
-            }
-            .onResourceError(errorHandler::dispatch)
-            .launch()
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorView.kt

@@ -1,29 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.calculator
-
-import io.github.wulkanowy.data.pojos.AttendanceData
-import io.github.wulkanowy.ui.base.BaseView
-
-interface AttendanceCalculatorView : BaseView {
-
-    val isViewEmpty: Boolean
-
-    fun initView()
-
-    fun showRefresh(show: Boolean)
-
-    fun showContent(show: Boolean)
-
-    fun showProgress(show: Boolean)
-
-    fun enableSwipe(enable: Boolean)
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun updateData(data: List<AttendanceData>)
-
-    fun clearView()
-}

app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt

@@ -78,9 +78,4 @@ class AuthDialog : BaseDialogFragment<DialogAuthBinding>(), AuthView {
     override fun showDescriptionWithName(name: String) {
         binding.authDescription.text = getString(R.string.auth_description, name).parseAsHtml()
     }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt

@@ -62,11 +62,7 @@ class AuthPresenter @Inject constructor(
                 }
                 isSuccess
             }
-                .onFailure {
-                    errorHandler.dispatch(it)
-                    view?.showProgress(false)
-                    view?.showContent(true)
-                }
+                .onFailure { errorHandler.dispatch(it) }
                 .onSuccess {
                     if (it) {
                         view?.showSuccess(true)

app/src/main/java/io/github/wulkanowy/ui/modules/captcha/CaptchaDialog.kt

@@ -1,91 +0,0 @@
-package io.github.wulkanowy.ui.modules.captcha
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.core.os.bundleOf
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.WulkanowySdkFactory
-import io.github.wulkanowy.databinding.DialogCaptchaBinding
-import io.github.wulkanowy.ui.base.BaseDialogFragment
-import io.github.wulkanowy.utils.WebkitCookieManagerProxy
-import timber.log.Timber
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class CaptchaDialog : BaseDialogFragment<DialogCaptchaBinding>() {
-
-    @Inject
-    lateinit var wulkanowySdkFactory: WulkanowySdkFactory
-
-    @Inject
-    lateinit var webkitCookieManagerProxy: WebkitCookieManagerProxy
-
-    private var webView: WebView? = null
-
-    companion object {
-        const val CAPTCHA_SUCCESS = "captcha_success"
-        private const val CAPTCHA_URL = "captcha_url"
-        private const val CAPTCHA_CHECK_JS = "document.getElementById('challenge-running') == null"
-
-        fun newInstance(url: String?): CaptchaDialog {
-            return CaptchaDialog().apply {
-                arguments = bundleOf(CAPTCHA_URL to url)
-            }
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = DialogCaptchaBinding.inflate(inflater).apply { binding = this }.root
-
-    @SuppressLint("SetJavaScriptEnabled")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        isCancelable = false
-        binding.captchaRefresh.setOnClickListener {
-            binding.captchaWebview.loadUrl(arguments?.getString(CAPTCHA_URL).orEmpty())
-        }
-        binding.captchaClose.setOnClickListener { dismiss() }
-
-        with(binding.captchaWebview) {
-            webView = this
-            with(settings) {
-                javaScriptEnabled = true
-                userAgentString = wulkanowySdkFactory.create().userAgent
-            }
-
-            webViewClient = object : WebViewClient() {
-                override fun onPageFinished(view: WebView?, url: String?) {
-                    view?.evaluateJavascript(CAPTCHA_CHECK_JS) {
-                        if (it == "true") {
-                            onChallengeAccepted()
-                        }
-                    }
-                }
-            }
-
-            loadUrl(arguments?.getString(CAPTCHA_URL).orEmpty())
-        }
-    }
-
-    private fun onChallengeAccepted() {
-        runCatching { parentFragmentManager.setFragmentResult(CAPTCHA_SUCCESS, bundleOf()) }
-            .onFailure { Timber.e(it) }
-        showMessage(getString(R.string.captcha_verified_message))
-        dismissAllowingStateLoss()
-    }
-
-    override fun onDestroy() {
-        webkitCookieManagerProxy.webkitCookieManager?.flush()
-        webView?.destroy()
-        super.onDestroy()
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt

@@ -18,10 +18,8 @@ import io.github.wulkanowy.databinding.FragmentDashboardBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
-import io.github.wulkanowy.ui.modules.captcha.CaptchaDialog.Companion.CAPTCHA_SUCCESS
 import io.github.wulkanowy.ui.modules.conference.ConferenceFragment
 import io.github.wulkanowy.ui.modules.dashboard.adapters.DashboardAdapter
-import io.github.wulkanowy.ui.modules.dashboard.viewholders.AdminMessageViewHolder
 import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
@@ -32,12 +30,7 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.notificationscenter.NotificationsCenterFragment
 import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
-import io.github.wulkanowy.utils.capitalise
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.getErrorString
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.*
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -64,9 +57,6 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
             return ((recyclerWidth - margin) / resources.displayMetrics.density).toInt()
         }
 
-    override val isViewEmpty
-        get() = dashboardAdapter.itemCount == 0
-
     companion object {
 
         fun newInstance() = DashboardFragment()
@@ -82,13 +72,6 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentDashboardBinding.bind(view)
         presenter.onAttachView(this)
-        initializeCaptchaResultObserver()
-    }
-
-    private fun initializeCaptchaResultObserver() {
-        childFragmentManager.setFragmentResultListener(CAPTCHA_SUCCESS, this) { _, _ ->
-            presenter.onRetryAfterCaptcha()
-        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -199,17 +182,8 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
         binding.dashboardRecycler.isVisible = show
     }
 
-    override fun showErrorView(show: Boolean, adminMessageItem: DashboardItem.AdminMessages?) {
+    override fun showErrorView(show: Boolean) {
         binding.dashboardErrorContainer.isVisible = show
-        binding.dashboardErrorAdminMessage.root.isVisible = adminMessageItem != null
-
-        if (adminMessageItem != null) {
-            AdminMessageViewHolder(
-                binding = binding.dashboardErrorAdminMessage,
-                onAdminMessageDismissClickListener = presenter::onAdminMessageDismissed,
-                onAdminMessageClickListener = presenter::onAdminMessageSelected,
-            ).bind(adminMessageItem.adminMessage)
-        }
     }
 
     override fun setErrorDetails(error: Throwable) {

app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt

@@ -1,48 +1,19 @@
 package io.github.wulkanowy.ui.modules.dashboard
 
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.dataOrNull
+import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageType
-import io.github.wulkanowy.data.errorOrNull
-import io.github.wulkanowy.data.flatResourceFlow
-import io.github.wulkanowy.data.mapResourceData
-import io.github.wulkanowy.data.onResourceError
-import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
-import io.github.wulkanowy.data.repositories.ConferenceRepository
-import io.github.wulkanowy.data.repositories.ExamRepository
-import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.HomeworkRepository
-import io.github.wulkanowy.data.repositories.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.MessageRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SchoolAnnouncementRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.data.repositories.*
 import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
-import io.github.wulkanowy.domain.timetable.IsStudentHasLessonsOnWeekendUseCase
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.calculatePercentage
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.sunday
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.filterNot
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.merge
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.time.Instant
@@ -58,7 +29,6 @@ class DashboardPresenter @Inject constructor(
     private val messageRepository: MessageRepository,
     private val attendanceSummaryRepository: AttendanceSummaryRepository,
     private val timetableRepository: TimetableRepository,
-    private val isStudentHasLessonsOnWeekendUseCase: IsStudentHasLessonsOnWeekendUseCase,
     private val homeworkRepository: HomeworkRepository,
     private val examRepository: ExamRepository,
     private val conferenceRepository: ConferenceRepository,
@@ -78,11 +48,6 @@ class DashboardPresenter @Inject constructor(
 
     private val firstLoadedItemList = mutableListOf<DashboardItem.Type>()
 
-    private val selectedDashboardTiles
-        get() = preferencesRepository.selectedDashboardTiles
-            .filterNot { it == DashboardItem.Tile.ADS && !adsHelper.canShowAd }
-            .toSet()
-
     private lateinit var lastError: Throwable
 
     override fun onAttachView(view: DashboardView) {
@@ -94,19 +59,10 @@ class DashboardPresenter @Inject constructor(
             showContent(false)
         }
 
-        val selectedDashboardTilesFlow = preferencesRepository.selectedDashboardTilesFlow
-            .map { selectedDashboardTiles }
-        val isAdsEnabledFlow = preferencesRepository.isAdsEnabledFlow
-            .filter { (adsHelper.canShowAd && it) || !it }
-            .map { selectedDashboardTiles }
-        val isMobileAdsSdkInitializedFlow = adsHelper.isMobileAdsSdkInitialized
-            .filter { it }
-            .map { selectedDashboardTiles }
-
         merge(
-            selectedDashboardTilesFlow,
-            isAdsEnabledFlow,
-            isMobileAdsSdkInitializedFlow
+            preferencesRepository.selectedDashboardTilesFlow,
+            preferencesRepository.isAdsEnabledFlow
+                .map { preferencesRepository.selectedDashboardTiles }
         )
             .onEach { loadData(tilesToLoad = it) }
             .launch("dashboard_pref")
@@ -115,7 +71,7 @@ class DashboardPresenter @Inject constructor(
     fun onAdminMessageDismissed(adminMessage: AdminMessage) {
         preferencesRepository.dismissedAdminMessageIds += adminMessage.id
 
-        loadData(selectedDashboardTiles)
+        loadData(preferencesRepository.selectedDashboardTiles)
     }
 
     fun onDragAndDropEnd(list: List<DashboardItem>) {
@@ -231,7 +187,7 @@ class DashboardPresenter @Inject constructor(
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the dashboard")
-        loadData(selectedDashboardTiles, forceRefresh = true)
+        loadData(preferencesRepository.selectedDashboardTiles, forceRefresh = true)
     }
 
     fun onRetry() {
@@ -239,15 +195,7 @@ class DashboardPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(selectedDashboardTiles, forceRefresh = true)
-    }
-
-    fun onRetryAfterCaptcha() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(selectedDashboardTiles, forceRefresh = true)
+        loadData(preferencesRepository.selectedDashboardTiles, forceRefresh = true)
     }
 
     fun onViewReselected() {
@@ -268,7 +216,7 @@ class DashboardPresenter @Inject constructor(
     }
 
     fun onDashboardTileSettingsSelected(): Boolean {
-        view?.showDashboardTileSettings(selectedDashboardTiles.toList())
+        view?.showDashboardTileSettings(preferencesRepository.selectedDashboardTiles.toList())
         return true
     }
 
@@ -284,7 +232,7 @@ class DashboardPresenter @Inject constructor(
 
     private fun loadHorizontalGroup(student: Student, forceRefresh: Boolean) {
         flow {
-            val selectedTiles = selectedDashboardTiles
+            val selectedTiles = preferencesRepository.selectedDashboardTiles
             val flowSuccess = flowOf(Resource.Success(null))
 
             val luckyNumberFlow = luckyNumberRepository.getLuckyNumber(student, forceRefresh)
@@ -304,7 +252,6 @@ class DashboardPresenter @Inject constructor(
                     forceRefresh = forceRefresh
                 )
             }
-                .mapResourceData { it.map { messageWithAuthor -> messageWithAuthor.message } }
                 .onResourceError { errorHandler.dispatch(it) }
                 .takeIf { DashboardItem.Tile.MESSAGES in selectedTiles } ?: flowSuccess
 
@@ -328,7 +275,7 @@ class DashboardPresenter @Inject constructor(
                 ) { luckyNumberResource, messageResource, attendanceResource ->
                     val resList = listOf(luckyNumberResource, messageResource, attendanceResource)
 
-                    resList to DashboardItem.HorizontalGroup(
+                    DashboardItem.HorizontalGroup(
                         isLoading = resList.any { it is Resource.Loading },
                         error = resList.map { it.errorOrNull }.let { errors ->
                             if (errors.all { it != null }) {
@@ -353,9 +300,9 @@ class DashboardPresenter @Inject constructor(
                     )
                 })
         }
-            .filterNot { (_, it) -> it.isLoading && forceRefresh }
+            .filterNot { it.isLoading && forceRefresh }
             .distinctUntilChanged()
-            .onEach { (_, it) ->
+            .onEach {
                 updateData(it, forceRefresh)
 
                 if (it.isLoading) {
@@ -373,7 +320,7 @@ class DashboardPresenter @Inject constructor(
                 )
                 errorHandler.dispatch(it)
             }
-            .launchWithUniqueRefreshJob("horizontal_group", forceRefresh)
+            .launch("horizontal_group ${if (forceRefresh) "-forceRefresh" else ""}")
     }
 
     private fun loadGrades(student: Student, forceRefresh: Boolean) {
@@ -407,7 +354,7 @@ class DashboardPresenter @Inject constructor(
                                 subjectWithGrades = it.dataOrNull,
                                 gradeTheme = preferencesRepository.gradeColorTheme,
                                 isLoading = true
-                            ), false
+                            ), forceRefresh
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -439,17 +386,14 @@ class DashboardPresenter @Inject constructor(
     private fun loadLessons(student: Student, forceRefresh: Boolean) {
         flatResourceFlow {
             val semester = semesterRepository.getCurrentSemester(student)
-            val date = when (isStudentHasLessonsOnWeekendUseCase(semester)) {
-                true -> LocalDate.now()
-                else -> LocalDate.now().nextOrSameSchoolDay
-            }
+            val date = LocalDate.now()
 
             timetableRepository.getTimetable(
                 student = student,
                 semester = semester,
                 start = date,
-                end = date.sunday,
-                forceRefresh = forceRefresh,
+                end = date.plusDays(1),
+                forceRefresh = forceRefresh
             )
         }
             .onEach {
@@ -459,7 +403,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(
                             DashboardItem.Lessons(it.dataOrNull, isLoading = true),
-                            false
+                            forceRefresh
                         )
 
                         if (!it.dataOrNull?.lessons.isNullOrEmpty()) {
@@ -516,7 +460,7 @@ class DashboardPresenter @Inject constructor(
                         val data = it.dataOrNull.orEmpty()
                         updateData(
                             DashboardItem.Homework(data, isLoading = true),
-                            false
+                            forceRefresh
                         )
 
                         if (data.isNotEmpty()) {
@@ -550,7 +494,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(
                             DashboardItem.Announcements(it.dataOrNull.orEmpty(), isLoading = true),
-                            false
+                            forceRefresh
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -593,7 +537,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(
                             DashboardItem.Exams(it.dataOrNull.orEmpty(), isLoading = true),
-                            false
+                            forceRefresh
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -634,7 +578,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(
                             DashboardItem.Conferences(it.dataOrNull.orEmpty(), isLoading = true),
-                            false
+                            forceRefresh
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -669,7 +613,7 @@ class DashboardPresenter @Inject constructor(
                     is Resource.Loading -> {
                         Timber.i("Loading dashboard admin message data started")
                         if (forceRefresh) return@onEach
-                        updateData(DashboardItem.AdminMessages(), false)
+                        updateData(DashboardItem.AdminMessages(), forceRefresh)
                     }
 
                     is Resource.Success -> {
@@ -699,7 +643,7 @@ class DashboardPresenter @Inject constructor(
     private fun loadAds(forceRefresh: Boolean) {
         presenterScope.launch {
             if (!forceRefresh) {
-                updateData(DashboardItem.Ads(), false)
+                updateData(DashboardItem.Ads(), forceRefresh)
             }
 
             val dashboardAdItem =
@@ -820,8 +764,6 @@ class DashboardPresenter @Inject constructor(
         val filteredItems = itemsLoadedList.filterNot {
             it.type == DashboardItem.Type.ACCOUNT || it.type == DashboardItem.Type.ADMIN_MESSAGE
         }
-        val dataLoadedAdminMessageItem =
-            itemsLoadedList.find { it.type == DashboardItem.Type.ADMIN_MESSAGE && it.isDataLoaded } as DashboardItem.AdminMessages?
         val isAccountItemError =
             itemsLoadedList.find { it.type == DashboardItem.Type.ACCOUNT }?.error != null
         val isGeneralError =
@@ -843,7 +785,7 @@ class DashboardPresenter @Inject constructor(
                 showRefresh(false)
                 if ((forceRefresh && wasGeneralError) || !forceRefresh) {
                     showContent(false)
-                    showErrorView(true, dataLoadedAdminMessageItem)
+                    showErrorView(true)
                     setErrorDetails(lastError)
                 }
             }
@@ -871,28 +813,6 @@ class DashboardPresenter @Inject constructor(
             onEach {
                 if (it is Resource.Success) {
                     cancelJobs(jobName)
-                } else if (it is Resource.Error) {
-                    cancelJobs(jobName)
-                }
-            }.launch(jobName)
-        } else {
-            launch(jobName)
-        }
-    }
-
-    @JvmName("launchWithUniqueRefreshJobHorizontalGroup")
-    private fun Flow<Pair<List<Resource<*>>, *>>.launchWithUniqueRefreshJob(
-        name: String,
-        forceRefresh: Boolean
-    ) {
-        val jobName = if (forceRefresh) "$name-forceRefresh" else name
-
-        if (forceRefresh) {
-            onEach { (resources, _) ->
-                if (resources.all { it is Resource.Success<*> }) {
-                    cancelJobs(jobName)
-                } else if (resources.any { it is Resource.Error<*> }) {
-                    cancelJobs(jobName)
                 }
             }.launch(jobName)
         } else {