Merge branch 'release/2.3.2'

.github/FUNDING.yml

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

.gitignore

@@ -65,8 +65,6 @@ captures/
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
 .idea/discord.xml
-.idea/migrations.xml
-.idea/androidTestResultsUserPreferences.xml
 
 # Keystore files
 *.jks

.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

app/build.gradle

@@ -27,8 +27,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 148
-        versionName "2.4.2"
+        versionCode 142
+        versionName "2.3.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -142,9 +142,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']
         }
     }
 
@@ -165,7 +163,7 @@ play {
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
     userFraction = 0.99d
-    updatePriority = 2
+    updatePriority = 3
     enabled.set(false)
 }
 
@@ -187,19 +185,19 @@ huaweiPublish {
 
 ext {
     work_manager = "2.9.0"
-    android_hilt = "1.2.0"
+    android_hilt = "1.1.0"
     room = "2.6.1"
     chucker = "4.0.0"
     mockk = "1.13.9"
-    coroutines = "1.8.0"
+    coroutines = "1.7.3"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.4.2-SNAPSHOT'
+    implementation 'io.github.wulkanowy:sdk:2.3.4'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation 'androidx.core:core-ktx:1.12.0'
@@ -223,7 +221,7 @@ dependencies {
     implementation "androidx.work:work-runtime:$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"
@@ -240,19 +238,18 @@ 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 '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.2')
+    playImplementation platform('com.google.firebase:firebase-bom:32.7.0')
     playImplementation 'com.google.firebase:firebase-analytics'
     playImplementation 'com.google.firebase:firebase-messaging'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
@@ -264,7 +261,7 @@ dependencies {
     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.hms:hianalytics:6.12.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.303'
 
     releaseImplementation "com.github.chuckerteam.chucker:library-no-op:$chucker"

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/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"

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/data/DataModule.kt

@@ -21,7 +21,6 @@ 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 io.github.wulkanowy.utils.WebkitCookieManagerProxy
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -44,7 +43,6 @@ internal class DataModule {
             buildTag = android.os.Build.MODEL
             userAgentTemplate = remoteConfig.userAgentTemplate
             setSimpleHttpLogger { Timber.d(it) }
-            setAdditionalCookieManager(WebkitCookieManagerProxy())
 
             // for debug only
             addInterceptor(chuckerInterceptor, network = true)
@@ -253,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,16 +1,6 @@
 package io.github.wulkanowy.data
 
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
@@ -30,15 +20,8 @@ val <T> Resource<T>.dataOrNull: T?
     get() = when (this) {
         is Resource.Success -> this.data
         is Resource.Intermediate -> this.data
-        else -> null
-    }
-
-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?
@@ -148,7 +131,7 @@ inline fun <ResultType, RequestType> networkBoundResource(
             query().map { Resource.Success(filterResult(it)) }
         } catch (throwable: Throwable) {
             onFetchFailed(throwable)
-            flowOf(Resource.Error(throwable))
+            query().map { Resource.Error(throwable) }
         }
     } else {
         query().map { Resource.Success(filterResult(it)) }
@@ -182,7 +165,7 @@ inline fun <ResultType, RequestType, T> networkBoundResource(
             query().map { Resource.Success(mapResult(it)) }
         } catch (throwable: Throwable) {
             onFetchFailed(throwable)
-            flowOf(Resource.Error(throwable))
+            query().map { Resource.Error(throwable) }
         }
     } else {
         query().map { Resource.Success(mapResult(it)) }

app/src/main/java/io/github/wulkanowy/data/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,9 +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),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -181,7 +59,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 60
+        const val VERSION_SCHEMA = 57
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -306,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/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/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/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/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/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/repositories/AttendanceRepository.kt

@@ -9,15 +9,11 @@ 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.init
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.switchSemester
-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
@@ -56,11 +52,13 @@ 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
-            )
+            val lessons = withContext(Dispatchers.IO) {
+                timetableDb.load(
+                    semester.diaryId, semester.studentId, start.monday, end.sunday
+                )
+            }
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getAttendance(start.monday, end.sunday)
                 .mapToEntities(semester, lessons)
         },
@@ -88,12 +86,9 @@ class AttendanceRepository @Inject constructor(
         return attendanceDb.updateAll(timetable)
     }
 
-    @JvmName("excuseForAbsenceLessons")
     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(
@@ -102,25 +97,7 @@ class AttendanceRepository @Inject constructor(
             )
         }
         sdk.init(student)
-            .switchSemester(semester)
-            .excuseForAbsence(items, reason)
-    }
-
-    @JvmName("excuseForAbsenceDays")
-    suspend fun excuseForAbsence(
-        student: Student,
-        semester: Semester,
-        days: List<LocalDate>,
-        reason: String? = null
-    ) {
-        val items = days.map { day ->
-            Absent(
-                date = LocalDateTime.of(day, LocalTime.of(0, 0)),
-                timeId = null,
-            )
-        }
-        sdk.init(student)
-            .switchSemester(semester)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .excuseForAbsence(items, reason)
     }
 }

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

@@ -9,7 +9,6 @@ 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.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -41,7 +40,7 @@ class AttendanceSummaryRepository @Inject constructor(
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getAttendanceSummary(subjectId)
                 .mapToEntities(semester, subjectId)
         },

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

@@ -48,7 +48,7 @@ class CompletedLessonsRepository @Inject constructor(
         },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getCompletedLessons(start.monday, end.sunday)
                 .mapToEntities(semester)
         },

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

@@ -10,7 +10,6 @@ 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.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -47,7 +46,7 @@ class ConferenceRepository @Inject constructor(
         },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getConferences()
                 .mapToEntities(semester)
                 .filter { it.date >= startDate }

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

@@ -7,13 +7,7 @@ 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.endExamsDay
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.startExamsDay
-import io.github.wulkanowy.utils.switchSemester
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
@@ -57,7 +51,7 @@ class ExamRepository @Inject constructor(
         },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getExams(start.startExamsDay, start.endExamsDay)
                 .mapToEntities(semester)
         },
@@ -73,16 +67,14 @@ class ExamRepository @Inject constructor(
         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,22 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
 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.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.switchSemester
-import io.github.wulkanowy.utils.toLocalDate
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
@@ -29,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 sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
     private val saveFetchResultMutex = Mutex()
 
+    private val cacheKey = "grade"
+
     fun getGrades(
         student: Student,
         semester: Semester,
@@ -47,52 +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) = sdk.init(student)
-                .switchSemester(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.deleteAll(old uniqueSubtract new)
-        gradeDescriptiveDb.insertAll((new uniqueSubtract old).onEach {
-            if (notify) it.isNotified = false
-        })
-    }
-
     private suspend fun refreshGradeDetails(
         student: Student,
         oldGrades: List<Grade>,
@@ -160,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))
     }
@@ -175,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

@@ -16,7 +16,6 @@ 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.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import java.util.*
@@ -57,7 +56,7 @@ class GradeStatisticsRepository @Inject constructor(
         query = { gradePartialStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesPartialStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
@@ -102,7 +101,7 @@ class GradeStatisticsRepository @Inject constructor(
         query = { gradeSemesterStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesSemesterStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },
@@ -158,7 +157,7 @@ class GradeStatisticsRepository @Inject constructor(
         query = { gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getGradesPointsStatistics(semester.semesterId)
                 .mapToEntities(semester)
         },

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

@@ -7,13 +7,7 @@ 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.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.switchSemester
-import io.github.wulkanowy.utils.uniqueSubtract
+import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
@@ -56,7 +50,7 @@ class HomeworkRepository @Inject constructor(
         },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getHomework(start.monday, end.sunday)
                 .mapToEntities(semester)
         },

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

@@ -8,17 +8,13 @@ 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
@@ -26,7 +22,6 @@ 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
@@ -36,6 +31,7 @@ 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
@@ -46,7 +42,6 @@ import javax.inject.Singleton
 @Singleton
 class MessageRepository @Inject constructor(
     private val messagesDb: MessagesDao,
-    private val mutedMessageSendersDao: MutedMessageSendersDao,
     private val messageAttachmentDao: MessageAttachmentDao,
     private val sdk: Sdk,
     @ApplicationContext private val context: Context,
@@ -56,6 +51,7 @@ class MessageRepository @Inject constructor(
     private val mailboxDao: MailboxDao,
     private val getMailboxByStudentUseCase: GetMailboxByStudentUseCase,
 ) {
+
     private val saveFetchResultMutex = Mutex()
 
     private val messagesCacheKey = "message"
@@ -67,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 = {
@@ -78,8 +74,8 @@ 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 = {
             sdk.init(student).getMessages(
@@ -87,12 +83,10 @@ class MessageRepository @Inject constructor(
                 mailboxKey = mailbox?.globalKey,
             ).mapToEntities(student, mailbox, mailboxDao.loadAll(student.email))
         },
-        saveFetchResult = { oldWithAuthors, new ->
-            val old = oldWithAuthors.map { it.message }
+        saveFetchResult = { old, new ->
             messagesDb.deleteAll(old uniqueSubtract new)
             messagesDb.insertAll((new uniqueSubtract old).onEach {
-                val muted = isMuted(it.correspondents)
-                it.isNotified = !notify || muted
+                it.isNotified = !notify
             })
 
             refreshHelper.updateLastRefreshTimestamp(
@@ -112,7 +106,9 @@ 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 = {
             sdk.init(student).getMessageDetails(
                 messageKey = it!!.message.messageGlobalKey,
@@ -156,30 +152,17 @@ class MessageRepository @Inject constructor(
         subject: String,
         content: String,
         recipients: List<Recipient>,
-        mailbox: Mailbox,
+        mailboxId: String,
     ) {
         sdk.init(student).sendMessage(
             subject = subject,
             content = content,
             recipients = recipients.mapFromEntities(),
-            mailboxId = mailbox.globalKey,
+            mailboxId = mailboxId,
         )
-        refreshFolders(student, mailbox, listOf(SENT))
     }
 
-    suspend fun restoreMessages(student: Student, mailbox: Mailbox?, messages: List<Message>) {
-        sdk.init(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()
         sdk.init(student).deleteMessages(
             messages = messages.map { it.messageGlobalKey },
@@ -198,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(
@@ -259,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

@@ -12,7 +12,6 @@ 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.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -43,7 +42,7 @@ class MobileDeviceRepository @Inject constructor(
         query = { mobileDb.loadAll(student.userLoginId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getRegisteredDevices()
                 .mapToEntities(student)
         },
@@ -57,7 +56,7 @@ class MobileDeviceRepository @Inject constructor(
 
     suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
         sdk.init(student)
-            .switchSemester(semester)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .unregisterDevice(device.deviceId)
 
         mobileDb.deleteAll(listOf(device))
@@ -65,7 +64,7 @@ class MobileDeviceRepository @Inject constructor(
 
     suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
         return sdk.init(student)
-            .switchSemester(semester)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .getToken()
             .mapToMobileDeviceToken()
     }

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

@@ -41,7 +41,7 @@ class NoteRepository @Inject constructor(
         query = { noteDb.loadAll(student.studentId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getNotes()
                 .mapToEntities(semester)
         },

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

@@ -9,7 +9,6 @@ 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.switchSemester
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -41,7 +40,7 @@ class SchoolRepository @Inject constructor(
         query = { schoolDb.load(semester.studentId, semester.classId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getSchool()
                 .mapToEntity(semester)
         },

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

@@ -11,7 +11,6 @@ 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 io.github.wulkanowy.utils.switchSemester
 import kotlinx.coroutines.withTimeout
 import timber.log.Timber
 import java.util.UUID
@@ -43,7 +42,11 @@ class SchoolsRepository @Inject constructor(
 
         val schoolInfo = sdk
             .init(student.copy(password = loginData.password))
-            .switchSemester(semester)
+            .switchDiary(
+                diaryId = semester.diaryId,
+                kindergartenDiaryId = semester.kindergartenDiaryId,
+                schoolYear = semester.schoolYear
+            )
             .getSchool()
 
         schoolsService.logLoginEvent(

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

@@ -7,7 +7,6 @@ import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.switchSemester
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -31,7 +30,7 @@ class StudentInfoRepository @Inject constructor(
         query = { studentInfoDao.loadStudentInfo(student.studentId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getStudentInfo().mapToEntity(semester)
         },
         saveFetchResult = { old, new ->

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

@@ -16,7 +16,6 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.security.Scrambler
-import io.github.wulkanowy.utils.switchSemester
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -150,12 +149,12 @@ class StudentRepository @Inject constructor(
 
     suspend fun authorizePermission(student: Student, semester: Semester, pesel: String) =
         sdk.init(student)
-            .switchSemester(semester)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .authorizePermission(pesel)
 
     suspend fun refreshStudentName(student: Student, semester: Semester) {
         val newCurrentApiStudent = sdk.init(student)
-            .switchSemester(semester)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
             .getCurrentStudent() ?: return
 
         val studentName = StudentName(

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

@@ -9,7 +9,6 @@ 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.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -40,9 +39,8 @@ class SubjectRepository @Inject constructor(
         query = { subjectDao.loadAll(semester.diaryId, semester.studentId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
-                .getSubjects()
-                .mapToEntities(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .getSubjects().mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
             subjectDao.deleteAll(old uniqueSubtract new)

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

@@ -9,7 +9,6 @@ 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.switchSemester
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
@@ -40,7 +39,7 @@ class TeacherRepository @Inject constructor(
         query = { teacherDb.loadAll(semester.studentId, semester.classId) },
         fetch = {
             sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getTeachers()
                 .mapToEntities(semester)
         },

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

@@ -3,23 +3,13 @@ package io.github.wulkanowy.data.repositories
 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.init
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.switchSemester
-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
@@ -75,7 +65,7 @@ class TimetableRepository @Inject constructor(
         query = { getFullTimetableFromDatabase(student, semester, start, end) },
         fetch = {
             val timetableFull = sdk.init(student)
-                .switchSemester(semester)
+                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getTimetable(start.monday, end.sunday)
 
             timetableFull.mapToEntities(semester)
@@ -131,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>) {

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

@@ -11,7 +11,6 @@ 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
@@ -78,10 +77,6 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
             .show()
     }
 
-    override fun onCaptchaVerificationRequired(url: String?) {
-        CaptchaDialog.newInstance(url).show(supportFragmentManager, "captcha_dialog")
-    }
-
     override fun showDecryptionFailedDialog() {
         MaterialAlertDialogBuilder(this)
             .setTitle(R.string.main_session_expired)

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
@@ -31,10 +32,6 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
         (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
     }
 
-    override fun onCaptchaVerificationRequired(url: String?) {
-        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
-    }
-
     override fun showDecryptionFailedDialog() {
         (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
@@ -48,7 +45,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),
@@ -42,16 +43,12 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragme
         (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
     }
 
-    override fun onCaptchaVerificationRequired(url: String?) {
-        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
-    }
-
     override fun showDecryptionFailedDialog() {
         (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
 
     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

@@ -29,7 +29,6 @@ open class BasePresenter<T : BaseView>(
         errorHandler.apply {
             showErrorMessage = view::showError
             onExpiredCredentials = view::showExpiredCredentialsDialog
-            onCaptchaVerificationRequired = view::onCaptchaVerificationRequired
             onDecryptionFailed = view::showDecryptionFailedDialog
             onNoCurrentStudent = view::openClearLoginView
             onPasswordChangeRequired = view::showChangePasswordSnackbar

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

@@ -8,8 +8,6 @@ interface BaseView {
 
     fun showExpiredCredentialsDialog()
 
-    fun onCaptchaVerificationRequired(url: String?)
-
     fun showDecryptionFailedDialog()
 
     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
@@ -26,29 +25,22 @@ 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 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 = {}

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

@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.attendance
 
-import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,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
 
@@ -41,33 +39,7 @@ class AttendanceAdapter @Inject constructor() :
                 root.context.getString(R.string.all_no_data)
             }
             attendanceItemDescription.setText(item.descriptionRes)
-
-            attendanceItemDescription.setTextColor(
-                root.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)
-            }
-
-            attendanceItemAlert.isVisible =
-                item.let { (it.absence && !it.excused) || (it.lateness && !it.excused) }
-
-            attendanceItemAlert.setColorFilter(root.context.getThemeAttrColor(
-                when{
-                    item.absence && !item.excused -> R.attr.colorAttendanceAbsence
-                    item.lateness && !item.excused -> R.attr.colorAttendanceLateness
-                    else -> android.R.attr.colorPrimary
-                }
-            ))
+            attendanceItemAlert.isVisible = item.let { it.absence && !it.excused }
             attendanceItemNumber.visibility = View.GONE
             attendanceItemExcuseInfo.visibility = View.GONE
             attendanceItemExcuseCheckbox.visibility = View.GONE
@@ -82,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

@@ -2,14 +2,8 @@ package io.github.wulkanowy.ui.modules.attendance
 
 import android.content.DialogInterface.BUTTON_POSITIVE
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.View.GONE
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
+import android.view.*
+import android.view.View.*
 import androidx.appcompat.view.ActionMode
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -69,8 +63,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
             val inflater = mode.menuInflater
             inflater.inflate(R.menu.context_menu_attendance, menu)
-            menu.findItem(R.id.excuseMenuDaySubmit).setVisible(presenter.isWholeDayExcusable)
-
             return true
         }
 
@@ -86,7 +78,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
         override fun onActionItemClicked(mode: ActionMode, menu: MenuItem): Boolean {
             return when (menu.itemId) {
-                R.id.excuseMenuDaySubmit -> presenter.onExcuseDayButtonClick()
                 R.id.excuseMenuSubmit -> presenter.onExcuseSubmitButtonClick()
                 else -> false
             }
@@ -266,18 +257,11 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         actionMode = (activity as MainActivity?)?.startSupportActionMode(actionModeCallback)
     }
 
-    override fun startSendMessageIntent(date: LocalDate, lessons: String, reason: String) {
-        val reasonFullText = if (lessons.isEmpty()) {
-            getString(
-                R.string.attendance_excuse_day_formula,
-                date,
-                if (reason.isNotBlank()) " ${getString(R.string.attendance_excuse_reason)} " else "",
-                reason.ifBlank { "" }
-            )
-        } else getString(
-            R.string.attendance_excuse_lessons_formula,
+    override fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String) {
+        val reasonFullText = getString(
+            R.string.attendance_excuse_formula,
             date,
-            lessons,
+            numbers,
             if (reason.isNotBlank()) " ${getString(R.string.attendance_excuse_reason)} " else "",
             reason.ifBlank { "" }
         )

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

@@ -4,14 +4,18 @@ import android.annotation.SuppressLint
 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.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.repositories.TimetableRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.*
-import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.time.DayOfWeek
@@ -38,7 +42,6 @@ class AttendancePresenter @Inject constructor(
     private lateinit var lastError: Throwable
 
     private val attendanceToExcuseList = mutableListOf<Attendance>()
-    var isWholeDayExcusable = false
 
     private var isVulcanExcusedFunctionEnabled = false
 
@@ -132,12 +135,6 @@ class AttendancePresenter @Inject constructor(
         view?.startActionMode()
     }
 
-    fun onExcuseDayButtonClick(): Boolean {
-        view?.showExcuseDialog()
-
-        return true
-    }
-
     fun onExcuseCheckboxSelect(attendanceItem: Attendance, checked: Boolean) {
         if (checked) attendanceToExcuseList.add(attendanceItem)
         else attendanceToExcuseList.remove(attendanceItem)
@@ -159,7 +156,7 @@ class AttendancePresenter @Inject constructor(
     fun onExcuseDialogSubmit(reason: String) {
         view?.finishActionMode()
 
-        if (attendanceToExcuseList.isEmpty() && !isWholeDayExcusable) return
+        if (attendanceToExcuseList.isEmpty()) return
 
         if (isVulcanExcusedFunctionEnabled) {
             excuseAbsence(
@@ -170,8 +167,8 @@ class AttendancePresenter @Inject constructor(
             val attendanceToExcuseNumbers = attendanceToExcuseList.map { it.number }
 
             view?.startSendMessageIntent(
-                date = currentDate ?: attendanceToExcuseList[0].date,
-                lessons = attendanceToExcuseNumbers.joinToString(", "),
+                date = attendanceToExcuseList[0].date,
+                numbers = attendanceToExcuseNumbers.joinToString(", "),
                 reason = reason
             )
         }
@@ -213,7 +210,7 @@ class AttendancePresenter @Inject constructor(
 
             val semester = semesterRepository.getCurrentSemester(student)
 
-            checkInitialAndCurrentDate(semester)
+            checkInitialAndCurrentDate(student, semester)
             attendanceRepository.getAttendance(
                 student = student,
                 semester = semester,
@@ -224,9 +221,7 @@ class AttendancePresenter @Inject constructor(
         }
             .logResourceStatus("load attendance")
             .onResourceLoading {
-                view?.apply {
-                    showExcuseButton(false)
-                }
+                view?.showExcuseButton(false)
             }
             .mapResourceData {
                 if (prefRepository.isShowPresent) {
@@ -249,16 +244,15 @@ class AttendancePresenter @Inject constructor(
                 }
             }
             .onResourceIntermediate { view?.showRefresh(true) }
-            .onResourceSuccess { items ->
-                isVulcanExcusedFunctionEnabled = items.any { item -> item.excusable }
-                isWholeDayExcusable = items.all { it.isAbsenceExcusable }
-                val anyExcusables = items.any { it.isExcusableOrNotExcused }
+            .onResourceSuccess {
+                isVulcanExcusedFunctionEnabled = it.any { item -> item.excusable }
+                val anyExcusables = it.any { it.isExcusableOrNotExcused }
                 view?.showExcuseButton(anyExcusables && (isParent || isVulcanExcusedFunctionEnabled))
 
                 analytics.logEvent(
                     "load_data",
                     "type" to "attendance",
-                    "items" to items.size
+                    "items" to it.size
                 )
             }
             .onResourceNotLoading {
@@ -272,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)
         }
@@ -311,19 +307,7 @@ class AttendancePresenter @Inject constructor(
         resourceFlow {
             val student = studentRepository.getCurrentStudent()
             val semester = semesterRepository.getCurrentSemester(student)
-            if (toExcuseList.isEmpty()) {
-                attendanceRepository.excuseForAbsence(
-                    student = student,
-                    semester = semester,
-                    days = listOfNotNull(currentDate),
-                    reason = reason
-                )
-            } else attendanceRepository.excuseForAbsence(
-                student = student,
-                semester = semester,
-                absenceList = toExcuseList,
-                reason = reason
-            )
+            attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
         }.onEach {
             when (it) {
                 is Resource.Loading -> view?.run {
@@ -332,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)
@@ -345,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,7 +56,7 @@ interface AttendanceView : BaseView {
 
     fun openSummaryView()
 
-    fun startSendMessageIntent(date: LocalDate, lessons: String, reason: String)
+    fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String)
 
     fun startActionMode()
 

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,86 +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.databinding.DialogCaptchaBinding
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.ui.base.BaseDialogFragment
-import timber.log.Timber
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class CaptchaDialog : BaseDialogFragment<DialogCaptchaBinding>() {
-
-    @Inject
-    lateinit var sdk: Sdk
-
-    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 = sdk.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() {
-        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
@@ -64,9 +62,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 +77,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 +187,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

@@ -24,13 +24,11 @@ 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.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
@@ -58,7 +56,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,
@@ -242,14 +239,6 @@ class DashboardPresenter @Inject constructor(
         loadData(selectedDashboardTiles, forceRefresh = true)
     }
 
-    fun onRetryAfterCaptcha() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(selectedDashboardTiles, forceRefresh = true)
-    }
-
     fun onViewReselected() {
         Timber.i("Dashboard view is reselected")
         view?.run {
@@ -304,7 +293,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 +316,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 +341,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 +361,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 +395,7 @@ class DashboardPresenter @Inject constructor(
                                 subjectWithGrades = it.dataOrNull,
                                 gradeTheme = preferencesRepository.gradeColorTheme,
                                 isLoading = true
-                            ), false
+                            ), forceRefresh
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -439,17 +427,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 +444,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 +501,7 @@ class DashboardPresenter @Inject constructor(
                         val data = it.dataOrNull.orEmpty()
                         updateData(
                             DashboardItem.Homework(data, isLoading = true),
-                            false
+                            forceRefresh
                         )
 
                         if (data.isNotEmpty()) {
@@ -550,7 +535,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 +578,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 +619,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 +654,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 +684,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 +805,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 +826,7 @@ class DashboardPresenter @Inject constructor(
                 showRefresh(false)
                 if ((forceRefresh && wasGeneralError) || !forceRefresh) {
                     showContent(false)
-                    showErrorView(true, dataLoadedAdminMessageItem)
+                    showErrorView(true)
                     setErrorDetails(lastError)
                 }
             }
@@ -871,28 +854,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 {

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

@@ -6,8 +6,6 @@ interface DashboardView : BaseView {
 
     val tileWidth: Int
 
-    val isViewEmpty: Boolean
-
     fun initView()
 
     fun updateData(data: List<DashboardItem>)
@@ -20,7 +18,7 @@ interface DashboardView : BaseView {
 
     fun showRefresh(show: Boolean)
 
-    fun showErrorView(show: Boolean, adminMessageItem: DashboardItem.AdminMessages? = null)
+    fun showErrorView(show: Boolean)
 
     fun setErrorDetails(error: Throwable)
 

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

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.databinding.ItemDashboardAdminMessageBinding
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.utils.getThemeAttrColor
 
 class AdminMessageViewHolder(
@@ -24,11 +25,9 @@ class AdminMessageViewHolder(
                 context.getThemeAttrColor(R.attr.colorMessageHigh) to
                     context.getThemeAttrColor(R.attr.colorOnMessageHigh)
             }
-
             "MEDIUM" -> {
                 context.getThemeAttrColor(R.attr.colorMessageMedium) to Color.BLACK
             }
-
             else -> null to context.getThemeAttrColor(R.attr.colorOnSurface)
         }
 
@@ -38,16 +37,11 @@ class AdminMessageViewHolder(
             dashboardAdminMessageItemDescription.text = item.content
             dashboardAdminMessageItemDescription.setTextColor(textColor)
             dashboardAdminMessageItemIcon.setColorFilter(textColor)
-            dashboardAdminMessageItemDismiss.isVisible = item.isOkVisible
-            dashboardAdminMessageItemClose.isVisible = item.isXVisible
+            dashboardAdminMessageItemDismiss.isVisible = item.isDismissible
             dashboardAdminMessageItemDismiss.setTextColor(textColor)
-            dashboardAdminMessageItemClose.imageTintList = ColorStateList.valueOf(textColor)
             dashboardAdminMessageItemDismiss.setOnClickListener {
                 onAdminMessageDismissClickListener(item)
             }
-            dashboardAdminMessageItemClose.setOnClickListener {
-                onAdminMessageDismissClickListener(item)
-            }
 
             root.setCardBackgroundColor(backgroundColor?.let { ColorStateList.valueOf(it) })
             item.destinationUrl?.let { url ->

app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugFragment.kt

@@ -2,7 +2,6 @@ package io.github.wulkanowy.ui.modules.debug
 
 import android.os.Bundle
 import android.view.View
-import android.webkit.CookieManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -59,10 +58,6 @@ class DebugFragment : BaseFragment<FragmentDebugBinding>(R.layout.fragment_debug
         (activity as? MainActivity)?.pushView(NotificationDebugFragment.newInstance())
     }
 
-    override fun clearWebkitCookies() {
-        CookieManager.getInstance().removeAllCookies(null)
-    }
-
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()

app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugPresenter.kt

@@ -15,7 +15,6 @@ class DebugPresenter @Inject constructor(
     val items = listOf(
         DebugItem(R.string.logviewer_title),
         DebugItem(R.string.notification_debug_title),
-        DebugItem(R.string.debug_cookies_clear),
     )
 
     override fun onAttachView(view: DebugView) {
@@ -32,7 +31,6 @@ class DebugPresenter @Inject constructor(
         when (item.title) {
             R.string.logviewer_title -> view?.openLogViewer()
             R.string.notification_debug_title -> view?.openNotificationsDebug()
-            R.string.debug_cookies_clear -> view?.clearWebkitCookies()
             else -> Timber.d("Unknown debug item: $item")
         }
     }

app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugView.kt

@@ -11,6 +11,4 @@ interface DebugView : BaseView {
     fun openLogViewer()
 
     fun openNotificationsDebug()
-
-    fun clearWebkitCookies()
 }

app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugPresenter.kt

@@ -18,7 +18,6 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.debug.notification.mock.debugAttendanceItems
 import io.github.wulkanowy.ui.modules.debug.notification.mock.debugConferenceItems
 import io.github.wulkanowy.ui.modules.debug.notification.mock.debugExamItems
-import io.github.wulkanowy.ui.modules.debug.notification.mock.debugGradeDescriptiveItems
 import io.github.wulkanowy.ui.modules.debug.notification.mock.debugGradeDetailsItems
 import io.github.wulkanowy.ui.modules.debug.notification.mock.debugGradeSummaryItems
 import io.github.wulkanowy.ui.modules.debug.notification.mock.debugHomeworkItems
@@ -56,14 +55,6 @@ class NotificationDebugPresenter @Inject constructor(
         NotificationDebugItem(R.string.grade_summary_final_grade) { n ->
             withStudent { newGradeNotification.notifyFinal(debugGradeSummaryItems.take(n), it) }
         },
-        NotificationDebugItem(R.string.grade_summary_descriptive) { n ->
-            withStudent {
-                newGradeNotification.notifyDescriptive(
-                    debugGradeDescriptiveItems.take(n),
-                    it
-                )
-            }
-        },
         NotificationDebugItem(R.string.homework_title) { n ->
             withStudent { newHomeworkNotification.notify(debugHomeworkItems.take(n), it) }
         },

app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDescriptive.kt

@@ -1,48 +0,0 @@
-package io.github.wulkanowy.ui.modules.debug.notification.mock
-
-import io.github.wulkanowy.data.db.entities.GradeDescriptive
-
-val debugGradeDescriptiveItems = listOf(
-    generateGradeDescriptive(
-        "Matematyka",
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-    ),
-    generateGradeDescriptive("Fizyka", "Lorem ipsum dolor sit amet, consectetur adipiscing elit."),
-    generateGradeDescriptive(
-        "Geografia",
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-    ),
-    generateGradeDescriptive(
-        "Sieci komputerowe",
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-    ),
-    generateGradeDescriptive(
-        "Systemy operacyjne",
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-    ),
-    generateGradeDescriptive(
-        "Język polski",
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-    ),
-    generateGradeDescriptive(
-        "Język angielski",
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-    ),
-    generateGradeDescriptive("Religia", "Lorem ipsum dolor sit amet, consectetur adipiscing elit."),
-    generateGradeDescriptive(
-        "Język niemiecki",
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-    ),
-    generateGradeDescriptive(
-        "Wychowanie fizyczne",
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-    ),
-)
-
-private fun generateGradeDescriptive(subject: String, description: String) =
-    GradeDescriptive(
-        semesterId = 0,
-        studentId = 0,
-        subject = subject,
-        description = description
-    )

app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt

@@ -1,23 +1,15 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.dataOrNull
+import io.github.wulkanowy.data.*
 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.errorOrNull
-import io.github.wulkanowy.data.flatResourceFlow
-import io.github.wulkanowy.data.mapData
-import io.github.wulkanowy.data.mapResourceData
 import io.github.wulkanowy.data.repositories.GradeRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.ALL_YEAR
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.BOTH_SEMESTERS
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.ONE_SEMESTER
+import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.*
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -70,7 +62,6 @@ class GradeAverageProvider @Inject constructor(
                     forceRefresh = forceRefresh,
                     params = params,
                 )
-
                 BOTH_SEMESTERS -> calculateCombinedAverage(
                     student = student,
                     semesters = semesters,
@@ -78,7 +69,6 @@ class GradeAverageProvider @Inject constructor(
                     forceRefresh = forceRefresh,
                     config = params,
                 )
-
                 ALL_YEAR -> calculateCombinedAverage(
                     student = student,
                     semesters = semesters,
@@ -199,73 +189,36 @@ class GradeAverageProvider @Inject constructor(
     ): Flow<Resource<List<GradeSubject>>> {
         return gradeRepository.getGrades(student, semester, forceRefresh = forceRefresh)
             .mapResourceData { res ->
-                val (details, summaries, descriptives) = res
+                val (details, summaries) = res
                 val isAnyAverage = summaries.any { it.average != .0 }
                 val allGrades = details.groupBy { it.subject }
-                val descriptiveGradesBySubject = descriptives.associateBy { it.subject }
 
-                val items = summaries
-                    .createEmptySummariesByGradesIfNeeded(
-                        student = student,
-                        semester = semester,
-                        grades = allGrades.toList(),
-                        calcAverage = isAnyAverage,
-                        params = params,
+                val items = summaries.emulateEmptySummaries(
+                    student = student,
+                    semester = semester,
+                    grades = allGrades.toList(),
+                    calcAverage = isAnyAverage,
+                    params = params,
+                ).map { summary ->
+                    val grades = allGrades[summary.subject].orEmpty()
+                    GradeSubject(
+                        subject = summary.subject,
+                        average = if (!isAnyAverage || params.forceAverageCalc) {
+                            grades.updateModifiers(student, params)
+                                .calcAverage(params.isOptionalArithmeticAverage)
+                        } else summary.average,
+                        points = summary.pointsSum,
+                        summary = summary,
+                        grades = grades,
+                        isVulcanAverage = isAnyAverage
                     )
-                    .createEmptySummariesByDescriptiveGradesIfNeeded(
-                        student = student,
-                        semester = semester,
-                        descriptives = descriptives,
-                    )
-                    .map { summary ->
-                        val grades = allGrades[summary.subject].orEmpty()
-                        val descriptiveGrade = descriptiveGradesBySubject[summary.subject]
-
-                        GradeSubject(
-                            subject = summary.subject,
-                            average = if (!isAnyAverage || params.forceAverageCalc) {
-                                grades.updateModifiers(student, params)
-                                    .calcAverage(params.isOptionalArithmeticAverage)
-                            } else summary.average,
-                            points = summary.pointsSum,
-                            summary = summary,
-                            grades = grades,
-                            descriptive = descriptiveGrade,
-                            isVulcanAverage = isAnyAverage
-                        )
-                    }
+                }
 
                 items
             }
     }
 
-    private fun List<GradeSummary>.createEmptySummariesByDescriptiveGradesIfNeeded(
-        student: Student,
-        semester: Semester,
-        descriptives: List<GradeDescriptive>
-    ): List<GradeSummary> {
-        val summarySubjects = this.map { it.subject }
-        val gradeSummaryToAdd = descriptives.mapNotNull { gradeDescriptive ->
-            if (gradeDescriptive.subject in summarySubjects) return@mapNotNull null
-
-            GradeSummary(
-                studentId = student.studentId,
-                semesterId = semester.semesterId,
-                position = 0,
-                subject = gradeDescriptive.subject,
-                predictedGrade = "",
-                finalGrade = "",
-                proposedPoints = "",
-                finalPoints = "",
-                pointsSum = "",
-                average = .0
-            )
-        }
-
-        return this + gradeSummaryToAdd
-    }
-
-    private fun List<GradeSummary>.createEmptySummariesByGradesIfNeeded(
+    private fun List<GradeSummary>.emulateEmptySummaries(
         student: Student,
         semester: Semester,
         grades: List<Pair<String, List<Grade>>>,

app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeSubject.kt

@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.modules.grade
 
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeDescriptive
 import io.github.wulkanowy.data.db.entities.GradeSummary
 
 data class GradeSubject(
@@ -9,7 +8,6 @@ data class GradeSubject(
     val average: Double,
     val points: String,
     val summary: GradeSummary,
-    val descriptive: GradeDescriptive?,
     val grades: List<Grade>,
     val isVulcanAverage: Boolean
 )

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt

@@ -1,22 +1,13 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
+import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.enums.GradeExpandMode
-import io.github.wulkanowy.data.enums.GradeSortingMode.ALPHABETIC
-import io.github.wulkanowy.data.enums.GradeSortingMode.AVERAGE
-import io.github.wulkanowy.data.enums.GradeSortingMode.DATE
-import io.github.wulkanowy.data.flatResourceFlow
-import io.github.wulkanowy.data.logResourceStatus
-import io.github.wulkanowy.data.onResourceData
-import io.github.wulkanowy.data.onResourceError
-import io.github.wulkanowy.data.onResourceIntermediate
-import io.github.wulkanowy.data.onResourceNotLoading
-import io.github.wulkanowy.data.onResourceSuccess
+import io.github.wulkanowy.data.enums.GradeSortingMode.*
 import io.github.wulkanowy.data.repositories.GradeRepository
 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.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
@@ -216,20 +207,20 @@ class GradeDetailsPresenter @Inject constructor(
                     AVERAGE -> gradeSubjects.sortedByDescending { it.average }
                 }
             }
-            .map { gradeSubject ->
-                val subItems = gradeSubject.grades
+            .map { (subject, average, points, _, grades) ->
+                val subItems = grades
                     .sortedByDescending { it.date }
                     .map { GradeDetailsItem(it, ViewType.ITEM) }
 
                 val gradeDetailsItems = listOf(
                     GradeDetailsItem(
                         GradeDetailsHeader(
-                            subject = gradeSubject.subject,
-                            average = gradeSubject.average,
-                            pointsSum = gradeSubject.points,
+                            subject = subject,
+                            average = average,
+                            pointsSum = points,
                             grades = subItems
                         ).apply {
-                            newGrades = gradeSubject.grades.filter { grade -> !grade.isRead }.size
+                            newGrades = grades.filter { grade -> !grade.isRead }.size
                         }, ViewType.HEADER
                     )
                 )

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt

@@ -2,16 +2,16 @@ package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.ItemGradeSummaryBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderGradeSummaryBinding
 import io.github.wulkanowy.sdk.scrapper.grades.isGradeValid
 import io.github.wulkanowy.utils.calcFinalAverage
-import io.github.wulkanowy.utils.ifNullOrBlank
 import java.util.Locale
 import javax.inject.Inject
 
@@ -24,7 +24,7 @@ class GradeSummaryAdapter @Inject constructor(
         ITEM(2)
     }
 
-    var items = emptyList<GradeSummaryItem>()
+    var items = emptyList<GradeSummary>()
 
     var onCalculatedHelpClickListener: () -> Unit = {}
 
@@ -44,11 +44,9 @@ class GradeSummaryAdapter @Inject constructor(
             ViewType.HEADER.id -> HeaderViewHolder(
                 ScrollableHeaderGradeSummaryBinding.inflate(inflater, parent, false)
             )
-
             ViewType.ITEM.id -> ItemViewHolder(
                 ItemGradeSummaryBinding.inflate(inflater, parent, false)
             )
-
             else -> throw IllegalStateException()
         }
     }
@@ -62,23 +60,19 @@ class GradeSummaryAdapter @Inject constructor(
 
     private fun bindHeaderViewHolder(binding: ScrollableHeaderGradeSummaryBinding) {
         if (items.isEmpty()) return
-        val gradeSummaries = items
-            .filter { it.gradeDescriptive == null }
-            .map { it.gradeSummary }
 
         val context = binding.root.context
-        val finalItemsCount = gradeSummaries.count { isGradeValid(it.finalGrade) }
-        val calculatedItemsCount = gradeSummaries.count { value -> value.average != 0.0 }
-        val allItemsCount = gradeSummaries.count { !it.subject.equals("zachowanie", true) }
-        val finalAverage = gradeSummaries.calcFinalAverage(
+        val finalItemsCount = items.count { isGradeValid(it.finalGrade) }
+        val calculatedItemsCount = items.count { value -> value.average != 0.0 }
+        val allItemsCount = items.count { !it.subject.equals("zachowanie", true) }
+        val finalAverage = items.calcFinalAverage(
             preferencesRepository.gradePlusModifier,
             preferencesRepository.gradeMinusModifier
         )
-        val calculatedAverage = gradeSummaries.filter { value -> value.average != 0.0 }
+        val calculatedAverage = items.filter { value -> value.average != 0.0 }
             .map { values -> values.average }
             .reversed() // fix average precision
             .average()
-            .let { if (it.isNaN()) 0.0 else it }
 
         with(binding) {
             gradeSummaryScrollableHeaderFinal.text = formatAverage(finalAverage)
@@ -101,28 +95,16 @@ class GradeSummaryAdapter @Inject constructor(
     }
 
     @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(binding: ItemGradeSummaryBinding, item: GradeSummaryItem) {
-        val (gradeSummary, gradeDescriptive) = item
-
+    private fun bindItemViewHolder(binding: ItemGradeSummaryBinding, item: GradeSummary) {
         with(binding) {
-            gradeSummaryItemTitle.text = gradeSummary.subject
-            gradeSummaryItemPoints.text = gradeSummary.pointsSum
-            gradeSummaryItemAverage.text = formatAverage(gradeSummary.average, "")
-            gradeSummaryItemPredicted.text =
-                "${gradeSummary.predictedGrade} ${gradeSummary.proposedPoints}".trim()
-            gradeSummaryItemFinal.text =
-                "${gradeSummary.finalGrade} ${gradeSummary.finalPoints}".trim()
-            gradeSummaryItemDescriptive.text = gradeDescriptive?.description.ifNullOrBlank {
-                root.context.getString(R.string.all_no_data)
-            }
+            gradeSummaryItemTitle.text = item.subject
+            gradeSummaryItemPoints.text = item.pointsSum
+            gradeSummaryItemAverage.text = formatAverage(item.average, "")
+            gradeSummaryItemPredicted.text = "${item.predictedGrade} ${item.proposedPoints}".trim()
+            gradeSummaryItemFinal.text = "${item.finalGrade} ${item.finalPoints}".trim()
 
-            gradeSummaryItemFinalDivider.isVisible = gradeDescriptive == null
-            gradeSummaryItemPredictedDivider.isVisible = gradeDescriptive == null
-            gradeSummaryItemPointsDivider.isVisible = gradeDescriptive == null
-            gradeSummaryItemPredictedContainer.isVisible = gradeDescriptive == null
-            gradeSummaryItemFinalContainer.isVisible = gradeDescriptive == null
-            gradeSummaryItemDescriptiveContainer.isVisible = gradeDescriptive != null
-            gradeSummaryItemPointsContainer.isVisible = gradeSummary.pointsSum.isNotBlank()
+            gradeSummaryItemPointsContainer.visibility =
+                if (item.pointsSum.isBlank()) View.GONE else View.VISIBLE
         }
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt

@@ -5,10 +5,12 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.databinding.FragmentGradeSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
@@ -70,7 +72,7 @@ class GradeSummaryFragment :
         }
     }
 
-    override fun updateData(data: List<GradeSummaryItem>) {
+    override fun updateData(data: List<GradeSummary>) {
         with(gradeSummaryAdapter) {
             items = data
             notifyDataSetChanged()

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt

@@ -1,9 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-import io.github.wulkanowy.data.db.entities.GradeDescriptive
-import io.github.wulkanowy.data.db.entities.GradeSummary
-
-data class GradeSummaryItem(
-    val gradeSummary: GradeSummary,
-    val gradeDescriptive: GradeDescriptive?
-)

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt

@@ -1,16 +1,9 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
-import io.github.wulkanowy.data.enums.GradeSortingMode.ALPHABETIC
-import io.github.wulkanowy.data.enums.GradeSortingMode.AVERAGE
-import io.github.wulkanowy.data.enums.GradeSortingMode.DATE
-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.onResourceNotLoading
-import io.github.wulkanowy.data.onResourceSuccess
+import io.github.wulkanowy.data.*
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.enums.GradeSortingMode
+import io.github.wulkanowy.data.enums.GradeSortingMode.*
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -135,7 +128,7 @@ class GradeSummaryPresenter @Inject constructor(
         view?.showFinalAverageHelpDialog()
     }
 
-    private fun createGradeSummaryItems(items: List<GradeSubject>): List<GradeSummaryItem> {
+    private fun createGradeSummaryItems(items: List<GradeSubject>): List<GradeSummary> {
         return items
             .filter { !checkEmpty(it) }
             .let { gradeSubjects ->
@@ -143,32 +136,21 @@ class GradeSummaryPresenter @Inject constructor(
                     DATE -> gradeSubjects.sortedByDescending { gradeDetailsWithAverage ->
                         gradeDetailsWithAverage.grades.maxByOrNull { it.date }?.date
                     }
-
                     ALPHABETIC -> gradeSubjects.sortedBy { gradeDetailsWithAverage ->
                         gradeDetailsWithAverage.subject.lowercase()
                     }
-
                     AVERAGE -> gradeSubjects.sortedByDescending { it.average }
                 }
             }
-            .map {
-                val gradeSummary = it.summary.copy(average = it.average)
-                val descriptive = it.descriptive
-                GradeSummaryItem(
-                    gradeSummary = gradeSummary,
-                    gradeDescriptive = descriptive,
-                )
-            }
-
+            .map { it.summary.copy(average = it.average) }
     }
 
     private fun checkEmpty(gradeSummary: GradeSubject): Boolean {
         return gradeSummary.run {
             summary.finalGrade.isBlank()
-                && summary.predictedGrade.isBlank()
-                && average == .0
-                && points.isBlank()
-                && descriptive == null
+                    && summary.predictedGrade.isBlank()
+                    && average == .0
+                    && points.isBlank()
         }
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt

@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeSummaryView : BaseView {
@@ -12,7 +13,7 @@ interface GradeSummaryView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<GradeSummaryItem>)
+    fun updateData(data: List<GradeSummary>)
 
     fun resetView()
 

app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt

@@ -7,6 +7,5 @@ data class LoginData(
     val password: String,
     val baseUrl: String,
     val domainSuffix: String,
-    val defaultSymbol: String,
-    val userEnteredSymbol: String? = null,
+    val symbol: String?,
 ) : Serializable

app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt

@@ -71,7 +71,7 @@ class LoginAdvancedPresenter @Inject constructor(
 
     fun updateUsernameLabel() {
         view?.apply {
-            setUsernameLabel(if ("vulcan" in formHostValue || "wulkanowy" in formHostValue) emailLabel else nicknameLabel)
+            setUsernameLabel(if ("vulcan" in formHostValue || "fakelog" in formHostValue) emailLabel else nicknameLabel)
         }
     }
 
@@ -79,7 +79,7 @@ class LoginAdvancedPresenter @Inject constructor(
         view?.apply {
             clearPassError()
             clearUsernameError()
-            if (formHostValue.contains("wulkanowy")) {
+            if (formHostValue.contains("fakelog")) {
                 setDefaultCredentials(
                     "jan@fakelog.cf", "jan123", "powiatwulkanowy", "FK100000", "999999"
                 )
@@ -155,7 +155,7 @@ class LoginAdvancedPresenter @Inject constructor(
                             password = view?.formPassValue.orEmpty().trim(),
                             baseUrl = view?.formHostValue.orEmpty().trim(),
                             domainSuffix = view?.formDomainSuffix.orEmpty().trim(),
-                            defaultSymbol = view?.formSymbolValue.orEmpty().trim().getNormalizedSymbol(),
+                            symbol = view?.formSymbolValue.orEmpty().trim().getNormalizedSymbol(),
                         )
                         when (it.data.symbols.size) {
                             0 -> view?.navigateToSymbol(loginData)

app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt

@@ -7,7 +7,6 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
-import androidx.fragment.app.setFragmentResultListener
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.AdminMessage
@@ -15,7 +14,6 @@ import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.captcha.CaptchaDialog
 import io.github.wulkanowy.ui.modules.dashboard.viewholders.AdminMessageViewHolder
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
@@ -74,13 +72,6 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentLoginFormBinding.bind(view)
         presenter.onAttachView(this)
-        initializeCaptchaResultObserver()
-    }
-
-    private fun initializeCaptchaResultObserver() {
-        setFragmentResultListener(CaptchaDialog.CAPTCHA_SUCCESS) { _, _ ->
-            presenter.onRetryAfterCaptcha()
-        }
     }
 
     override fun initView() {
@@ -94,7 +85,6 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
             loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
             loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
             loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-            loginFormDomainSuffix.doOnTextChanged { _, _, _, _ -> presenter.onDomainSuffixChanged() }
             loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
             loginFormAdvancedButton.setOnClickListener { presenter.onAdvancedLoginClick() }
             loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
@@ -189,12 +179,6 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         }
     }
 
-    override fun setDomainSuffixInvalid() {
-        with(binding.loginFormDomainSuffixLayout) {
-            error = getString(R.string.login_invalid_domain_suffix)
-        }
-    }
-
     override fun clearUsernameError() {
         binding.loginFormUsernameLayout.error = null
         binding.loginFormErrorBox.isVisible = false
@@ -213,10 +197,6 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         binding.loginFormErrorBox.isVisible = false
     }
 
-    override fun clearDomainSuffixError() {
-        binding.loginFormDomainSuffixLayout.error = null
-    }
-
     override fun showSoftKeyboard() {
         activity?.showSoftInput()
     }

app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt

@@ -14,7 +14,6 @@ import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
-import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
@@ -91,7 +90,7 @@ class LoginFormPresenter @Inject constructor(
             clearPassError()
             clearUsernameError()
             clearHostError()
-            if (formHostValue.contains("wulkanowy")) {
+            if (formHostValue.contains("fakelog")) {
                 setCredentials("jan@fakelog.cf", "jan123")
             } else if (formUsernameValue == "jan@fakelog.cf" && formPassValue == "jan123") {
                 setCredentials("", "")
@@ -102,12 +101,6 @@ class LoginFormPresenter @Inject constructor(
         }
     }
 
-    fun onDomainSuffixChanged() {
-        view?.apply {
-            clearDomainSuffixError()
-        }
-    }
-
     fun updateCustomDomainSuffixVisibility() {
         view?.run {
             showDomainSuffixInput("customSuffix" in formHostValue)
@@ -155,18 +148,14 @@ class LoginFormPresenter @Inject constructor(
             password = password,
             baseUrl = host,
             domainSuffix = domainSuffix,
-            defaultSymbol = symbol
+            symbol = symbol
         )
     }
 
-    fun onRetryAfterCaptcha() {
-        onSignInClick()
-    }
-
     fun onSignInClick() {
         val loginData = getLoginData()
 
-        if (!validateCredentials(loginData)) return
+        if (!validateCredentials(loginData.login, loginData.password, loginData.baseUrl)) return
 
         resourceFlow {
             studentRepository.getUserSubjectsFromScrapper(
@@ -174,7 +163,7 @@ class LoginFormPresenter @Inject constructor(
                 password = loginData.password,
                 scrapperBaseUrl = loginData.baseUrl,
                 domainSuffix = loginData.domainSuffix,
-                symbol = loginData.defaultSymbol,
+                symbol = loginData.symbol.orEmpty(),
             )
         }
             .logResourceStatus("login")
@@ -205,9 +194,6 @@ class LoginFormPresenter @Inject constructor(
             }
             .onResourceError {
                 loginErrorHandler.dispatch(it)
-                if (it is InvalidSymbolException) {
-                    loginErrorHandler.showDefaultMessage(it)
-                }
                 lastError = it
                 view?.showContact(true)
                 analytics.logEvent(
@@ -239,29 +225,24 @@ class LoginFormPresenter @Inject constructor(
         view?.onRecoverClick()
     }
 
-    private fun validateCredentials(loginData: LoginData): Boolean {
+    private fun validateCredentials(login: String, password: String, host: String): Boolean {
         var isCorrect = true
 
-        if (loginData.login.isEmpty()) {
+        if (login.isEmpty()) {
             view?.setErrorUsernameRequired()
             isCorrect = false
         } else {
-            if ("@" in loginData.login && "login" in loginData.baseUrl) {
+            if ("@" in login && "login" in host) {
                 view?.setErrorLoginRequired()
                 isCorrect = false
             }
-            if ("@" !in loginData.login && "email" in loginData.baseUrl) {
+            if ("@" !in login && "email" in host) {
                 view?.setErrorEmailRequired()
                 isCorrect = false
             }
-
-            val isEmailLogin = "@" in loginData.login
-            val isEmailWithLogin = "||" !in loginData.login
-            val isLoginNotRequired = "login" !in loginData.baseUrl
-            val isEmailNotRequired = "email" !in loginData.baseUrl
-            if (isEmailLogin && isEmailWithLogin && isLoginNotRequired && isEmailNotRequired) {
-                val emailHost = loginData.login.substringAfter("@")
-                val emailDomain = URL(loginData.baseUrl).host
+            if ("@" in login && "||" !in login && "login" !in host && "email" !in host) {
+                val emailHost = login.substringAfter("@")
+                val emailDomain = URL(host).host
                 if (!emailHost.equals(emailDomain, true)) {
                     view?.setErrorEmailInvalid(domain = emailDomain)
                     isCorrect = false
@@ -269,21 +250,16 @@ class LoginFormPresenter @Inject constructor(
             }
         }
 
-        if (loginData.password.isEmpty()) {
+        if (password.isEmpty()) {
             view?.setErrorPassRequired(focus = isCorrect)
             isCorrect = false
         }
 
-        if (loginData.password.length < 6 && loginData.password.isNotEmpty()) {
+        if (password.length < 6 && password.isNotEmpty()) {
             view?.setErrorPassInvalid(focus = isCorrect)
             isCorrect = false
         }
 
-        if (loginData.domainSuffix !in listOf("", "rc", "kurs")) {
-            view?.setDomainSuffixInvalid()
-            isCorrect = false
-        }
-
         return isCorrect
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt

@@ -46,16 +46,12 @@ interface LoginFormView : BaseView {
 
     fun setErrorEmailInvalid(domain: String)
 
-    fun setDomainSuffixInvalid()
-
     fun clearUsernameError()
 
     fun clearPassError()
 
     fun clearHostError()
 
-    fun clearDomainSuffixError()
-
     fun showSoftKeyboard()
 
     fun hideSoftKeyboard()

app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt

@@ -38,7 +38,7 @@ class LoginRecoverPresenter @Inject constructor(
 
     fun onHostSelected() {
         view?.run {
-            if ("wulkanowy" in recoverHostValue) setDefaultCredentials("jan@fakelog.cf")
+            if ("fakelog" in recoverHostValue) setDefaultCredentials("jan@fakelog.cf")
             clearUsernameError()
             updateFields()
         }
@@ -60,7 +60,7 @@ class LoginRecoverPresenter @Inject constructor(
         resourceFlow {
             recoverRepository.getReCaptchaSiteKey(
                 host,
-                symbol.ifBlank { "default" })
+                symbol.ifBlank { "Default" })
         }.onEach {
             when (it) {
                 is Resource.Loading -> view?.run {
@@ -103,7 +103,7 @@ class LoginRecoverPresenter @Inject constructor(
     fun onReCaptchaVerified(reCaptchaResponse: String) {
         val username = view?.recoverNameValue.orEmpty()
         val host = view?.recoverHostValue.orEmpty()
-        val symbol = view?.formHostSymbol.ifNullOrBlank { "default" }
+        val symbol = view?.formHostSymbol.ifNullOrBlank { "Default" }
 
         resourceFlow {
             recoverRepository.sendRecoverRequest(

app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt

@@ -10,11 +10,13 @@ import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.support.LoginSupportDialog
 import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.serializable
 import javax.inject.Inject

app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt

@@ -111,8 +111,8 @@ class LoginStudentSelectPresenter @Inject constructor(
         val notEmptySymbols = registerUser.symbols.filter { it.schools.isNotEmpty() }
         val emptySymbols = registerUser.symbols.filter { it.schools.isEmpty() }
 
-        if (emptySymbols.isNotEmpty() && notEmptySymbols.isNotEmpty() && emptySymbols.any { it.symbol == loginData.userEnteredSymbol }) {
-            add(createEmptySymbolItem(emptySymbols.first { it.symbol == loginData.userEnteredSymbol }))
+        if (emptySymbols.isNotEmpty() && notEmptySymbols.isNotEmpty() && emptySymbols.any { it.symbol == loginData.symbol }) {
+            add(createEmptySymbolItem(emptySymbols.first { it.symbol == loginData.symbol }))
         }
 
         addAll(createNotEmptySymbolItems(notEmptySymbols, students))
@@ -317,7 +317,7 @@ class LoginStudentSelectPresenter @Inject constructor(
                 loginData = loginData,
                 registerUser = registerUser,
                 lastErrorMessage = lastError?.message,
-                enteredSymbol = loginData.userEnteredSymbol,
+                enteredSymbol = loginData.symbol,
             )
         )
     }

app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportDialog.kt

@@ -105,7 +105,7 @@ class LoginSupportDialog : BaseDialogFragment<DialogLoginSupportBinding>() {
                     "${appInfo.systemManufacturer} ${appInfo.systemModel}",
                     appInfo.systemVersion.toString(),
                     "${appInfo.versionName}-${appInfo.buildFlavor}",
-                    supportInfo.loginData.let { "${it.baseUrl}/${it.defaultSymbol}/${it.userEnteredSymbol}" },
+                    supportInfo.loginData.baseUrl + "/" + supportInfo.loginData.symbol,
                     preferencesRepository.installationId,
                     getLastErrorFromStudentSelectScreen(),
                     dialogLoginSupportSchoolInput.text.takeIf { !it.isNullOrBlank() }

app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt

@@ -60,7 +60,7 @@ class LoginSymbolPresenter @Inject constructor(
         }
 
         loginData = loginData.copy(
-            userEnteredSymbol = view?.symbolValue?.getNormalizedSymbol(),
+            symbol = view?.symbolValue?.getNormalizedSymbol(),
         )
         resourceFlow {
             studentRepository.getUserSubjectsFromScrapper(
@@ -68,7 +68,7 @@ class LoginSymbolPresenter @Inject constructor(
                 password = loginData.password,
                 scrapperBaseUrl = loginData.baseUrl,
                 domainSuffix = loginData.domainSuffix,
-                symbol = loginData.userEnteredSymbol.orEmpty(),
+                symbol = loginData.symbol.orEmpty(),
             )
         }.onEach { user ->
             registerUser = user.dataOrNull
@@ -93,10 +93,13 @@ class LoginSymbolPresenter @Inject constructor(
                         else -> {
                             val enteredSymbolDetails = user.data.symbols
                                 .firstOrNull()
-                                ?.takeIf { it.symbol == loginData.userEnteredSymbol }
+                                ?.takeIf { it.symbol == loginData.symbol }
 
                             if (enteredSymbolDetails?.error is InvalidSymbolException) {
-                                showInvalidSymbolError()
+                                view?.run {
+                                    setErrorSymbolInvalid()
+                                    showContact(true)
+                                }
                             } else {
                                 Timber.i("Login with symbol result: Success")
                                 view?.navigateToStudentSelect(loginData, requireNotNull(user.data))
@@ -125,9 +128,6 @@ class LoginSymbolPresenter @Inject constructor(
                     loginErrorHandler.dispatch(user.error)
                     lastError = user.error
                     view?.showContact(true)
-                    if (user.error is InvalidSymbolException) {
-                        showInvalidSymbolError()
-                    }
                 }
             }
         }.onResourceNotLoading {
@@ -145,13 +145,6 @@ class LoginSymbolPresenter @Inject constructor(
         return normalizedSymbol in definitelyInvalidSymbols
     }
 
-    private fun showInvalidSymbolError() {
-        view?.run {
-            setErrorSymbolInvalid()
-            showContact(true)
-        }
-    }
-
     fun onFaqClick() {
         view?.openFaqPage()
     }

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt

@@ -11,8 +11,10 @@ import android.view.View
 import android.widget.RemoteViews
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.dataOrThrow
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.repositories.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.toFirstResult
@@ -67,7 +69,8 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
 
         appWidgetIds?.forEach { widgetId ->
             val studentId = sharedPref.getLong(getStudentWidgetKey(widgetId), 0)
-            val luckyNumber = getLuckyNumber(studentId, widgetId)?.luckyNumber?.toString()
+            val luckyNumberResource = getLuckyNumber(studentId, widgetId)
+            val luckyNumber = luckyNumberResource.dataOrNull?.luckyNumber?.toString()
             val remoteView = RemoteViews(context.packageName, R.layout.widget_luckynumber)
                 .apply {
                     setTextViewText(R.id.luckyNumberWidgetValue, luckyNumber ?: "-")
@@ -140,18 +143,18 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
                         sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id)
                     }
                 }
-
                 else -> null
             }
 
             if (currentStudent != null) {
                 luckyNumberRepository.getLuckyNumber(currentStudent, forceRefresh = false)
                     .toFirstResult()
-                    .dataOrThrow
-            } else null
+            } else {
+                Resource.Success<LuckyNumber?>(null)
+            }
         } catch (e: Exception) {
             Timber.e(e, "An error has occurred in lucky number provider")
-            null
+            Resource.Error(e)
         }
     }
 

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

@@ -16,7 +16,6 @@ import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -31,8 +30,6 @@ import io.github.wulkanowy.databinding.ActivityMainBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.account.accountquick.AccountQuickDialog
-import io.github.wulkanowy.ui.modules.auth.AuthDialog
-import io.github.wulkanowy.ui.modules.captcha.CaptchaDialog
 import io.github.wulkanowy.ui.modules.settings.appearance.menuorder.AppMenuItem
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
@@ -43,17 +40,10 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.nickOrName
 import io.github.wulkanowy.utils.safelyPopFragments
 import io.github.wulkanowy.utils.setOnViewChangeListener
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import timber.log.Timber
 import javax.inject.Inject
-import kotlin.time.Duration.Companion.seconds
 
 @AndroidEntryPoint
 class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainView,
@@ -83,8 +73,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     private val navController =
         FragNavController(supportFragmentManager, R.id.main_fragment_container)
 
-    private val captchaVerificationEvent = MutableSharedFlow<String?>()
-
     companion object {
 
         private const val EXTRA_START_DESTINATION = "start_destination_json"
@@ -156,7 +144,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         initializeToolbar()
         initializeBottomNavigation(startMenuIndex, rootAppMenuItems)
         initializeNavController(startMenuIndex, rootUpdatedDestinations)
-        initializeCaptchaVerificationEvent()
     }
 
     private fun initializeNavController(
@@ -336,27 +323,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
             .show()
     }
 
-    @OptIn(FlowPreview::class)
-    private fun initializeCaptchaVerificationEvent() {
-        captchaVerificationEvent
-            .debounce(1.seconds)
-            .onEach { url ->
-                Timber.d("Showing captcha dialog for: $url")
-                showDialogFragment(CaptchaDialog.newInstance(url))
-            }
-            .launchIn(lifecycleScope)
-    }
-
-    override fun onCaptchaVerificationRequired(url: String?) {
-        lifecycleScope.launch {
-            captchaVerificationEvent.emit(url)
-        }
-    }
-
-    override fun showAuthDialog() {
-        showDialogFragment(AuthDialog.newInstance())
-    }
-
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         navController.onSaveInstanceState(outState)

app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt

@@ -50,15 +50,12 @@ class MessagePreviewAdapter @Inject constructor() :
             ViewType.MESSAGE.id -> MessageViewHolder(
                 ItemMessagePreviewBinding.inflate(inflater, parent, false)
             )
-
             ViewType.DIVIDER.id -> DividerViewHolder(
                 ItemMessageDividerBinding.inflate(inflater, parent, false)
             )
-
             ViewType.ATTACHMENT.id -> AttachmentViewHolder(
                 ItemMessageAttachmentBinding.inflate(inflater, parent, false)
             )
-
             else -> throw IllegalStateException()
         }
     }
@@ -69,7 +66,6 @@ class MessagePreviewAdapter @Inject constructor() :
                 holder,
                 requireNotNull(messageWithAttachment).message
             )
-
             is AttachmentViewHolder -> bindAttachment(
                 holder,
                 requireNotNull(messageWithAttachment).attachments[position - 2]
@@ -86,11 +82,9 @@ class MessagePreviewAdapter @Inject constructor() :
             recipientCount > 1 -> {
                 context.getString(R.string.message_read_by, message.readBy, recipientCount)
             }
-
             message.readBy == 1 || (isReceived && !message.unread) -> {
                 context.getString(R.string.message_read, context.getString(R.string.all_yes))
             }
-
             else -> context.getString(R.string.message_read, context.getString(R.string.all_no))
         }
 

app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt

@@ -44,33 +44,18 @@ class MessagePreviewFragment :
 
     private var menuForwardButton: MenuItem? = null
 
-    private var menuRestoreButton: MenuItem? = null
-
     private var menuDeleteButton: MenuItem? = null
 
-    private var menuDeleteForeverButton: MenuItem? = null
-
     private var menuShareButton: MenuItem? = null
 
     private var menuPrintButton: MenuItem? = null
 
-    private var menuMuteButton: MenuItem? = null
-
     override val titleStringId: Int
         get() = R.string.message_title
 
     override val deleteMessageSuccessString: String
         get() = getString(R.string.message_delete_success)
 
-    override val muteMessageSuccessString: String
-        get() = getString(R.string.message_mute_success)
-
-    override val unmuteMessageSuccessString: String
-        get() = getString(R.string.message_unmute_success)
-
-    override val restoreMessageSuccessString: String
-        get() = getString(R.string.message_restore_success)
-
     override val messageNoSubjectString: String
         get() = getString(R.string.message_no_subject)
 
@@ -118,12 +103,9 @@ class MessagePreviewFragment :
         inflater.inflate(R.menu.action_menu_message_preview, menu)
         menuReplyButton = menu.findItem(R.id.messagePreviewMenuReply)
         menuForwardButton = menu.findItem(R.id.messagePreviewMenuForward)
-        menuRestoreButton = menu.findItem(R.id.messagePreviewMenuRestore)
         menuDeleteButton = menu.findItem(R.id.messagePreviewMenuDelete)
-        menuDeleteForeverButton = menu.findItem(R.id.messagePreviewMenuDeleteForever)
         menuShareButton = menu.findItem(R.id.messagePreviewMenuShare)
         menuPrintButton = menu.findItem(R.id.messagePreviewMenuPrint)
-        menuMuteButton = menu.findItem(R.id.messagePreviewMenuMute)
         presenter.onCreateOptionsMenu()
 
         menu.findItem(R.id.mainMenuAccount).isVisible = false
@@ -133,12 +115,9 @@ class MessagePreviewFragment :
         return when (item.itemId) {
             R.id.messagePreviewMenuReply -> presenter.onReply()
             R.id.messagePreviewMenuForward -> presenter.onForward()
-            R.id.messagePreviewMenuRestore -> presenter.onMessageRestore()
             R.id.messagePreviewMenuDelete -> presenter.onMessageDelete()
-            R.id.messagePreviewMenuDeleteForever -> presenter.onMessageDelete()
             R.id.messagePreviewMenuShare -> presenter.onShare()
             R.id.messagePreviewMenuPrint -> presenter.onPrint()
-            R.id.messagePreviewMenuMute -> presenter.onMute()
             else -> false
         }
     }
@@ -150,11 +129,6 @@ class MessagePreviewFragment :
         }
     }
 
-    override fun updateMuteToggleButton(isMuted: Boolean) {
-        menuMuteButton?.setTitle(if (isMuted) R.string.message_unmute else R.string.message_mute)
-
-    }
-
     override fun showProgress(show: Boolean) {
         binding.messagePreviewProgress.visibility = if (show) VISIBLE else GONE
     }
@@ -163,15 +137,20 @@ class MessagePreviewFragment :
         binding.messagePreviewRecycler.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showOptions(show: Boolean, isReplayable: Boolean, isRestorable: Boolean) {
-        menuReplyButton?.isVisible = show && isReplayable
+    override fun showOptions(show: Boolean, isReplayable: Boolean) {
+        menuReplyButton?.isVisible = isReplayable
         menuForwardButton?.isVisible = show
-        menuRestoreButton?.isVisible = show && isRestorable
-        menuDeleteButton?.isVisible = show && !isRestorable
-        menuDeleteForeverButton?.isVisible = show && isRestorable
+        menuDeleteButton?.isVisible = show
         menuShareButton?.isVisible = show
         menuPrintButton?.isVisible = show
-        menuMuteButton?.isVisible = show && isReplayable
+    }
+
+    override fun setDeletedOptionsLabels() {
+        menuDeleteButton?.setTitle(R.string.message_delete_forever)
+    }
+
+    override fun setNotDeletedOptionsLabels() {
+        menuDeleteButton?.setTitle(R.string.message_move_to_trash)
     }
 
     override fun showErrorView(show: Boolean) {
@@ -234,7 +213,7 @@ class MessagePreviewFragment :
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        outState.putSerializable(MESSAGE_ID_KEY, presenter.messageWithAttachments)
+        outState.putSerializable(MESSAGE_ID_KEY, presenter.message)
         super.onSaveInstanceState(outState)
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt

@@ -5,7 +5,7 @@ import androidx.core.text.parseAsHtml
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
@@ -14,11 +14,9 @@ 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.toFormattedString
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
-import kotlin.time.Duration.Companion.seconds
 
 class MessagePreviewPresenter @Inject constructor(
     errorHandler: ErrorHandler,
@@ -28,7 +26,9 @@ class MessagePreviewPresenter @Inject constructor(
     private val analytics: AnalyticsHelper
 ) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
 
-    var messageWithAttachments: MessageWithAttachment? = null
+    var message: Message? = null
+
+    var attachments: List<MessageAttachment>? = null
 
     private lateinit var lastError: Throwable
 
@@ -38,6 +38,7 @@ class MessagePreviewPresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         errorHandler.showErrorMessage = ::showErrorViewOnError
+        this.message = message
         loadData(requireNotNull(message))
     }
 
@@ -65,24 +66,25 @@ class MessagePreviewPresenter @Inject constructor(
             .logResourceStatus("message ${messageToLoad.messageId} preview")
             .onResourceData {
                 if (it != null) {
-                    messageWithAttachments = it
+                    message = it.message
+                    attachments = it.attachments
                     view?.apply {
                         setMessageWithAttachment(it)
                         showContent(true)
                         initOptions()
-                        updateMuteToggleButton(isMuted = it.mutedMessageSender != null)
+
                         if (preferencesRepository.isIncognitoMode && it.message.unread) {
                             showMessage(R.string.message_incognito_description)
                         }
                     }
                 } else {
-                    delay(1.seconds)
                     view?.run {
                         showMessage(messageNotExists)
                         popView()
                     }
                 }
-            }.onResourceSuccess {
+            }
+            .onResourceSuccess {
                 if (it != null) {
                     analytics.logEvent(
                         "load_item",
@@ -90,28 +92,31 @@ class MessagePreviewPresenter @Inject constructor(
                         "length" to it.message.content.length
                     )
                 }
-            }.onResourceNotLoading { view?.showProgress(false) }.onResourceError {
+            }
+            .onResourceNotLoading { view?.showProgress(false) }
+            .onResourceError {
                 retryCallback = { onMessageLoadRetry(messageToLoad) }
                 errorHandler.dispatch(it)
-            }.launch()
+            }
+            .launch()
     }
 
     fun onReply(): Boolean {
-        return if (messageWithAttachments?.message != null) {
-            view?.openMessageReply(messageWithAttachments?.message)
+        return if (message != null) {
+            view?.openMessageReply(message)
             true
         } else false
     }
 
     fun onForward(): Boolean {
-        return if (messageWithAttachments?.message != null) {
-            view?.openMessageForward(messageWithAttachments?.message)
+        return if (message != null) {
+            view?.openMessageForward(message)
             true
         } else false
     }
 
     fun onShare(): Boolean {
-        val message = messageWithAttachments?.message ?: return false
+        val message = message ?: return false
         val subject = message.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }
 
         val text = buildString {
@@ -124,15 +129,13 @@ class MessagePreviewPresenter @Inject constructor(
 
             appendLine(message.content.parseAsHtml())
 
-            if (!messageWithAttachments?.attachments.isNullOrEmpty()) {
+            if (!attachments.isNullOrEmpty()) {
                 appendLine()
                 appendLine("Załączniki:")
 
-                append(
-                    messageWithAttachments?.attachments.orEmpty()
-                        .joinToString(separator = "\n") { attachment ->
-                            "${attachment.filename}: ${attachment.url}"
-                        })
+                append(attachments.orEmpty().joinToString(separator = "\n") { attachment ->
+                    "${attachment.filename}: ${attachment.url}"
+                })
             }
         }
 
@@ -145,7 +148,7 @@ class MessagePreviewPresenter @Inject constructor(
 
     @SuppressLint("NewApi")
     fun onPrint(): Boolean {
-        val message = messageWithAttachments?.message ?: return false
+        val message = message ?: return false
         val subject = message.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }
 
         val dateString = message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
@@ -156,7 +159,8 @@ class MessagePreviewPresenter @Inject constructor(
             append("<div><h4>Od</h4>${message.sender}</div>")
             append("<div><h4>DO</h4>${message.recipients}</div>")
         }
-        val messageContent = "<p>${message.content}</p>".replace(Regex("[\\n\\r]{2,}"), "</p><p>")
+        val messageContent = "<p>${message.content}</p>"
+            .replace(Regex("[\\n\\r]{2,}"), "</p><p>")
             .replace(Regex("[\\n\\r]"), "<br>")
 
         val jobName = buildString {
@@ -167,7 +171,9 @@ class MessagePreviewPresenter @Inject constructor(
         }
 
         view?.apply {
-            val html = printHTML.replace("%SUBJECT%", subject).replace("%CONTENT%", messageContent)
+            val html = printHTML
+                .replace("%SUBJECT%", subject)
+                .replace("%CONTENT%", messageContent)
                 .replace("%INFO%", infoContent)
             printDocument(html, jobName)
         }
@@ -175,69 +181,34 @@ class MessagePreviewPresenter @Inject constructor(
         return true
     }
 
-    private fun restoreMessage() {
-        val message = messageWithAttachments?.message ?: return
+    private fun deleteMessage() {
+        message ?: return
 
         view?.run {
             showContent(false)
             showProgress(true)
-            showOptions(
-                show = false,
-                isReplayable = false,
-                isRestorable = false,
-            )
+            showOptions(show = false, isReplayable = false)
             showErrorView(false)
         }
-        Timber.i("Restore message ${message.messageGlobalKey}")
+
+        Timber.i("Delete message ${message?.messageGlobalKey}")
+
         presenterScope.launch {
             runCatching {
                 val student = studentRepository.getCurrentStudent(decryptPass = true)
                 val mailbox = messageRepository.getMailboxByStudent(student)
-                messageRepository.restoreMessages(student, mailbox, listOfNotNull(message))
+                messageRepository.deleteMessage(student, mailbox, message!!)
             }
                 .onFailure {
-                    retryCallback = { onMessageRestore() }
+                    retryCallback = { onMessageDelete() }
                     errorHandler.dispatch(it)
                 }
                 .onSuccess {
                     view?.run {
-                        showMessage(restoreMessageSuccessString)
+                        showMessage(deleteMessageSuccessString)
                         popView()
                     }
                 }
-            view?.showProgress(false)
-        }
-    }
-
-    private fun deleteMessage() {
-        messageWithAttachments?.message ?: return
-
-        view?.run {
-            showContent(false)
-            showProgress(true)
-            showOptions(
-                show = false,
-                isReplayable = false,
-                isRestorable = false,
-            )
-            showErrorView(false)
-        }
-
-        Timber.i("Delete message ${messageWithAttachments?.message?.messageGlobalKey}")
-
-        presenterScope.launch {
-            runCatching {
-                val student = studentRepository.getCurrentStudent(decryptPass = true)
-                messageRepository.deleteMessage(student, messageWithAttachments?.message!!)
-            }.onFailure {
-                retryCallback = { onMessageDelete() }
-                errorHandler.dispatch(it)
-            }.onSuccess {
-                view?.run {
-                    showMessage(deleteMessageSuccessString)
-                    popView()
-                }
-            }
 
             view?.showProgress(false)
         }
@@ -253,11 +224,6 @@ class MessagePreviewPresenter @Inject constructor(
         }
     }
 
-    fun onMessageRestore(): Boolean {
-        restoreMessage()
-        return true
-    }
-
     fun onMessageDelete(): Boolean {
         deleteMessage()
         return true
@@ -266,39 +232,20 @@ class MessagePreviewPresenter @Inject constructor(
     private fun initOptions() {
         view?.apply {
             showOptions(
-                show = messageWithAttachments?.message != null,
-                isReplayable = messageWithAttachments?.message?.folderId == MessageFolder.RECEIVED.id,
-                isRestorable = messageWithAttachments?.message?.folderId == MessageFolder.TRASHED.id,
+                show = message != null,
+                isReplayable = message?.folderId != MessageFolder.SENT.id,
             )
+            message?.let {
+                when (it.folderId == MessageFolder.TRASHED.id) {
+                    true -> setDeletedOptionsLabels()
+                    false -> setNotDeletedOptionsLabels()
+                }
+            }
+
         }
     }
 
     fun onCreateOptionsMenu() {
         initOptions()
     }
-
-    fun onMute(): Boolean {
-        val message = messageWithAttachments?.message ?: return false
-        val isMuted = messageWithAttachments?.mutedMessageSender != null
-
-        presenterScope.launch {
-            runCatching {
-                when (isMuted) {
-                    true -> {
-                        messageRepository.unmuteMessage(message.correspondents)
-                        view?.run { showMessage(unmuteMessageSuccessString) }
-                    }
-
-                    false -> {
-                        messageRepository.muteMessage(message.correspondents)
-                        view?.run { showMessage(muteMessageSuccessString) }
-                    }
-                }
-            }.onFailure {
-                errorHandler.dispatch(it)
-            }
-        }
-        view?.updateMuteToggleButton(isMuted)
-        return true
-    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt

@@ -9,12 +9,6 @@ interface MessagePreviewView : BaseView {
 
     val deleteMessageSuccessString: String
 
-    val muteMessageSuccessString: String
-
-    val unmuteMessageSuccessString: String
-
-    val restoreMessageSuccessString: String
-
     val messageNoSubjectString: String
 
     val printHTML: String
@@ -25,8 +19,6 @@ interface MessagePreviewView : BaseView {
 
     fun setMessageWithAttachment(item: MessageWithAttachment)
 
-    fun updateMuteToggleButton(isMuted: Boolean)
-
     fun showProgress(show: Boolean)
 
     fun showContent(show: Boolean)
@@ -37,7 +29,11 @@ interface MessagePreviewView : BaseView {
 
     fun setErrorRetryCallback(callback: () -> Unit)
 
-    fun showOptions(show: Boolean, isReplayable: Boolean, isRestorable: Boolean)
+    fun showOptions(show: Boolean, isReplayable: Boolean)
+
+    fun setDeletedOptionsLabels()
+
+    fun setNotDeletedOptionsLabels()
 
     fun openMessageReply(message: Message?)
 

app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt

@@ -203,7 +203,7 @@ class SendMessagePresenter @Inject constructor(
                 subject = subject,
                 content = content,
                 recipients = recipients,
-                mailbox = mailbox,
+                mailboxId = mailbox.globalKey,
             )
         }.logResourceStatus("sending message").onEach {
             when (it) {