Merge branch 'release/2.3.5'

* Add improvements retrying after captcha solved

* Add showAuthDialog from BaseActivity instead of displaying this dialog manually

* Add getCookieStore() with removeAll impl in WebkitCookieManagerProxy

* Add debounce to captcha dialog showing logic

* Add refresh button to captcha dialog

* Destroy webview along with captcha dialog

* Add clear webkit cookies button to debug menu

* Add captcha error message

* Update captcha verified message

app/build.gradle

@@ -27,8 +27,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 139
+        versionCode 145
-        versionName "2.2.7"
+        versionName "2.3.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -162,8 +162,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
-    userFraction = 0.99d
+    userFraction = 0.15d
-    updatePriority = 5
+    updatePriority = 1
     enabled.set(false)
 }
 
@@ -188,12 +188,12 @@ ext {
     android_hilt = "1.1.0"
     room = "2.6.1"
     chucker = "4.0.0"
-    mockk = "1.13.8"
+    mockk = "1.13.9"
     coroutines = "1.7.3"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.2.7'
+    implementation 'io.github.wulkanowy:sdk:2.3.7'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
@@ -221,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.6.2"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -238,9 +238,10 @@ 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 "at.favre.lib:slf4j-timber:1.0.1"
+    implementation 'com.github.Faierbel:slf4j-timber:2.0'
     implementation 'com.github.bastienpaulfr:Treessence:1.1.2'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation 'io.coil-kt:coil:2.5.0'
@@ -250,17 +251,19 @@ dependencies {
     implementation 'org.apache.commons:commons-text:1.11.0'
 
     playImplementation platform('com.google.firebase:firebase-bom:32.7.0')
-    playImplementation 'com.google.firebase:firebase-analytics-ktx'
+    playImplementation 'com.google.firebase:firebase-analytics'
     playImplementation 'com.google.firebase:firebase-messaging'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
-    playImplementation 'com.google.firebase:firebase-config-ktx'
+    playImplementation 'com.google.firebase:firebase-config'
+
     playImplementation 'com.google.android.gms:play-services-ads:22.6.0'
     playImplementation "com.google.android.play:integrity:1.3.0"
     playImplementation 'com.google.android.play:app-update-ktx:2.1.0'
     playImplementation 'com.google.android.play:review-ktx:2.0.1'
+    playImplementation "com.google.android.ump:user-messaging-platform:2.1.0"
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.12.0.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.302'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.303'
 
     releaseImplementation "com.github.chuckerteam.chucker:library-no-op:$chucker"
 

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

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

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

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

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

@@ -12,7 +12,6 @@ import fr.bipi.treessence.file.FileLoggerTree
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
-import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.CrashLogExceptionTree
@@ -37,9 +36,6 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
-    @Inject
-    lateinit var adsHelper: AdsHelper
-
     @Inject
     lateinit var remoteConfigHelper: RemoteConfigHelper
 
@@ -56,7 +52,6 @@ class WulkanowyApp : Application(), Configuration.Provider {
         super.onCreate()
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
-        adsHelper.initialize()
         remoteConfigHelper.initialize()
         initLogging()
     }

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

@@ -21,6 +21,7 @@ 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
@@ -43,6 +44,7 @@ internal class DataModule {
             buildTag = android.os.Build.MODEL
             userAgentTemplate = remoteConfig.userAgentTemplate
             setSimpleHttpLogger { Timber.d(it) }
+            setAdditionalCookieManager(WebkitCookieManagerProxy())
 
             // for debug only
             addInterceptor(chuckerInterceptor, network = true)

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

@@ -1,6 +1,16 @@
 package io.github.wulkanowy.data
 
-import kotlinx.coroutines.flow.*
+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.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
@@ -131,7 +141,7 @@ inline fun <ResultType, RequestType> networkBoundResource(
             query().map { Resource.Success(filterResult(it)) }
         } catch (throwable: Throwable) {
             onFetchFailed(throwable)
-            query().map { Resource.Error(throwable) }
+            flowOf(Resource.Error(throwable))
         }
     } else {
         query().map { Resource.Success(filterResult(it)) }
@@ -165,7 +175,7 @@ inline fun <ResultType, RequestType, T> networkBoundResource(
             query().map { Resource.Success(mapResult(it)) }
         } catch (throwable: Throwable) {
             onFetchFailed(throwable)
-            query().map { Resource.Error(throwable) }
+            flowOf(Resource.Error(throwable))
         }
     } else {
         query().map { Resource.Success(mapResult(it)) }

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

@@ -1,11 +1,124 @@
 package io.github.wulkanowy.data.db
 
 import android.content.Context
-import androidx.room.*
+import androidx.room.AutoMigration
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
-import io.github.wulkanowy.data.db.dao.*
+import androidx.room.TypeConverters
-import io.github.wulkanowy.data.db.entities.*
+import io.github.wulkanowy.data.db.dao.AdminMessageDao
-import io.github.wulkanowy.data.db.migrations.*
+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.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.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.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.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.utils.AppInfo
 import javax.inject.Singleton
 
@@ -51,6 +164,7 @@ 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),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -59,7 +173,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 57
+        const val VERSION_SCHEMA = 58
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),

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

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

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

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

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

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

@@ -9,7 +9,13 @@ 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.*
+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 kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
@@ -58,7 +64,7 @@ class AttendanceRepository @Inject constructor(
                 )
             }
             sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .getAttendance(start.monday, end.sunday)
                 .mapToEntities(semester, lessons)
         },
@@ -97,7 +103,7 @@ class AttendanceRepository @Inject constructor(
             )
         }
         sdk.init(student)
-            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            .switchSemester(semester)
             .excuseForAbsence(items, reason)
     }
 }

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

@@ -9,6 +9,7 @@ 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 +41,7 @@ class AttendanceSummaryRepository @Inject constructor(
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
         fetch = {
             sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .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)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .getCompletedLessons(start.monday, end.sunday)
                 .mapToEntities(semester)
         },

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

@@ -10,6 +10,7 @@ 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
@@ -46,7 +47,7 @@ class ConferenceRepository @Inject constructor(
         },
         fetch = {
             sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .getConferences()
                 .mapToEntities(semester)
                 .filter { it.date >= startDate }

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

@@ -7,7 +7,13 @@ 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.*
+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 kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
@@ -51,7 +57,7 @@ class ExamRepository @Inject constructor(
         },
         fetch = {
             sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .getExams(start.startExamsDay, start.endExamsDay)
                 .mapToEntities(semester)
         },
@@ -67,14 +73,16 @@ class ExamRepository @Inject constructor(
         filterResult = { it.filter { item -> item.date in start..end } }
     )
 
-    fun getExamsFromDatabase(semester: Semester, start: LocalDate): Flow<List<Exam>> {
+    fun getExamsFromDatabase(
-        return examDb.loadAll(
+        semester: Semester,
-            diaryId = semester.diaryId,
+        start: LocalDate,
-            studentId = semester.studentId,
+        end: LocalDate
-            from = start.startExamsDay,
+    ): Flow<List<Exam>> = examDb.loadAll(
-            end = start.endExamsDay
+        diaryId = semester.diaryId,
-        )
+        studentId = semester.studentId,
-    }
+        from = start,
+        end = end,
+    )
 
     suspend fun updateExam(exam: List<Exam>) = examDb.updateAll(exam)
 }

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

@@ -52,7 +52,7 @@ class GradeRepository @Inject constructor(
         },
         fetch = {
             val (details, summary) = sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .getGrades(semester.semesterId)
 
             details.mapToEntities(semester) to summary.mapToEntities(semester)

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

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

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

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

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

@@ -35,12 +35,15 @@ class LuckyNumberRepository @Inject constructor(
         fetch = {
             sdk.init(student).getLuckyNumber(student.schoolShortName)?.mapToEntity(student)
         },
-        saveFetchResult = { old, new ->
+        saveFetchResult = { oldLuckyNumber, newLuckyNumber ->
-            if (new != old) {
+            newLuckyNumber ?: return@networkBoundResource
-                old?.let { luckyNumberDb.deleteAll(listOfNotNull(it)) }
+
-                luckyNumberDb.insertAll(listOfNotNull((new?.apply {
+            if (newLuckyNumber != oldLuckyNumber) {
-                    if (notify) isNotified = false
+                val updatedLuckNumberList =
-                })))
+                    listOf(newLuckyNumber.apply { if (notify) isNotified = false })
+
+                oldLuckyNumber?.let { luckyNumberDb.deleteAll(listOfNotNull(it)) }
+                luckyNumberDb.insertAll(updatedLuckNumberList)
             }
         }
     )

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

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

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

@@ -9,7 +9,12 @@ import com.fredporciuncula.flow.preferences.Preference
 import com.fredporciuncula.flow.preferences.Serializer
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.enums.*
+import io.github.wulkanowy.data.enums.AppTheme
+import io.github.wulkanowy.data.enums.GradeColorTheme
+import io.github.wulkanowy.data.enums.GradeExpandMode
+import io.github.wulkanowy.data.enums.GradeSortingMode
+import io.github.wulkanowy.data.enums.TimetableGapsMode
+import io.github.wulkanowy.data.enums.TimetableMode
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
 import io.github.wulkanowy.ui.modules.settings.appearance.menuorder.AppMenuItem
@@ -18,7 +23,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.Instant
-import java.util.*
+import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -303,19 +308,6 @@ class PreferencesRepository @Inject constructor(
         get() = sharedPref.getBoolean(PREF_KEY_APP_SUPPORT_SHOWN, false)
         set(value) = sharedPref.edit { putBoolean(PREF_KEY_APP_SUPPORT_SHOWN, value) }
 
-    var isAgreeToProcessData: Boolean
-        get() = getBoolean(
-            R.string.pref_key_ads_consent_data_processing,
-            R.bool.pref_default_ads_consent_data_processing
-        )
-        set(value) = sharedPref.edit {
-            putBoolean(context.getString(R.string.pref_key_ads_consent_data_processing), value)
-        }
-
-    var isPersonalizedAdsEnabled: Boolean
-        get() = sharedPref.getBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, false)
-        set(value) = sharedPref.edit { putBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, value) }
-
     val isAdsEnabledFlow = flowSharedPref.getBoolean(
         context.getString(R.string.pref_key_ads_enabled),
         context.resources.getBoolean(R.bool.pref_default_ads_enabled)
@@ -398,7 +390,6 @@ class PreferencesRepository @Inject constructor(
         private const val PREF_KEY_IN_APP_REVIEW_DATE = "in_app_review_date"
         private const val PREF_KEY_IN_APP_REVIEW_DONE = "in_app_review_done"
         private const val PREF_KEY_APP_SUPPORT_SHOWN = "app_support_shown"
-        private const val PREF_KEY_PERSONALIZED_ADS_ENABLED = "personalized_ads_enabled"
         private const val PREF_KEY_ADMIN_DISMISSED_MESSAGE_IDS = "admin_message_dismissed_ids"
     }
 }

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

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

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

@@ -11,6 +11,7 @@ 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
@@ -42,11 +43,7 @@ class SchoolsRepository @Inject constructor(
 
         val schoolInfo = sdk
             .init(student.copy(password = loginData.password))
-            .switchDiary(
+            .switchSemester(semester)
-                diaryId = semester.diaryId,
-                kindergartenDiaryId = semester.kindergartenDiaryId,
-                schoolYear = semester.schoolYear
-            )
             .getSchool()
 
         schoolsService.logLoginEvent(

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

@@ -7,6 +7,7 @@ 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
@@ -30,7 +31,7 @@ class StudentInfoRepository @Inject constructor(
         query = { studentInfoDao.loadStudentInfo(student.studentId) },
         fetch = {
             sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .getStudentInfo().mapToEntity(semester)
         },
         saveFetchResult = { old, new ->

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

@@ -1,8 +1,6 @@
 package io.github.wulkanowy.data.repositories
 
-import android.content.Context
 import androidx.room.withTransaction
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
@@ -17,20 +15,20 @@ import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.security.decrypt
+import io.github.wulkanowy.utils.security.Scrambler
-import io.github.wulkanowy.utils.security.encrypt
+import io.github.wulkanowy.utils.switchSemester
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class StudentRepository @Inject constructor(
-    @ApplicationContext private val context: Context,
     private val dispatchers: DispatchersProvider,
     private val studentDb: StudentDao,
     private val semesterDb: SemesterDao,
     private val sdk: Sdk,
-    private val appDatabase: AppDatabase
+    private val appDatabase: AppDatabase,
+    private val scrambler: Scrambler,
 ) {
 
     suspend fun isCurrentStudentSet() = studentDb.loadCurrent()?.isCurrent ?: false
@@ -68,7 +66,7 @@ class StudentRepository @Inject constructor(
                 student = student.apply {
                     if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
                         student.password = withContext(dispatchers.io) {
-                            decrypt(student.password)
+                            scrambler.decrypt(student.password)
                         }
                     }
                 },
@@ -86,7 +84,7 @@ class StudentRepository @Inject constructor(
         }.apply {
             if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
                 student.password = withContext(dispatchers.io) {
-                    decrypt(student.password)
+                    scrambler.decrypt(student.password)
                 }
             }
         }
@@ -96,7 +94,7 @@ class StudentRepository @Inject constructor(
 
         if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
             student.password = withContext(dispatchers.io) {
-                decrypt(student.password)
+                scrambler.decrypt(student.password)
             }
         }
         return student
@@ -107,7 +105,7 @@ class StudentRepository @Inject constructor(
 
         if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
             student.password = withContext(dispatchers.io) {
-                decrypt(student.password)
+                scrambler.decrypt(student.password)
             }
         }
         return student
@@ -120,7 +118,7 @@ class StudentRepository @Inject constructor(
                 it.apply {
                     if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.HEBE) {
                         password = withContext(dispatchers.io) {
-                            encrypt(password, context)
+                            scrambler.encrypt(password)
                         }
                     }
                 }
@@ -152,12 +150,12 @@ class StudentRepository @Inject constructor(
 
     suspend fun authorizePermission(student: Student, semester: Semester, pesel: String) =
         sdk.init(student)
-            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            .switchSemester(semester)
             .authorizePermission(pesel)
 
     suspend fun refreshStudentName(student: Student, semester: Semester) {
         val newCurrentApiStudent = sdk.init(student)
-            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            .switchSemester(semester)
             .getCurrentStudent() ?: return
 
         val studentName = StudentName(
@@ -166,4 +164,15 @@ class StudentRepository @Inject constructor(
 
         studentDb.update(studentName)
     }
+
+    suspend fun deleteStudentsAssociatedWithAccount(student: Student) {
+        studentDb.deleteByEmailAndUserName(student.email, student.userName)
+    }
+
+    suspend fun clearAll() {
+        withContext(dispatchers.io) {
+            scrambler.clearKeyPair()
+            appDatabase.clearAllTables()
+        }
+    }
 }

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

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

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

@@ -9,6 +9,7 @@ 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
@@ -39,7 +40,7 @@ class TeacherRepository @Inject constructor(
         query = { teacherDb.loadAll(semester.studentId, semester.classId) },
         fetch = {
             sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .getTeachers()
                 .mapToEntities(semester)
         },

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

@@ -65,7 +65,7 @@ class TimetableRepository @Inject constructor(
         query = { getFullTimetableFromDatabase(student, semester, start, end) },
         fetch = {
             val timetableFull = sdk.init(student)
-                .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+                .switchSemester(semester)
                 .getTimetable(start.monday, end.sunday)
 
             timetableFull.mapToEntities(semester)

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

@@ -65,8 +65,6 @@ 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/works/AttendanceWork.kt

@@ -16,17 +16,24 @@ 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 = now().previousOrSameSchoolDay,
+            start = startDate,
-            end = now().previousOrSameSchoolDay,
+            end = endDate,
             forceRefresh = true,
             notify = notify,
         )
             .waitForResult()
 
-        attendanceRepository.getAttendanceFromDatabase(semester, now().minusDays(7), now())
+        attendanceRepository.getAttendanceFromDatabase(
+            semester = semester,
+            start = startDate,
+            end = endDate,
+        )
             .first()
             .filterNot { it.isNotified }
             .let {

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

@@ -5,6 +5,8 @@ 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
@@ -15,16 +17,24 @@ 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 = now(),
+            start = startDate,
-            end = now(),
+            end = endDate,
             forceRefresh = true,
             notify = notify,
         ).waitForResult()
 
-        examRepository.getExamsFromDatabase(semester, now()).first()
+        examRepository.getExamsFromDatabase(
+            semester = semester,
+            start = startDate,
+            end = endDate,
+        )
+            .first()
             .filter { !it.isNotified }.let {
                 if (it.isNotEmpty()) newExamNotification.notify(it, student)
 

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

@@ -5,7 +5,9 @@ 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
@@ -16,16 +18,24 @@ 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 = now().nextOrSameSchoolDay,
+            start = startDate,
-            end = now().nextOrSameSchoolDay,
+            end = endDate,
             forceRefresh = true,
             notify = notify,
         ).waitForResult()
 
-        homeworkRepository.getHomeworkFromDatabase(semester, now(), now().plusDays(7)).first()
+        homeworkRepository.getHomeworkFromDatabase(
+            semester = semester,
+            start = startDate,
+            end = endDate
+        )
+            .first()
             .filter { !it.isNotified }.let {
                 if (it.isNotEmpty()) newHomeworkNotification.notify(it, student)
 

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

@@ -16,17 +16,24 @@ 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 = now().nextOrSameSchoolDay,
+            start = startDate,
-            end = now().nextOrSameSchoolDay,
+            end = endDate,
             forceRefresh = true,
             notify = notify,
         )
             .waitForResult()
 
-        timetableRepository.getTimetableFromDatabase(semester, now(), now().plusDays(7))
+        timetableRepository.getTimetableFromDatabase(
+            semester = semester,
+            from = startDate,
+            end = endDate,
+        )
             .first()
             .filterNot { it.isNotified }
             .let {

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

@@ -11,6 +11,7 @@ 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
@@ -68,11 +69,24 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         } else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
     }
 
-    override fun showExpiredDialog() {
+    override fun showExpiredCredentialsDialog() {
+        MaterialAlertDialogBuilder(this)
+            .setTitle(R.string.main_expired_credentials_title)
+            .setMessage(R.string.main_expired_credentials_description)
+            .setPositiveButton(R.string.main_log_in) { _, _ -> presenter.onConfirmExpiredCredentialsSelected() }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        CaptchaDialog.newInstance(url).show(supportFragmentManager, "captcha_dialog")
+    }
+
+    override fun showDecryptionFailedDialog() {
         MaterialAlertDialogBuilder(this)
             .setTitle(R.string.main_session_expired)
             .setMessage(R.string.main_session_relogin)
-            .setPositiveButton(R.string.main_log_in) { _, _ -> presenter.onExpiredLoginSelected() }
+            .setPositiveButton(R.string.main_log_in) { _, _ -> presenter.onConfirmDecryptionFailedSelected() }
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
             .show()
     }

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

@@ -8,7 +8,6 @@ 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
@@ -28,8 +27,16 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
         Toast.makeText(context, text, Toast.LENGTH_LONG).show()
     }
 
-    override fun showExpiredDialog() {
+    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
+    }
+
+    override fun showDecryptionFailedDialog() {
+        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
 
     override fun openClearLoginView() {
@@ -41,7 +48,7 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
     }
 
     override fun showAuthDialog() {
-        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+        (activity as? BaseActivity<*, *>)?.showAuthDialog()
     }
 
     override fun showErrorDetailsDialog(error: Throwable) {

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

@@ -7,7 +7,6 @@ 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),
@@ -39,12 +38,20 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragme
         }
     }
 
-    override fun showExpiredDialog() {
+    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
+    }
+
+    override fun showDecryptionFailedDialog() {
+        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
 
     override fun showAuthDialog() {
-        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+        (activity as? BaseActivity<*, *>)?.showAuthDialog()
     }
 
     override fun openClearLoginView() {

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

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

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

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

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

@@ -4,6 +4,7 @@ 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
@@ -15,7 +16,9 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
 
     var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
 
-    var onSessionExpired: () -> Unit = {}
+    var onExpiredCredentials: () -> Unit = {}
+
+    var onDecryptionFailed: () -> Unit = {}
 
     var onNoCurrentStudent: () -> Unit = {}
 
@@ -23,6 +26,8 @@ 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)
@@ -32,15 +37,18 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
         showErrorMessage(context.resources.getErrorString(error), error)
         when (error) {
             is PasswordChangeRequiredException -> onPasswordChangeRequired(error.redirectUrl)
-            is ScramblerException, is BadCredentialsException -> onSessionExpired()
+            is ScramblerException -> onDecryptionFailed()
+            is BadCredentialsException -> onExpiredCredentials()
             is NoCurrentStudentException -> onNoCurrentStudent()
             is AuthorizationRequiredException -> onAuthorizationRequired()
+            is CloudflareVerificationException -> onCaptchaVerificationRequired(error.originalUrl)
         }
     }
 
     open fun clear() {
         showErrorMessage = { _, _ -> }
-        onSessionExpired = {}
+        onExpiredCredentials = {}
+        onDecryptionFailed = {}
         onNoCurrentStudent = {}
         onPasswordChangeRequired = {}
         onAuthorizationRequired = {}

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

@@ -0,0 +1,86 @@
+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,8 +18,10 @@ 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
@@ -30,7 +32,12 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.notificationscenter.NotificationsCenterFragment
 import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.capitalise
+import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.getErrorString
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.toFormattedString
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -57,6 +64,9 @@ 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()
@@ -72,6 +82,13 @@ 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) {
@@ -182,8 +199,17 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
         binding.dashboardRecycler.isVisible = show
     }
 
-    override fun showErrorView(show: Boolean) {
+    override fun showErrorView(show: Boolean, adminMessageItem: DashboardItem.AdminMessages?) {
         binding.dashboardErrorContainer.isVisible = show
+        binding.dashboardErrorAdminMessage.root.isVisible = adminMessageItem != null
+
+        if (adminMessageItem != null) {
+            AdminMessageViewHolder(
+                binding = binding.dashboardErrorAdminMessage,
+                onAdminMessageDismissClickListener = presenter::onAdminMessageDismissed,
+                onAdminMessageClickListener = presenter::onAdminMessageSelected,
+            ).bind(adminMessageItem.adminMessage)
+        }
     }
 
     override fun setErrorDetails(error: Throwable) {

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

@@ -1,19 +1,46 @@
 package io.github.wulkanowy.ui.modules.dashboard
 
-import io.github.wulkanowy.data.*
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageType
-import io.github.wulkanowy.data.repositories.*
+import io.github.wulkanowy.data.errorOrNull
+import io.github.wulkanowy.data.flatResourceFlow
+import io.github.wulkanowy.data.mapResourceData
+import io.github.wulkanowy.data.onResourceError
+import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
+import io.github.wulkanowy.data.repositories.ConferenceRepository
+import io.github.wulkanowy.data.repositories.ExamRepository
+import io.github.wulkanowy.data.repositories.GradeRepository
+import io.github.wulkanowy.data.repositories.HomeworkRepository
+import io.github.wulkanowy.data.repositories.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.MessageRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.SchoolAnnouncementRepository
+import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.TimetableRepository
 import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
 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 kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.time.Instant
@@ -48,6 +75,11 @@ class DashboardPresenter @Inject constructor(
 
     private val firstLoadedItemList = mutableListOf<DashboardItem.Type>()
 
+    private val selectedDashboardTiles
+        get() = preferencesRepository.selectedDashboardTiles
+            .filterNot { it == DashboardItem.Tile.ADS && !adsHelper.canShowAd }
+            .toSet()
+
     private lateinit var lastError: Throwable
 
     override fun onAttachView(view: DashboardView) {
@@ -59,10 +91,19 @@ class DashboardPresenter @Inject constructor(
             showContent(false)
         }
 
+        val selectedDashboardTilesFlow = preferencesRepository.selectedDashboardTilesFlow
+            .map { selectedDashboardTiles }
+        val isAdsEnabledFlow = preferencesRepository.isAdsEnabledFlow
+            .filter { (adsHelper.canShowAd && it) || !it }
+            .map { selectedDashboardTiles }
+        val isMobileAdsSdkInitializedFlow = adsHelper.isMobileAdsSdkInitialized
+            .filter { it }
+            .map { selectedDashboardTiles }
+
         merge(
-            preferencesRepository.selectedDashboardTilesFlow,
+            selectedDashboardTilesFlow,
-            preferencesRepository.isAdsEnabledFlow
+            isAdsEnabledFlow,
-                .map { preferencesRepository.selectedDashboardTiles }
+            isMobileAdsSdkInitializedFlow
         )
             .onEach { loadData(tilesToLoad = it) }
             .launch("dashboard_pref")
@@ -71,7 +112,7 @@ class DashboardPresenter @Inject constructor(
     fun onAdminMessageDismissed(adminMessage: AdminMessage) {
         preferencesRepository.dismissedAdminMessageIds += adminMessage.id
 
-        loadData(preferencesRepository.selectedDashboardTiles)
+        loadData(selectedDashboardTiles)
     }
 
     fun onDragAndDropEnd(list: List<DashboardItem>) {
@@ -187,7 +228,7 @@ class DashboardPresenter @Inject constructor(
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the dashboard")
-        loadData(preferencesRepository.selectedDashboardTiles, forceRefresh = true)
+        loadData(selectedDashboardTiles, forceRefresh = true)
     }
 
     fun onRetry() {
@@ -195,7 +236,15 @@ class DashboardPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(preferencesRepository.selectedDashboardTiles, forceRefresh = true)
+        loadData(selectedDashboardTiles, forceRefresh = true)
+    }
+
+    fun onRetryAfterCaptcha() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
+        }
+        loadData(selectedDashboardTiles, forceRefresh = true)
     }
 
     fun onViewReselected() {
@@ -216,7 +265,7 @@ class DashboardPresenter @Inject constructor(
     }
 
     fun onDashboardTileSettingsSelected(): Boolean {
-        view?.showDashboardTileSettings(preferencesRepository.selectedDashboardTiles.toList())
+        view?.showDashboardTileSettings(selectedDashboardTiles.toList())
         return true
     }
 
@@ -232,7 +281,7 @@ class DashboardPresenter @Inject constructor(
 
     private fun loadHorizontalGroup(student: Student, forceRefresh: Boolean) {
         flow {
-            val selectedTiles = preferencesRepository.selectedDashboardTiles
+            val selectedTiles = selectedDashboardTiles
             val flowSuccess = flowOf(Resource.Success(null))
 
             val luckyNumberFlow = luckyNumberRepository.getLuckyNumber(student, forceRefresh)
@@ -275,7 +324,7 @@ class DashboardPresenter @Inject constructor(
                 ) { luckyNumberResource, messageResource, attendanceResource ->
                     val resList = listOf(luckyNumberResource, messageResource, attendanceResource)
 
-                    DashboardItem.HorizontalGroup(
+                    resList to DashboardItem.HorizontalGroup(
                         isLoading = resList.any { it is Resource.Loading },
                         error = resList.map { it.errorOrNull }.let { errors ->
                             if (errors.all { it != null }) {
@@ -300,9 +349,9 @@ class DashboardPresenter @Inject constructor(
                     )
                 })
         }
-            .filterNot { it.isLoading && forceRefresh }
+            .filterNot { (_, it) -> it.isLoading && forceRefresh }
             .distinctUntilChanged()
-            .onEach {
+            .onEach { (_, it) ->
                 updateData(it, forceRefresh)
 
                 if (it.isLoading) {
@@ -320,7 +369,7 @@ class DashboardPresenter @Inject constructor(
                 )
                 errorHandler.dispatch(it)
             }
-            .launch("horizontal_group ${if (forceRefresh) "-forceRefresh" else ""}")
+            .launchWithUniqueRefreshJob("horizontal_group", forceRefresh)
     }
 
     private fun loadGrades(student: Student, forceRefresh: Boolean) {
@@ -354,7 +403,7 @@ class DashboardPresenter @Inject constructor(
                                 subjectWithGrades = it.dataOrNull,
                                 gradeTheme = preferencesRepository.gradeColorTheme,
                                 isLoading = true
-                            ), forceRefresh
+                            ), false
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -386,13 +435,13 @@ class DashboardPresenter @Inject constructor(
     private fun loadLessons(student: Student, forceRefresh: Boolean) {
         flatResourceFlow {
             val semester = semesterRepository.getCurrentSemester(student)
-            val date = LocalDate.now()
+            val date = LocalDate.now().nextOrSameSchoolDay
 
             timetableRepository.getTimetable(
                 student = student,
                 semester = semester,
                 start = date,
-                end = date.plusDays(1),
+                end = date,
                 forceRefresh = forceRefresh
             )
         }
@@ -403,7 +452,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(
                             DashboardItem.Lessons(it.dataOrNull, isLoading = true),
-                            forceRefresh
+                            false
                         )
 
                         if (!it.dataOrNull?.lessons.isNullOrEmpty()) {
@@ -460,7 +509,7 @@ class DashboardPresenter @Inject constructor(
                         val data = it.dataOrNull.orEmpty()
                         updateData(
                             DashboardItem.Homework(data, isLoading = true),
-                            forceRefresh
+                            false
                         )
 
                         if (data.isNotEmpty()) {
@@ -494,7 +543,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(
                             DashboardItem.Announcements(it.dataOrNull.orEmpty(), isLoading = true),
-                            forceRefresh
+                            false
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -537,7 +586,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(
                             DashboardItem.Exams(it.dataOrNull.orEmpty(), isLoading = true),
-                            forceRefresh
+                            false
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -578,7 +627,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(
                             DashboardItem.Conferences(it.dataOrNull.orEmpty(), isLoading = true),
-                            forceRefresh
+                            false
                         )
 
                         if (!it.dataOrNull.isNullOrEmpty()) {
@@ -613,7 +662,7 @@ class DashboardPresenter @Inject constructor(
                     is Resource.Loading -> {
                         Timber.i("Loading dashboard admin message data started")
                         if (forceRefresh) return@onEach
-                        updateData(DashboardItem.AdminMessages(), forceRefresh)
+                        updateData(DashboardItem.AdminMessages(), false)
                     }
 
                     is Resource.Success -> {
@@ -643,7 +692,7 @@ class DashboardPresenter @Inject constructor(
     private fun loadAds(forceRefresh: Boolean) {
         presenterScope.launch {
             if (!forceRefresh) {
-                updateData(DashboardItem.Ads(), forceRefresh)
+                updateData(DashboardItem.Ads(), false)
             }
 
             val dashboardAdItem =
@@ -764,6 +813,8 @@ 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 =
@@ -785,7 +836,7 @@ class DashboardPresenter @Inject constructor(
                 showRefresh(false)
                 if ((forceRefresh && wasGeneralError) || !forceRefresh) {
                     showContent(false)
-                    showErrorView(true)
+                    showErrorView(true, dataLoadedAdminMessageItem)
                     setErrorDetails(lastError)
                 }
             }
@@ -813,6 +864,28 @@ 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,6 +6,8 @@ interface DashboardView : BaseView {
 
     val tileWidth: Int
 
+    val isViewEmpty: Boolean
+
     fun initView()
 
     fun updateData(data: List<DashboardItem>)
@@ -18,7 +20,7 @@ interface DashboardView : BaseView {
 
     fun showRefresh(show: Boolean)
 
-    fun showErrorView(show: Boolean)
+    fun showErrorView(show: Boolean, adminMessageItem: DashboardItem.AdminMessages? = null)
 
     fun setErrorDetails(error: Throwable)
 

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

@@ -7,7 +7,6 @@ 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(
@@ -25,9 +24,11 @@ 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)
         }
 
@@ -37,11 +38,16 @@ class AdminMessageViewHolder(
             dashboardAdminMessageItemDescription.text = item.content
             dashboardAdminMessageItemDescription.setTextColor(textColor)
             dashboardAdminMessageItemIcon.setColorFilter(textColor)
-            dashboardAdminMessageItemDismiss.isVisible = item.isDismissible
+            dashboardAdminMessageItemDismiss.isVisible = item.isOkVisible
+            dashboardAdminMessageItemClose.isVisible = item.isXVisible
             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,6 +2,7 @@ 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
@@ -58,6 +59,10 @@ 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,6 +15,7 @@ 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) {
@@ -31,6 +32,7 @@ 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,4 +11,6 @@ interface DebugView : BaseView {
     fun openLogViewer()
 
     fun openNotificationsDebug()
+
+    fun clearWebkitCookies()
 }

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

@@ -7,6 +7,7 @@ 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
@@ -14,6 +15,7 @@ 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
@@ -72,6 +74,13 @@ 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() {

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

@@ -152,6 +152,10 @@ class LoginFormPresenter @Inject constructor(
         )
     }
 
+    fun onRetryAfterCaptcha() {
+        onSignInClick()
+    }
+
     fun onSignInClick() {
         val loginData = getLoginData()
 

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

@@ -9,9 +9,14 @@ import android.view.MenuItem
 import android.view.ViewGroup.MarginLayoutParams
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
-import androidx.core.view.*
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+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
@@ -23,16 +28,32 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.databinding.ActivityMainBinding
-import io.github.wulkanowy.databinding.DialogAdsConsentBinding
 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.*
+import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.InAppReviewHelper
+import io.github.wulkanowy.utils.InAppUpdateHelper
+import io.github.wulkanowy.utils.createNameInitialsDrawable
+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,
@@ -62,6 +83,8 @@ 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"
@@ -133,6 +156,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         initializeToolbar()
         initializeBottomNavigation(startMenuIndex, rootAppMenuItems)
         initializeNavController(startMenuIndex, rootUpdatedDestinations)
+        initializeCaptchaVerificationEvent()
     }
 
     private fun initializeNavController(
@@ -312,38 +336,25 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
             .show()
     }
 
-    override fun showPrivacyPolicyDialog() {
+    @OptIn(FlowPreview::class)
-        val dialogAdsConsentBinding = DialogAdsConsentBinding.inflate(layoutInflater)
+    private fun initializeCaptchaVerificationEvent() {
-
+        captchaVerificationEvent
-        val dialog = MaterialAlertDialogBuilder(this)
+            .debounce(1.seconds)
-            .setTitle(R.string.pref_ads_consent_title)
+            .onEach { url ->
-            .setMessage(R.string.pref_ads_consent_description)
+                Timber.d("Showing captcha dialog for: $url")
-            .setView(dialogAdsConsentBinding.root)
+                showDialogFragment(CaptchaDialog.newInstance(url))
-            .show()
+            }
-
+            .launchIn(lifecycleScope)
-        dialogAdsConsentBinding.adsConsentOver.setOnCheckedChangeListener { _, isChecked ->
-            dialogAdsConsentBinding.adsConsentPersonalised.isEnabled = isChecked
-        }
-
-        dialogAdsConsentBinding.adsConsentPersonalised.setOnClickListener {
-            presenter.onPrivacyAgree(true)
-            dialog.dismiss()
-        }
-
-        dialogAdsConsentBinding.adsConsentNonPersonalised.setOnClickListener {
-            presenter.onPrivacyAgree(false)
-            dialog.dismiss()
-        }
-
-        dialogAdsConsentBinding.adsConsentPrivacy.setOnClickListener { presenter.onPrivacySelected() }
-        dialogAdsConsentBinding.adsConsentCancel.setOnClickListener { dialog.cancel() }
     }
 
-    override fun openPrivacyPolicy() {
+    override fun onCaptchaVerificationRequired(url: String?) {
-        openInternetBrowser(
+        lifecycleScope.launch {
-            "https://wulkanowy.github.io/polityka-prywatnosci.html",
+            captchaVerificationEvent.emit(url)
-            ::showMessage
+        }
-        )
+    }
+
+    override fun showAuthDialog() {
+        showDialogFragment(AuthDialog.newInstance())
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

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

@@ -19,7 +19,6 @@ import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
 import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import timber.log.Timber
 import java.time.Duration
@@ -52,6 +51,7 @@ class MainPresenter @Inject constructor(
             destinationType in rootDestinationTypeList -> {
                 rootDestinationTypeList.indexOf(destinationType)
             }
+
             else -> 4
         }
 
@@ -110,6 +110,7 @@ class MainPresenter @Inject constructor(
         is AccountView,
         is StudentInfoView,
         is AccountDetailsView -> false
+
         else -> true
     }
 
@@ -148,20 +149,8 @@ class MainPresenter @Inject constructor(
     }
 
     fun onEnableAdsSelected() {
-        view?.showPrivacyPolicyDialog()
-    }
-
-    fun onPrivacyAgree(isPersonalizedAds: Boolean) {
-        preferencesRepository.isAgreeToProcessData = true
-        preferencesRepository.isPersonalizedAdsEnabled = isPersonalizedAds
-
-        adsHelper.initialize()
-
         preferencesRepository.isAdsEnabled = true
-    }
+        adsHelper.initialize()
-
-    fun onPrivacySelected() {
-        view?.openPrivacyPolicy()
     }
 
     private fun checkInAppReview() {
@@ -189,8 +178,8 @@ class MainPresenter @Inject constructor(
                     .getOrElse { return@launch }
 
                 if (Instant.now().minus(Duration.ofDays(28)).isAfter(student.registrationDate)) {
-                    view?.showAppSupport()
                     preferencesRepository.isAppSupportShown = true
+                    view?.showAppSupport()
                 }
             }
         }

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

@@ -46,10 +46,6 @@ interface MainView : BaseView {
 
     fun showAppSupport()
 
-    fun showPrivacyPolicyDialog()
-
-    fun openPrivacyPolicy()
-
     fun openMoreDestination(destination: Destination)
 
     interface MainChildView {

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.modules.settings
 import android.os.Bundle
 import androidx.preference.PreferenceFragmentCompat
 import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import timber.log.Timber
 
@@ -24,7 +25,11 @@ class SettingsFragment : PreferenceFragmentCompat(), MainView.TitledView, Settin
 
     override fun showMessage(text: String) {}
 
-    override fun showExpiredDialog() {}
+    override fun showExpiredCredentialsDialog() {}
+
+    override fun onCaptchaVerificationRequired(url: String?) = Unit
+
+    override fun showDecryptionFailedDialog() {}
 
     override fun openClearLoginView() {}
 

app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt

@@ -8,7 +8,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
-import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
@@ -47,8 +46,16 @@ class AdvancedFragment : PreferenceFragmentCompat(),
         (activity as? BaseActivity<*, *>)?.showMessage(text)
     }
 
-    override fun showExpiredDialog() {
+    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
+    }
+
+    override fun showDecryptionFailedDialog() {
+        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
 
     override fun showChangePasswordSnackbar(redirectUrl: String) {
@@ -64,7 +71,7 @@ class AdvancedFragment : PreferenceFragmentCompat(),
     }
 
     override fun showAuthDialog() {
-        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+        (activity as? BaseActivity<*, *>)?.showAuthDialog()
     }
 
     override fun onResume() {

app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt

@@ -9,7 +9,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
-import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
@@ -63,8 +62,16 @@ class AppearanceFragment : PreferenceFragmentCompat(),
         (activity as? BaseActivity<*, *>)?.showMessage(text)
     }
 
-    override fun showExpiredDialog() {
+    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
+    }
+
+    override fun showDecryptionFailedDialog() {
+        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
 
     override fun showChangePasswordSnackbar(redirectUrl: String) {
@@ -80,7 +87,7 @@ class AppearanceFragment : PreferenceFragmentCompat(),
     }
 
     override fun showAuthDialog() {
-        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+        (activity as? BaseActivity<*, *>)?.showAuthDialog()
     }
 
     override fun onResume() {

app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt

@@ -21,7 +21,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
-import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openInternetBrowser
@@ -133,8 +132,16 @@ class NotificationsFragment : PreferenceFragmentCompat(),
         (activity as? BaseActivity<*, *>)?.showMessage(text)
     }
 
-    override fun showExpiredDialog() {
+    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
+    }
+
+    override fun showDecryptionFailedDialog() {
+        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
 
     override fun showChangePasswordSnackbar(redirectUrl: String) {
@@ -150,7 +157,7 @@ class NotificationsFragment : PreferenceFragmentCompat(),
     }
 
     override fun showAuthDialog() {
-        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+        (activity as? BaseActivity<*, *>)?.showAuthDialog()
     }
 
     override fun showFixSyncDialog() {

app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt

@@ -10,7 +10,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
-import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import javax.inject.Inject
 
@@ -84,8 +83,16 @@ class SyncFragment : PreferenceFragmentCompat(),
             }
     }
 
-    override fun showExpiredDialog() {
+    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
+    }
+
+    override fun showDecryptionFailedDialog() {
+        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
 
     override fun showChangePasswordSnackbar(redirectUrl: String) {
@@ -101,7 +108,7 @@ class SyncFragment : PreferenceFragmentCompat(),
     }
 
     override fun showAuthDialog() {
-        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+        (activity as? BaseActivity<*, *>)?.showAuthDialog()
     }
 
     override fun onResume() {

app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt

@@ -3,6 +3,7 @@ package io.github.wulkanowy.utils
 import android.content.res.Resources
 import io.github.wulkanowy.R
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.scrapper.exception.CloudflareVerificationException
 import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.scrapper.exception.ScrapperException
 import io.github.wulkanowy.sdk.scrapper.exception.ServiceUnavailableException
@@ -34,6 +35,7 @@ fun Resources.getErrorString(error: Throwable): String = when (error) {
     is FeatureNotAvailableException -> R.string.error_feature_not_available
     is VulcanException -> R.string.error_unknown_uonet
     is ScrapperException -> R.string.error_unknown_app
+    is CloudflareVerificationException -> R.string.error_cloudflare_captcha
     is SSLHandshakeException -> when {
         error.isCausedByCertificateNotValidNow() -> R.string.error_invalid_device_datetime
         else -> R.string.error_timeout

app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt

@@ -1,5 +1,6 @@
 package io.github.wulkanowy.utils
 
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import timber.log.Timber
@@ -11,6 +12,7 @@ fun Sdk.init(student: Student): Sdk {
     schoolSymbol = student.schoolSymbol
     studentId = student.studentId
     classId = student.classId
+    emptyCookieJarInterceptor = true
 
     if (Sdk.Mode.valueOf(student.loginMode) == Sdk.Mode.HEBE) {
         mobileBaseUrl = student.mobileBaseUrl
@@ -29,3 +31,12 @@ fun Sdk.init(student: Student): Sdk {
 
     return this
 }
+
+fun Sdk.switchSemester(semester: Semester): Sdk {
+    return switchDiary(
+        diaryId = semester.diaryId,
+        kindergartenDiaryId = semester.kindergartenDiaryId,
+        schoolYear = semester.schoolYear,
+        unitId = semester.unitId,
+    )
+}

app/src/main/java/io/github/wulkanowy/utils/WebkitCookieManagerProxy.kt

@@ -0,0 +1,58 @@
+package io.github.wulkanowy.utils
+
+import java.net.CookiePolicy
+import java.net.CookieStore
+import java.net.HttpCookie
+import java.net.URI
+import android.webkit.CookieManager as WebkitCookieManager
+import java.net.CookieManager as JavaCookieManager
+
+class WebkitCookieManagerProxy : JavaCookieManager(null, CookiePolicy.ACCEPT_ALL) {
+
+    private val webkitCookieManager: WebkitCookieManager = WebkitCookieManager.getInstance()
+
+    override fun put(uri: URI?, responseHeaders: Map<String?, List<String?>>?) {
+        if (uri == null || responseHeaders == null) return
+        val url = uri.toString()
+        for (headerKey in responseHeaders.keys) {
+            if (headerKey == null || !(
+                    headerKey.equals("Set-Cookie2", ignoreCase = true) ||
+                        headerKey.equals("Set-Cookie", ignoreCase = true)
+                    )
+            ) continue
+
+            // process each of the headers
+            for (headerValue in responseHeaders[headerKey].orEmpty()) {
+                webkitCookieManager.setCookie(url, headerValue)
+            }
+        }
+    }
+
+    override operator fun get(
+        uri: URI?,
+        requestHeaders: Map<String?, List<String?>?>?
+    ): Map<String, List<String>> {
+        require(!(uri == null || requestHeaders == null)) { "Argument is null" }
+        val res = mutableMapOf<String, List<String>>()
+        val cookie = webkitCookieManager.getCookie(uri.toString())
+        if (cookie != null) res["Cookie"] = listOf(cookie)
+        return res
+    }
+
+    override fun getCookieStore(): CookieStore {
+        val cookies = super.getCookieStore()
+        return object : CookieStore {
+            override fun add(uri: URI?, cookie: HttpCookie?) = cookies.add(uri, cookie)
+            override fun get(uri: URI?): List<HttpCookie> = cookies.get(uri)
+            override fun getCookies(): List<HttpCookie> = cookies.cookies
+            override fun getURIs(): List<URI> = cookies.urIs
+            override fun remove(uri: URI?, cookie: HttpCookie?): Boolean =
+                cookies.remove(uri, cookie)
+
+            override fun removeAll(): Boolean {
+                webkitCookieManager.removeAllCookies(null)
+                return true
+            }
+        }
+    }
+}

app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt

@@ -16,6 +16,7 @@ import android.util.Base64.DEFAULT
 import android.util.Base64.decode
 import android.util.Base64.encode
 import android.util.Base64.encodeToString
+import dagger.hilt.android.qualifiers.ApplicationContext
 import timber.log.Timber
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
@@ -33,108 +34,124 @@ import javax.crypto.CipherInputStream
 import javax.crypto.CipherOutputStream
 import javax.crypto.spec.OAEPParameterSpec
 import javax.crypto.spec.PSource.PSpecified
+import javax.inject.Inject
+import javax.inject.Singleton
 import javax.security.auth.x500.X500Principal
 
-private const val KEYSTORE_NAME = "AndroidKeyStore"
+@Singleton
+class Scrambler @Inject constructor(
+    @ApplicationContext private val context: Context,
+) {
+    private val keyCharset = Charset.forName("UTF-8")
 
-private const val KEY_ALIAS = "wulkanowy_password"
+    private val isKeyPairExists: Boolean
+        get() = keyStore.getKey(KEY_ALIAS, null) != null
 
-private val KEY_CHARSET = Charset.forName("UTF-8")
+    private val keyStore: KeyStore
+        get() = KeyStore.getInstance(KEYSTORE_NAME).apply { load(null) }
 
-private val isKeyPairExists: Boolean
+    private val cipher: Cipher
-    get() = keyStore.getKey(KEY_ALIAS, null) != null
+        get() {
+            return if (SDK_INT >= M) Cipher.getInstance(
+                "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
+                "AndroidKeyStoreBCWorkaround"
+            )
+            else Cipher.getInstance("RSA/ECB/PKCS1Padding", "AndroidOpenSSL")
+        }
 
-private val keyStore: KeyStore
+    fun encrypt(plainText: String): String {
-    get() = KeyStore.getInstance(KEYSTORE_NAME).apply { load(null) }
+        if (plainText.isEmpty()) throw ScramblerException("Text to be encrypted is empty")
 
-private val cipher: Cipher
+        return try {
-    get() {
+            if (!isKeyPairExists) generateKeyPair()
-        return if (SDK_INT >= M) Cipher.getInstance(
+
-            "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
+            cipher.let {
-            "AndroidKeyStoreBCWorkaround"
+                if (SDK_INT >= M) {
-        )
+                    OAEPParameterSpec("SHA-256", "MGF1", SHA1, PSpecified.DEFAULT).let { spec ->
-        else Cipher.getInstance("RSA/ECB/PKCS1Padding", "AndroidOpenSSL")
+                        it.init(ENCRYPT_MODE, keyStore.getCertificate(KEY_ALIAS).publicKey, spec)
+                    }
+                } else it.init(ENCRYPT_MODE, keyStore.getCertificate(KEY_ALIAS).publicKey)
+
+                ByteArrayOutputStream().let { output ->
+                    CipherOutputStream(output, it).apply {
+                        write(plainText.toByteArray(keyCharset))
+                        close()
+                    }
+                    encodeToString(output.toByteArray(), DEFAULT)
+                }
+            }
+        } catch (exception: Exception) {
+            Timber.e(exception, "An error occurred while encrypting text")
+            String(encode(plainText.toByteArray(keyCharset), DEFAULT), keyCharset)
+        }
     }
 
-fun encrypt(plainText: String, context: Context): String {
+    fun decrypt(cipherText: String): String {
-    if (plainText.isEmpty()) throw ScramblerException("Text to be encrypted is empty")
+        if (cipherText.isEmpty()) throw ScramblerException("Text to be encrypted is empty")
 
-    return try {
+        return try {
-        if (!isKeyPairExists) generateKeyPair(context)
+            if (!isKeyPairExists) throw ScramblerException("KeyPair doesn't exist")
 
-        cipher.let {
+            cipher.let {
-            if (SDK_INT >= M) {
+                if (SDK_INT >= M) {
-                OAEPParameterSpec("SHA-256", "MGF1", SHA1, PSpecified.DEFAULT).let { spec ->
+                    OAEPParameterSpec("SHA-256", "MGF1", SHA1, PSpecified.DEFAULT).let { spec ->
-                    it.init(ENCRYPT_MODE, keyStore.getCertificate(KEY_ALIAS).publicKey, spec)
+                        it.init(DECRYPT_MODE, keyStore.getKey(KEY_ALIAS, null), spec)
+                    }
+                } else it.init(DECRYPT_MODE, keyStore.getKey(KEY_ALIAS, null))
+
+                CipherInputStream(
+                    ByteArrayInputStream(decode(cipherText, DEFAULT)),
+                    it
+                ).let { input ->
+                    val values = ArrayList<Byte>()
+                    var nextByte: Int
+                    while (run { nextByte = input.read(); nextByte } != -1) {
+                        values.add(nextByte.toByte())
+                    }
+                    val bytes = ByteArray(values.size)
+                    for (i in bytes.indices) {
+                        bytes[i] = values[i]
+                    }
+                    String(bytes, 0, bytes.size, keyCharset)
                 }
-            } else it.init(ENCRYPT_MODE, keyStore.getCertificate(KEY_ALIAS).publicKey)
+            }
+        } catch (e: Exception) {
+            throw ScramblerException("An error occurred while decrypting text", e)
+        }
+    }
 
-            ByteArrayOutputStream().let { output ->
+    private fun generateKeyPair() {
-                CipherOutputStream(output, it).apply {
+        (if (SDK_INT >= M) {
-                    write(plainText.toByteArray(KEY_CHARSET))
+            KeyGenParameterSpec.Builder(KEY_ALIAS, PURPOSE_DECRYPT or PURPOSE_ENCRYPT)
-                    close()
+                .setDigests(DIGEST_SHA256, DIGEST_SHA512)
-                }
+                .setEncryptionPaddings(ENCRYPTION_PADDING_RSA_OAEP)
-                encodeToString(output.toByteArray(), DEFAULT)
+                .setCertificateSerialNumber(BigInteger.TEN)
+                .setCertificateSubject(X500Principal("CN=Wulkanowy"))
+                .build()
+        } else {
+            KeyPairGeneratorSpec.Builder(context)
+                .setAlias(KEY_ALIAS)
+                .setSubject(X500Principal("CN=Wulkanowy"))
+                .setSerialNumber(BigInteger.TEN)
+                .setStartDate(Calendar.getInstance().time)
+                .setEndDate(Calendar.getInstance().apply { add(YEAR, 99) }.time)
+                .build()
+        }).let {
+            KeyPairGenerator.getInstance("RSA", KEYSTORE_NAME).apply {
+                initialize(it)
+                genKeyPair()
             }
         }
-    } catch (exception: Exception) {
+        Timber.i("A new KeyPair has been generated")
-        Timber.e(exception, "An error occurred while encrypting text")
+    }
-        String(encode(plainText.toByteArray(KEY_CHARSET), DEFAULT), KEY_CHARSET)
+
+    fun clearKeyPair() {
+        keyStore.deleteEntry(KEY_ALIAS)
+        Timber.i("KeyPair has been cleared")
+    }
+
+    private companion object {
+        private const val KEYSTORE_NAME = "AndroidKeyStore"
+        private const val KEY_ALIAS = "wulkanowy_password"
     }
 }
-
-fun decrypt(cipherText: String): String {
-    if (cipherText.isEmpty()) throw ScramblerException("Text to be encrypted is empty")
-
-    return try {
-        if (!isKeyPairExists) throw ScramblerException("KeyPair doesn't exist")
-
-        cipher.let {
-            if (SDK_INT >= M) {
-                OAEPParameterSpec("SHA-256", "MGF1", SHA1, PSpecified.DEFAULT).let { spec ->
-                    it.init(DECRYPT_MODE, keyStore.getKey(KEY_ALIAS, null), spec)
-                }
-            } else it.init(DECRYPT_MODE, keyStore.getKey(KEY_ALIAS, null))
-
-            CipherInputStream(ByteArrayInputStream(decode(cipherText, DEFAULT)), it).let { input ->
-                val values = ArrayList<Byte>()
-                var nextByte: Int
-                while (run { nextByte = input.read(); nextByte } != -1) {
-                    values.add(nextByte.toByte())
-                }
-                val bytes = ByteArray(values.size)
-                for (i in bytes.indices) {
-                    bytes[i] = values[i]
-                }
-                String(bytes, 0, bytes.size, KEY_CHARSET)
-            }
-        }
-    } catch (e: Exception) {
-        throw ScramblerException("An error occurred while decrypting text", e)
-    }
-}
-
-private fun generateKeyPair(context: Context) {
-    (if (SDK_INT >= M) {
-        KeyGenParameterSpec.Builder(KEY_ALIAS, PURPOSE_DECRYPT or PURPOSE_ENCRYPT)
-            .setDigests(DIGEST_SHA256, DIGEST_SHA512)
-            .setEncryptionPaddings(ENCRYPTION_PADDING_RSA_OAEP)
-            .setCertificateSerialNumber(BigInteger.TEN)
-            .setCertificateSubject(X500Principal("CN=Wulkanowy"))
-            .build()
-    } else {
-        KeyPairGeneratorSpec.Builder(context)
-            .setAlias(KEY_ALIAS)
-            .setSubject(X500Principal("CN=Wulkanowy"))
-            .setSerialNumber(BigInteger.TEN)
-            .setStartDate(Calendar.getInstance().time)
-            .setEndDate(Calendar.getInstance().apply { add(YEAR, 99) }.time)
-            .build()
-    }).let {
-        KeyPairGenerator.getInstance("RSA", KEYSTORE_NAME).apply {
-            initialize(it)
-            genKeyPair()
-        }
-    }
-    Timber.i("A new KeyPair has been generated")
-}

app/src/main/play/release-notes/pl-PL/default.txt

@@ -1,5 +1,6 @@
-Wersja 2.2.7
+Wersja 2.3.5
 
-— naprawiliśmy logowanie do aplikacji i odświeżanie danych na odmianie standardowej i podobnych
+— naprawiliśmy ładowanie frekwencji dla szkół używających eduOne
+— naprawiliśmy wielokrotne wysyłanie powiadomień o zmianach w planie lekcji
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

app/src/main/res/drawable/ic_close.xml

@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>

app/src/main/res/layout/dialog_ads_consent.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/ads_consent_privacy"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="24dp"
-        android:layout_marginHorizontal="24dp"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        android:padding="0dp"
-        android:text="@string/pref_ads_privacy_policy"
-        android:textAllCaps="false"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/ads_consent_over"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="17dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/pref_ads_over_18_years_old"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="14sp"
-        app:layout_constraintTop_toBottomOf="@id/ads_consent_privacy" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/ads_consent_personalised"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="24dp"
-        android:enabled="false"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        android:text="@string/pref_ads_option_personalized"
-        app:layout_constraintTop_toBottomOf="@id/ads_consent_over" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/ads_consent_non_personalised"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="24dp"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        android:text="@string/pref_ads_option_non_personalized"
-        app:layout_constraintBottom_toTopOf="@id/ads_consent_cancel"
-        app:layout_constraintTop_toBottomOf="@id/ads_consent_personalised"
-        app:layout_constraintVertical_bias="0" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/ads_consent_cancel"
-        style="@style/Widget.Material3.Button.OutlinedButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="24dp"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        android:text="@android:string/cancel"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintVertical_bias="0" />
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/dialog_captcha.xml

@@ -0,0 +1,51 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minWidth="350dp"
+    tools:context=".ui.modules.captcha.CaptchaDialog">
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="20dp"
+        android:gravity="center_vertical"
+        android:text="@string/captcha_dialog_title"
+        app:layout_constraintBottom_toBottomOf="@id/captcha_close"
+        app:layout_constraintEnd_toStartOf="@id/captcha_refresh"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/captcha_refresh"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:contentDescription="@string/logviewer_refresh"
+        app:icon="@drawable/ic_refresh"
+        app:iconTint="?colorOnSurface"
+        app:layout_constraintEnd_toStartOf="@id/captcha_close"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/captcha_close"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:contentDescription="@string/all_close"
+        app:icon="@drawable/ic_all_close_circle"
+        app:iconTint="?colorOnSurface"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <WebView
+        android:id="@+id/captcha_webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/captcha_close" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_dashboard.xml

@@ -18,7 +18,8 @@
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/dashboard_swipe"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:visibility="gone">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/dashboard_recycler"
@@ -30,19 +31,33 @@
             tools:listitem="@layout/item_dashboard_grades" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/dashboard_error_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
         android:visibility="gone"
         tools:ignore="UseCompoundDrawables"
         tools:visibility="visible">
 
+        <include
+            android:id="@+id/dashboard_error_admin_message"
+            layout="@layout/item_dashboard_admin_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed" />
+
         <ImageView
+            android:id="@+id/dashboard_error_image"
             android:layout_width="100dp"
             android:layout_height="100dp"
+            app:layout_constraintBottom_toTopOf="@id/dashboard_error_message"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_error_admin_message"
+            app:layout_constraintVertical_chainStyle="packed"
             app:srcCompat="@drawable/ic_error"
             app:tint="?colorOnBackground"
             tools:ignore="contentDescription" />
@@ -55,14 +70,21 @@
             android:gravity="center"
             android:padding="8dp"
             android:text="@string/error_unknown"
-            android:textSize="20sp" />
+            android:textSize="20sp"
+            app:layout_constraintBottom_toTopOf="@id/dashboard_error_buttons"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_error_image" />
 
         <LinearLayout
+            android:id="@+id/dashboard_error_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_error_message">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/dashboard_error_details"
@@ -79,5 +101,5 @@
                 android:layout_height="wrap_content"
                 android:text="@string/all_retry" />
         </LinearLayout>
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_dashboard_admin_message.xml

@@ -34,11 +34,24 @@
             android:layout_marginEnd="16dp"
             android:textSize="18sp"
             android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/dashboard_admin_message_item_close"
             app:layout_constraintStart_toEndOf="@id/dashboard_admin_message_item_icon"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="@tools:sample/lorem" />
 
+        <ImageView
+            android:id="@+id/dashboard_admin_message_item_close"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="4dp"
+            android:padding="12dp"
+            android:background="?selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_close"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="ContentDescription" />
+
         <TextView
             android:id="@+id/dashboard_admin_message_item_description"
             android:layout_width="0dp"

app/src/main/res/values-cs/strings.xml

@@ -13,6 +13,7 @@
     <string name="logviewer_title">Prohlížeč protokolů</string>
     <string name="debug_title">Ladění</string>
     <string name="notification_debug_title">Ladění oznámení</string>
+    <string name="debug_cookies_clear">Vymazat soubory cookie webview</string>
     <string name="contributors_title">Tvůrci</string>
     <string name="license_title">Licence</string>
     <string name="message_title">Zprávy</string>
@@ -96,6 +97,8 @@
     <string name="main_log_in">Přihlásit se</string>
     <string name="main_session_expired">Relace vypršela</string>
     <string name="main_session_relogin">Relace vypršela. Přihlaste se prosím znovu</string>
+    <string name="main_expired_credentials_description">Heslo k vašemu účtu bylo změněno. Musíte se znovu přihlásit do Wulkanového</string>
+    <string name="main_expired_credentials_title">Heslo bylo změněno</string>
     <string name="main_support_title">Podpora aplikace</string>
     <string name="main_support_description">Líbí se Vám tato aplikace? Podpořte její vývoj tím, že povolíte neinvazivní reklamy, které můžete kdykoliv vypnout</string>
     <string name="main_support_positive">Zapnout reklamy</string>
@@ -760,7 +763,7 @@
     <string name="pref_ads_support_category_name">Podpora</string>
     <string name="pref_ads_privacy_policy">Ochrana osobních údajů</string>
     <string name="pref_ads_agreements">Souhlasy</string>
-    <string name="pref_ads_consent">Souhlas se zpracováním údajů souvisejících s reklamami</string>
+    <string name="pref_ads_consent">Zobrazit souhlas se zpracováním údajů</string>
     <string name="pref_ads_show_in_app">Zobrazit reklamy v aplikaci</string>
     <string name="pref_ads_support">Podívejte se na jednu reklamu pro podporu projektu</string>
     <string name="pref_ads_privacy_title">Souhlas se zpracováním dat</string>
@@ -769,13 +772,6 @@
     <string name="pref_ads_privacy_link">Ochrana osobních údajů</string>
     <string name="pref_ads_loading">Reklama se načítá</string>
     <string name="pref_ads_once_per_visit">Děkujeme za vaši podporu, vraťte se později pro více reklam</string>
-    <string name="pref_ads_consent_title">Můžeme použít Vaše data k zobrazení reklam?</string>
-    <string name="pref_ads_consent_description">Volbu můžete kdykoliv změnit v nastavení aplikace. Můžeme použít Vaše data k zobrazení reklam šitých pro vás nebo pomocí méně vašich dat zobrazovat nepřizpůsobené reklamy. Podrobnosti naleznete v našich Zásadách ochrany osobních údajů</string>
-    <string name="pref_ads_summary_personalized">Přizpůsobené reklamy</string>
-    <string name="pref_ads_summary_non_personalized">Nepřizpůsobené reklamy</string>
-    <string name="pref_ads_over_18_years_old">Je mi více než 18 let</string>
-    <string name="pref_ads_option_personalized">Ano, přizpůsobené reklamy</string>
-    <string name="pref_ads_option_non_personalized">Ano, nepřizpůsobené reklamy</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhled a chování</string>
     <string name="pref_settings_notifications_title">Oznámení</string>
@@ -838,6 +834,9 @@
     <string name="auth_title">Autorizace</string>
     <string name="auth_description">Pro provoz aplikace potřebujeme potvrdit vaši identitu. Zadejte PESEL žáka &lt;b&gt;%1$s&lt;/b&gt; v níže uvedeném poli</string>
     <string name="auth_button_skip">Zatím přeskočit</string>
+    <!--Captcha-->
+    <string name="captcha_dialog_title">Probíhá ověřování. Počkejte…</string>
+    <string name="captcha_verified_message">Úspěšně ověřeno</string>
     <!--Errors-->
     <string name="error_no_internet">Žádné internetové připojení</string>
     <string name="error_invalid_device_datetime">Vyskytla se chyba. Zkontrolujte hodiny svého zařízení</string>
@@ -847,6 +846,7 @@
     <string name="error_service_unavailable">Probíhá údržba deníku UONET+. Zkuste to později znovu</string>
     <string name="error_unknown_uonet">Neznámá chyba deniku UONET+. Prosím zkuste to znovu později</string>
     <string name="error_unknown_app">Neznámá chyba aplikace. Prosím zkuste to znovu později</string>
+    <string name="error_cloudflare_captcha">Vyžadováno ověření Captcha</string>
     <string name="error_unknown">Vyskytla se neočekávaná chyba</string>
     <string name="error_feature_disabled">Funkce je deaktivována přes vaší školou</string>
     <string name="error_feature_not_available">Funkce není k dispozici. Přihlaste se v jiném režimu než Mobile API</string>

app/src/main/res/values-da-rDK/strings.xml

@@ -1,764 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Login</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Grades</string>
-    <string name="attendance_title">Attendance</string>
-    <string name="exam_title">Exams</string>
-    <string name="timetable_title">Timetable</string>
-    <string name="settings_title">Settings</string>
-    <string name="more_title">More</string>
-    <string name="about_title">About</string>
-    <string name="logviewer_title">Log viewer</string>
-    <string name="debug_title">Debug</string>
-    <string name="notification_debug_title">Notification debug</string>
-    <string name="contributors_title">Contributors</string>
-    <string name="license_title">Licenses</string>
-    <string name="message_title">Messages</string>
-    <string name="send_message_title">New message</string>
-    <string name="add_homework_title">New homework</string>
-    <string name="note_title">Notes and achievements</string>
-    <string name="homework_title">Homework</string>
-    <string name="account_title">Accounts manager</string>
-    <string name="account_quick_title">Select account</string>
-    <string name="account_details_title">Account details</string>
-    <string name="student_info_title">Student info</string>
-    <string name="dashboard_title">Dashboard</string>
-    <string name="notifications_center_title">Notifications center</string>
-    <string name="menu_order_title">Menu configuartion</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
-    <!--Login-->
-    <string name="login_header_default">Sign in with the student or parent account</string>
-    <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</string>
-    <string name="login_nickname_hint">Username</string>
-    <string name="login_email_hint">Email</string>
-    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
-    <string name="login_password_hint">Password</string>
-    <string name="login_host_hint">UONET+ register variant</string>
-    <string name="login_domain_suffix_hint">Custom domain suffix</string>
-    <string name="login_type_api">Mobile API</string>
-    <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hybrid</string>
-    <string name="login_token_hint">Token</string>
-    <string name="login_pin_hint">PIN</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
-    <string name="login_sign_in">Sign in</string>
-    <string name="login_invalid_password">Password too short</string>
-    <string name="login_incorrect_password_default">Login details are incorrect</string>
-    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</string>
-    <string name="login_invalid_pin">Invalid PIN</string>
-    <string name="login_invalid_token">Invalid token</string>
-    <string name="login_expired_token">Token expired</string>
-    <string name="login_invalid_email">Invalid email</string>
-    <string name="login_invalid_login">Use the assigned login instead of email</string>
-    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
-    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
-    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
-    <string name="login_duplicate_student">Selected student is already logged in</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
-    <string name="login_select_student">Select students to log in to the application</string>
-    <string name="login_advanced">Other options</string>
-    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
-    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
-    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</string>
-    <string name="login_privacy_policy">Privacy policy</string>
-    <string name="login_contact_header">Trouble signing in? Contact us!</string>
-    <string name="login_contact_email">Email</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Send email</string>
-    <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">Reset password</string>
-    <string name="login_recover_title">Recover your account</string>
-    <string name="login_recover">Recover</string>
-    <string name="login_signed_in">Student is already signed in</string>
-    <string name="login_host_standard">Standard</string>
-    <string name="login_other_search_locations">Other search locations</string>
-    <string name="login_no_active_student">No active students found</string>
-    <string name="login_symbol_enter">Enter a different symbol</string>
-    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name with the town (required)</string>
-    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
-    <string name="login_support_school_invalid">Enter correct name of the school</string>
-    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
-    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
-    <string name="login_support_submit">Submit</string>
-    <!--Notifications-->
-    <string name="notifications_header_title">Enable notifications</string>
-    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
-    <string name="notifications_skip">Skip</string>
-    <string name="notifications_enable">Enable</string>
-    <!--Main-->
-    <string name="main_account_picker">Account manager</string>
-    <string name="main_log_in">Log in</string>
-    <string name="main_session_expired">Session expired</string>
-    <string name="main_session_relogin">Session expired, log in again</string>
-    <string name="main_support_title">Application support</string>
-    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
-    <string name="main_support_positive">Enable ads</string>
-    <!--Grade-->
-    <string name="grade_header">Grade</string>
-    <string name="grade_semester">Semester %d</string>
-    <string name="grade_switch_semester">Change semester</string>
-    <string name="grade_no_items">No grades</string>
-    <string name="grade_weight">Weight</string>
-    <string name="grade_weight_value">Weight: %s</string>
-    <string name="grade_comment">Comment</string>
-    <string name="grade_number_new_items">Number of new ratings: %1$d</string>
-    <string name="grade_average">Average: %1$.2f</string>
-    <string name="grade_points_sum">Points: %s</string>
-    <string name="grade_no_average">No average</string>
-    <string name="grade_summary_points">Total points</string>
-    <string name="grade_summary_final_grade">Final grade</string>
-    <string name="grade_summary_predicted_grade">Predicted grade</string>
-    <string name="grade_summary_calculated_average">Calculated average</string>
-    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
-    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
-    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
-    <string name="grade_summary_final_average">Final average</string>
-    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
-    <string name="grade_menu_summary">Summary</string>
-    <string name="grade_menu_statistics">Class</string>
-    <string name="grade_menu_read">Mark as read</string>
-    <string name="grade_statistics_partial">Partial</string>
-    <string name="grade_statistics_semester">Semester</string>
-    <string name="grade_statistics_points">Points</string>
-    <string name="grade_statistics_legend">Legend</string>
-    <string name="grade_statistics_class_average">Class average: %1$s</string>
-    <string name="grade_statistics_student_average">Your average: %1$s</string>
-    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
-    <string name="grade_statistics_average_class">Class</string>
-    <string name="grade_statistics_average_student">Student</string>
-    <plurals name="grade_number_item">
-        <item quantity="one">%d grade</item>
-        <item quantity="other">%d grades</item>
-    </plurals>
-    <plurals name="grade_new_items">
-        <item quantity="one">New grade</item>
-        <item quantity="other">New grades</item>
-    </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
-        <item quantity="other">New predicted grades</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
-        <item quantity="other">New final grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items">
-        <item quantity="one">You received %1$d grade</item>
-        <item quantity="other">You received %1$d grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">You received %1$d predicted grade</item>
-        <item quantity="other">You received %1$d predicted grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">You received %1$d final grade</item>
-        <item quantity="other">You received %1$d final grades</item>
-    </plurals>
-    <!--Timetable-->
-    <string name="timetable_lesson">Lesson</string>
-    <string name="timetable_room">Room</string>
-    <string name="timetable_group">Group</string>
-    <string name="timetable_time">Hours</string>
-    <string name="timetable_changes">Changes</string>
-    <string name="timetable_no_items">No lessons this day</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sec</string>
-    <string name="timetable_time_left">%1$s left</string>
-    <string name="timetable_time_until">in %1$s</string>
-    <string name="timetable_finished">Finished</string>
-    <string name="timetable_now">Now: %s</string>
-    <string name="timetable_next">Next: %s</string>
-    <string name="timetable_later">Later: %s</string>
-    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
-    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
-    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
-    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
-    <plurals name="timetable_no_lesson">
-        <item quantity="one">No lesson</item>
-        <item quantity="other">No lessons</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items_title">
-        <item quantity="one">Timetable change</item>
-        <item quantity="other">Timetable changes</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items">
-        <item quantity="one">%1$s - %2$d change in timetable</item>
-        <item quantity="other">%1$s - %2$d  changes in timetable</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items_group">
-        <item quantity="one">%1$d change in timetable</item>
-        <item quantity="other">%1$d changes in timetable</item>
-    </plurals>
-    <plurals name="timetable_number_item">
-        <item quantity="one">%d change</item>
-        <item quantity="other">%d changes</item>
-    </plurals>
-    <!--Completed lessons-->
-    <string name="completed_lessons_title">Completed lessons</string>
-    <string name="completed_lessons_button">Show completed lessons</string>
-    <string name="completed_lessons_no_items">No info about completed lessons</string>
-    <string name="completed_lessons_topic">Topic</string>
-    <string name="completed_lessons_absence">Absence</string>
-    <string name="completed_lessons_resources">Resources</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Additional lessons</string>
-    <string name="additional_lessons_button">Show additional lessons</string>
-    <string name="additional_lessons_no_items">No info about additional lessons</string>
-    <string name="additional_lessons_add">New lesson</string>
-    <string name="additional_lessons_add_title">New additional lesson</string>
-    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
-    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
-    <string name="additional_lessons_repeat">Repeat weekly</string>
-    <string name="additional_lessons_delete_title">Delete additional lesson</string>
-    <string name="additional_lessons_delete_one">Just this lesson</string>
-    <string name="additional_lessons_delete_series">All in the series</string>
-    <string name="additional_lessons_start">Start time</string>
-    <string name="additional_lessons_end">End time</string>
-    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
-    <!--Attendance-->
-    <string name="attendance_summary_button">Attendance summary</string>
-    <string name="attendance_absence_school">Absent for school reasons</string>
-    <string name="attendance_absence_excused">Excused absence</string>
-    <string name="attendance_absence_unexcused">Unexcused absence</string>
-    <string name="attendance_exemption">Exemption</string>
-    <string name="attendance_excused_lateness">Excused lateness</string>
-    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
-    <string name="attendance_present">Present</string>
-    <string name="attendance_deleted">Deleted</string>
-    <string name="attendance_unknown">Unknown</string>
-    <string name="attendance_number">Number of lesson</string>
-    <string name="attendance_no_items">No entries</string>
-    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
-    <string name="attendance_excuse_dialog_submit">Send</string>
-    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
-    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
-    <string name="attendance_excuse_title">Excuse</string>
-    <plurals name="attendance_notify_new_items_title">
-        <item quantity="one">New attendance</item>
-        <item quantity="other">New attendance</item>
-    </plurals>
-    <plurals name="attendance_notify_new_items">
-        <item quantity="one">%1$d new attendance</item>
-        <item quantity="other">%1$d attendance</item>
-    </plurals>
-    <plurals name="attendance_number_item">
-        <item quantity="one">%d attendance</item>
-        <item quantity="other">%d attendance</item>
-    </plurals>
-    <!--Attendance summary-->
-    <string name="attendance_summary_total">Total</string>
-    <!--Exam-->
-    <string name="exam_no_items">No exams this week</string>
-    <string name="exam_type">Type</string>
-    <string name="exam_entry_date">Entry date</string>
-    <plurals name="exam_notify_new_item_title">
-        <item quantity="one">New exam</item>
-        <item quantity="other">New exams</item>
-    </plurals>
-    <plurals name="exam_notify_new_item_content">
-        <item quantity="one">%d new exam</item>
-        <item quantity="other">%d new exams</item>
-    </plurals>
-    <plurals name="exam_number_item">
-        <item quantity="one">%d exam</item>
-        <item quantity="other">%d exams</item>
-    </plurals>
-    <!--Message-->
-    <string name="message_inbox">Inbox</string>
-    <string name="message_sent">Sent</string>
-    <string name="message_trash">Trash</string>
-    <string name="message_no_subject">(no subject)</string>
-    <string name="message_no_items">No messages</string>
-    <string name="message_from">From:</string>
-    <string name="message_to">To:</string>
-    <string name="message_date">Date: %1$s</string>
-    <string name="message_reply">Reply</string>
-    <string name="message_forward">Forward</string>
-    <string name="message_select_all">Select all</string>
-    <string name="message_unselect_all">Unselect all</string>
-    <string name="message_move_to_trash">Move to trash</string>
-    <string name="message_delete_forever">Delete permanently</string>
-    <string name="message_delete_success">Message deleted successfully</string>
-    <string name="message_mailbox_type_student">student</string>
-    <string name="message_mailbox_type_parent">parent</string>
-    <string name="message_mailbox_type_guardian">guardian</string>
-    <string name="message_mailbox_type_employee">employee</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
-    <string name="message_subject">Subject</string>
-    <string name="message_content">Content</string>
-    <string name="message_send_successful">Message sent successfully</string>
-    <string name="message_not_exists">Message does not exist</string>
-    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
-    <string name="message_content_min_length">The message content must be at least 3 characters</string>
-    <string name="message_chip_all_mailboxes">All mailboxes</string>
-    <string name="message_chip_only_unread">Only unread</string>
-    <string name="message_chip_only_with_attachments">Only with attachments</string>
-    <string name="message_read">Read: %s</string>
-    <string name="message_read_by">Read by: %1$d of %2$d people</string>
-    <plurals name="message_number_item">
-        <item quantity="one">%1$d message</item>
-        <item quantity="other">%1$d messages</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one">New message</item>
-        <item quantity="other">New messages</item>
-    </plurals>
-    <string name="message_restore_dialog">Do you want to restore draft message?</string>
-    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">You received %1$d message</item>
-        <item quantity="other">You received %1$d messages</item>
-    </plurals>
-    <plurals name="message_selected_messages_count">
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
-    <string name="message_messages_deleted">Messages deleted</string>
-    <string name="message_mailbox_chooser_title">Choose mailbox</string>
-    <string name="message_incognito_mode_on">Incognito mode is on</string>
-    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
-    <!--Note-->
-    <string name="note_no_items">No info about notes</string>
-    <string name="note_points">Points</string>
-    <plurals name="note_number_item">
-        <item quantity="one">%d note</item>
-        <item quantity="other">%d notes</item>
-    </plurals>
-    <plurals name="note_new_items">
-        <item quantity="one">New note</item>
-        <item quantity="other">New notes</item>
-    </plurals>
-    <plurals name="note_notify_new_items">
-        <item quantity="one">You received %1$d note</item>
-        <item quantity="other">You received %1$d notes</item>
-    </plurals>
-    <!--Praise-->
-    <plurals name="praise_number_item">
-        <item quantity="one">%d praise</item>
-        <item quantity="other">%d praises</item>
-    </plurals>
-    <plurals name="praise_new_items">
-        <item quantity="one">New praise</item>
-        <item quantity="other">New praises</item>
-    </plurals>
-    <plurals name="praise_notify_new_items">
-        <item quantity="one">You received %1$d praise</item>
-        <item quantity="other">You received %1$d praises</item>
-    </plurals>
-    <!--Neutral notes-->
-    <plurals name="neutral_note_number_item">
-        <item quantity="one">%d neutral note</item>
-        <item quantity="other">%d neutral notes</item>
-    </plurals>
-    <plurals name="neutral_note_new_items">
-        <item quantity="one">New neutral note</item>
-        <item quantity="other">New neutral notes</item>
-    </plurals>
-    <plurals name="neutral_note_notify_new_items">
-        <item quantity="one">You received %1$d neutral note</item>
-        <item quantity="other">You received %1$d neutral notes</item>
-    </plurals>
-    <!--Homework-->
-    <string name="homework_no_items">No info about homework</string>
-    <string name="homework_mark_as_done">Mark as done</string>
-    <string name="homework_mark_as_undone">Mark as undone</string>
-    <string name="homework_add">Add homework</string>
-    <string name="homework_add_success">Homework added successfully</string>
-    <string name="homework_delete_success">Homework deleted successfully</string>
-    <string name="homework_attachments">Attachments</string>
-    <plurals name="homework_notify_new_item_title">
-        <item quantity="one">New homework</item>
-        <item quantity="other">New homework</item>
-    </plurals>
-    <plurals name="homework_notify_new_item_content">
-        <item quantity="one">You received %d new homework</item>
-        <item quantity="other">You received %d new homework</item>
-    </plurals>
-    <plurals name="homework_number_item">
-        <item quantity="one">%d homework</item>
-        <item quantity="other">%d homework</item>
-    </plurals>
-    <!--Lucky number-->
-    <string name="lucky_number_title">Lucky number</string>
-    <string name="lucky_number_header">Today\'s lucky number is</string>
-    <string name="lucky_number_empty">No info about the lucky number</string>
-    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
-    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
-    <string name="lucky_number_history_button">Show history</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Lucky number history</string>
-    <string name="lucky_number_history_empty">No info about lucky numbers</string>
-    <!--Mobile devices-->
-    <string name="mobile_devices_title">Mobile devices</string>
-    <string name="mobile_devices_no_items">No devices</string>
-    <string name="mobile_devices_unregister">Deregister</string>
-    <string name="mobile_device_removed">Device removed</string>
-    <string name="mobile_device_qr">QR code</string>
-    <string name="mobile_device_token">Token</string>
-    <string name="mobile_device_symbol">Symbol</string>
-    <string name="mobile_device_pin">PIN</string>
-    <!--School and teachers-->
-    <string name="schoolandteachers_title">School and teachers</string>
-    <!--School-->
-    <string name="school_title">School</string>
-    <string name="school_no_info">No info about school</string>
-    <string name="school_name">School name</string>
-    <string name="school_address">School address</string>
-    <string name="school_telephone">Telephone</string>
-    <string name="school_headmaster">Name of headmaster</string>
-    <string name="school_pedagogue">Name of pedagogue</string>
-    <string name="school_address_button">Show on map</string>
-    <string name="school_telephone_button">Call</string>
-    <!--Teacher-->
-    <string name="teachers_title">Teachers</string>
-    <string name="teacher_no_items">No info about teachers</string>
-    <string name="teacher_no_subject">No subject</string>
-    <!--Conference-->
-    <string name="conferences_title">Conferences</string>
-    <string name="conference_no_items">No info about conferences</string>
-    <plurals name="conference_number_item">
-        <item quantity="one">%d conference</item>
-        <item quantity="other">%d conferences</item>
-    </plurals>
-    <plurals name="conference_notify_new_item_title">
-        <item quantity="one">New conference</item>
-        <item quantity="other">New conferences</item>
-    </plurals>
-    <plurals name="conference_notify_new_items">
-        <item quantity="one">You have %1$d new conference</item>
-        <item quantity="other">You have %1$d new conferences</item>
-    </plurals>
-    <string name="conferences_present">Present at conference</string>
-    <string name="conference_agenda">Agenda</string>
-    <string name="conference_place">Place</string>
-    <string name="conference_topic">Topic</string>
-    <!--Director information-->
-    <string name="school_announcement_title">School announcements</string>
-    <string name="school_announcement_no_items">No school announcements</string>
-    <plurals name="school_announcement_number_item">
-        <item quantity="one">%d school announcement</item>
-        <item quantity="other">%d school announcements</item>
-    </plurals>
-    <plurals name="school_announcement_notify_new_item_title">
-        <item quantity="one">New school announcement</item>
-        <item quantity="other">New school announcements</item>
-    </plurals>
-    <plurals name="school_announcement_notify_new_items">
-        <item quantity="one">You have %1$d new school announcement</item>
-        <item quantity="other">You have %1$d new school announcements</item>
-    </plurals>
-    <!--Account-->
-    <string name="account_add_new">Add account</string>
-    <string name="account_logout">Logout</string>
-    <string name="account_confirm">Do you want to log out this student?</string>
-    <string name="account_logout_student">Student logout</string>
-    <string name="account_type_student">Student account</string>
-    <string name="account_type_parent">Parent account</string>
-    <string name="account_details_edit">Edit data</string>
-    <string name="account_quick_manager">Accounts manager</string>
-    <string name="account_select_student">Select student</string>
-    <string name="account_family">Family</string>
-    <string name="account_contact">Contact</string>
-    <string name="account_address">Residence details</string>
-    <string name="account_personal_data">Personal information</string>
-    <!--About-->
-    <string name="about_version">App version</string>
-    <string name="about_contributor">Contributors</string>
-    <string name="about_contributor_summary">List of Wulkanowy developers</string>
-    <string name="about_feedback">Report a bug</string>
-    <string name="about_feedback_summary">Send a bug report via e-mail</string>
-    <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Read Frequently Asked Questions</string>
-    <string name="about_discord">Discord server</string>
-    <string name="about_discord_summary">Join the Wulkanowy community</string>
-    <string name="about_facebook">Facebook fanpage</string>
-    <string name="about_twitter">Twitter page</string>
-    <string name="about_twitter_summary">Follow us on twitter</string>
-    <string name="about_facebook_summary">Like our facebook fanpage</string>
-    <string name="about_privacy">Privacy policy</string>
-    <string name="about_privacy_summary">Rules for collecting personal data</string>
-    <string name="about_system">System settings</string>
-    <string name="about_system_summary">Open system settings</string>
-    <string name="about_homepage">Homepage</string>
-    <string name="about_homepage_summary">Visit the website and help develop the application</string>
-    <string name="about_licenses">Licenses</string>
-    <string name="about_licenses_summary">Licenses of libraries used in the application</string>
-    <!--Licenses-->
-    <string name="license_dialog_title">License</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Avatar</string>
-    <string name="contributor_see_more">See more on GitHub</string>
-    <!--Student info-->
-    <string name="student_info_empty">No info about student or student family</string>
-    <string name="student_info_first_name">Name</string>
-    <string name="student_info_second_name">Second name</string>
-    <string name="student_info_gender">Gender</string>
-    <string name="student_info_polish_citizenship">Polish citizenship</string>
-    <string name="student_info_family_name">Family name</string>
-    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
-    <string name="student_info_phone">Phone</string>
-    <string name="student_info_cellphone">Cellphone</string>
-    <string name="student_info_email">E-mail</string>
-    <string name="student_info_address">Address of residence</string>
-    <string name="student_info_registered_address">Address of registration</string>
-    <string name="student_info_correspondence_address">Correspondence address</string>
-    <string name="student_info_full_name">Surname and first name</string>
-    <string name="student_info_kinship">Degree of kinship</string>
-    <string name="student_info_guardian_address">Address</string>
-    <string name="student_info_phones">Phones</string>
-    <string name="student_info_male">Male</string>
-    <string name="student_info_female">Female</string>
-    <string name="student_info_last_name">Last name</string>
-    <string name="student_info_guardian">Guardian</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Nick</string>
-    <string name="account_edit_header">Add nick</string>
-    <string name="account_edit_avatar_title">Choose avatar color</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Share logs</string>
-    <string name="logviewer_refresh">Refresh</string>
-    <!--Dashboard-->
-    <string name="dashboard_timetable_title">Lessons</string>
-    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
-    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
-    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
-    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
-    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
-    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
-    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
-    <string name="dashboard_timetable_second_lessons_title">Next:</string>
-    <string name="dashboard_timetable_third_title">Later:</string>
-    <plurals name="dashboard_timetable_third_value">
-        <item quantity="one">%1$d more lesson</item>
-        <item quantity="other">%1$d more lessons</item>
-    </plurals>
-    <string name="dashboard_timetable_third_time">until %1$s</string>
-    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
-    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
-    <string name="dashboard_homework_title">Homework</string>
-    <string name="dashboard_homework_no_homework">No homework to do</string>
-    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
-    <plurals name="dashboard_homework_more">
-        <item quantity="one">%1$d more homework</item>
-        <item quantity="other">%1$d more homework</item>
-    </plurals>
-    <string name="dashboard_homework_time">due %1$s</string>
-    <string name="dashboard_grade_title">Last grades</string>
-    <string name="dashboard_grade_no_grade">No new grades</string>
-    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
-    <string name="dashboard_announcements_title">School announcements</string>
-    <string name="dashboard_announcements_no_announcements">No current announcements</string>
-    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
-    <plurals name="dashboard_announcements_more">
-        <item quantity="one">%1$d more announcement</item>
-        <item quantity="other">%1$d more announcements</item>
-    </plurals>
-    <string name="dashboard_exams_title">Exams</string>
-    <string name="dashboard_exams_no_exams">No upcoming exams</string>
-    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
-    <plurals name="dashboard_exams_more">
-        <item quantity="one">%1$d more exam</item>
-        <item quantity="other">%1$d more exams</item>
-    </plurals>
-    <string name="dashboard_conferences_title">Conferences</string>
-    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
-    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
-    <plurals name="dashboard_conference_more">
-        <item quantity="one">%1$d more conference</item>
-        <item quantity="other">%1$d more conferences</item>
-    </plurals>
-    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
-    <string name="dashboard_horizontal_group_no_data">None</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Check for updates</string>
-    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
-    <!--Generic-->
-    <string name="all_content">Content</string>
-    <string name="all_retry">Retry</string>
-    <string name="all_description">Description</string>
-    <string name="all_no_description">No description</string>
-    <string name="all_teacher">Teacher</string>
-    <string name="all_date">Date</string>
-    <string name="all_entry_date">Entry date</string>
-    <string name="all_color">Color</string>
-    <string name="all_details">Details</string>
-    <string name="all_category">Category</string>
-    <string name="all_close">Close</string>
-    <string name="all_no_data">No data</string>
-    <string name="all_subject">Subject</string>
-    <string name="all_prev">Prev</string>
-    <string name="all_next">Next</string>
-    <string name="all_search">Search</string>
-    <string name="all_search_hint">Search…</string>
-    <string name="all_yes">Yes</string>
-    <string name="all_no">No</string>
-    <string name="all_save">Save</string>
-    <string name="all_title">Title</string>
-    <string name="all_add">Add</string>
-    <string name="all_copied">Copied</string>
-    <string name="all_undo">Undo</string>
-    <string name="all_change">Change</string>
-    <string name="all_add_to_calendar">Add to calendar</string>
-    <string name="all_cancel">Cancel</string>
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">No lessons</string>
-    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
-    <string name="widget_timetable_theme_title">Choose theme</string>
-    <string name="widget_timetable_theme_light">Light</string>
-    <string name="widget_timetable_theme_dark">Dark</string>
-    <string name="widget_timetable_theme_system">System Theme</string>
-    <!--Preferences-->
-    <string name="pref_view_header">App</string>
-    <string name="pref_view_list">Default view</string>
-    <string name="pref_view_grade_average_mode">Calculated average options</string>
-    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
-    <string name="pref_view_present">Show presence</string>
-    <string name="pref_view_app_theme">Theme</string>
-    <string name="pref_view_expand_grade">Grades expanding</string>
-    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
-    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
-    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
-    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
-    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
-    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
-    <string name="pref_view_app_language">Language</string>
-    <string name="pref_view_menu_order_title">Menu configuration</string>
-    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
-    <string name="pref_notify_header">Notifications</string>
-    <string name="pref_notify_header_other">Other</string>
-    <string name="pref_notify_switch">Show notifications</string>
-    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
-    <string name="pref_notify_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
-    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
-    <string name="pref_notify_open_system_settings">Open system notification settings</string>
-    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
-    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
-    <string name="pref_notify_debug_switch">Show debug notifications</string>
-    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
-    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
-    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
-    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
-    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
-    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
-    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
-    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
-    <string name="pref_notification_go_to_settings">Go to settings</string>
-    <string name="pref_services_header">Synchronization</string>
-    <string name="pref_services_switch">Automatic update</string>
-    <string name="pref_services_suspended">Suspended on holidays</string>
-    <string name="pref_services_interval">Updates interval</string>
-    <string name="pref_services_wifi">Wi-Fi only</string>
-    <string name="pref_services_force_sync">Sync now</string>
-    <string name="pref_services_message_sync_success">Synced!</string>
-    <string name="pref_services_message_sync_failed">Sync failed</string>
-    <string name="pref_services_sync_in_progress">Sync in progress</string>
-    <string name="pref_services_last_full_sync_date">Last full sync: %s</string>
-    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
-    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
-    <string name="pref_other_fill_message_content">Reply with message history</string>
-    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
-    <string name="pref_other_incognito_mode">Incognito mode</string>
-    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
-    <string name="pref_ads_support_category_name">Support</string>
-    <string name="pref_ads_privacy_policy">Privacy Policy</string>
-    <string name="pref_ads_agreements">Agreements</string>
-    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
-    <string name="pref_ads_show_in_app">Show ads in app</string>
-    <string name="pref_ads_support">Watch single ad to support project</string>
-    <string name="pref_ads_privacy_title">Consent to data processing</string>
-    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
-    <string name="pref_ads_privacy_agree">Agree</string>
-    <string name="pref_ads_privacy_link">Privacy policy</string>
-    <string name="pref_ads_loading">Ad is loading</string>
-    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
-    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
-    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
-    <string name="pref_ads_summary_personalized">Personalized ads</string>
-    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
-    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
-    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
-    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
-    <string name="pref_settings_advanced_title">Advanced</string>
-    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
-    <string name="pref_settings_notifications_title">Notifications</string>
-    <string name="pref_settings_sync_title">Synchronization</string>
-    <string name="pref_settings_ads_title">Advertisements</string>
-    <string name="pref_grades_appearance_header">Grades</string>
-    <string name="pref_dashboard_appearance_header">Dashboard</string>
-    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
-    <string name="pref_attendance_appearance_view">Attendance</string>
-    <string name="pref_timetable_appearance_view">Timetable</string>
-    <string name="pref_grades_advanced_header">Grades</string>
-    <string name="pref_counted_average_advanced_header">Calculated average</string>
-    <string name="pref_messages_advanced_header">Messages</string>
-    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
-    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
-    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
-    <string name="pref_notifications_category">Notifications</string>
-    <string name="pref_sync_category">Synchronization</string>
-    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
-    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
-    <string name="pref_advanced_category">Advanced</string>
-    <string name="pref_about_category_summary">App version, contributors, social portals</string>
-    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
-    <!--Notification Channels-->
-    <string name="channel_new_grades">New grades</string>
-    <string name="channel_new_homework">New homework</string>
-    <string name="channel_new_conference">New conferences</string>
-    <string name="channel_new_exam">New exams</string>
-    <string name="channel_lucky_number">Lucky number</string>
-    <string name="channel_new_message">New messages</string>
-    <string name="channel_new_notes">New notes</string>
-    <string name="channel_new_school_announcement">New school announcements</string>
-    <string name="channel_push">Push notifications</string>
-    <string name="channel_upcoming_lessons">Upcoming lessons</string>
-    <string name="channel_debug">Debug</string>
-    <string name="channel_change_timetable">Timetable change</string>
-    <string name="channel_new_attendance">New attendance</string>
-    <!--Colors-->
-    <string name="all_black">Black</string>
-    <string name="all_red">Red</string>
-    <string name="all_blue">Blue</string>
-    <string name="all_green">Green</string>
-    <string name="all_purple">Purple</string>
-    <string name="all_empty_color">No color</string>
-    <!--Update helper-->
-    <string name="update_download_started">Download of updates has started…</string>
-    <string name="update_download_success">An update has just been downloaded.</string>
-    <string name="update_download_success_button">Restart</string>
-    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
-    <!--Menu order-->
-    <string name="menu_order_confirm_title">Application restart</string>
-    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
-    <string name="menu_order_confirm_restart">Restart</string>
-    <!--Auth-->
-    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
-    <string name="auth_invalid_error">Invalid PESEL</string>
-    <string name="auth_pesel">PESEL</string>
-    <string name="auth_button">Authorize</string>
-    <string name="auth_success">Authorization completed successfully</string>
-    <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
-    <string name="auth_button_skip">Skip for now</string>
-    <!--Errors-->
-    <string name="error_no_internet">No internet connection</string>
-    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
-    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
-    <string name="error_login_failed">Loading data failed. Please try again later</string>
-    <string name="error_password_change_required">Register password change required</string>
-    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
-    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
-    <string name="error_unknown_app">Unknown application error. Please try again later</string>
-    <string name="error_unknown">An unexpected error occurred</string>
-    <string name="error_feature_disabled">Feature disabled by your school</string>
-    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
-    <string name="error_field_required">This field is required</string>
-</resources>

app/src/main/res/values-de/strings.xml

@@ -10,9 +10,10 @@
     <string name="settings_title">Einstellungen</string>
     <string name="more_title">Mehr</string>
     <string name="about_title">Über die Applikation</string>
-    <string name="logviewer_title">Log Viewer</string>
+    <string name="logviewer_title">Log viewer</string>
     <string name="debug_title">Debuggen</string>
     <string name="notification_debug_title">Benachrichtigungen debuggen</string>
+    <string name="debug_cookies_clear">Clear webview cookies</string>
     <string name="contributors_title">Mitarbeiter</string>
     <string name="license_title">Lizenzen</string>
     <string name="message_title">Nachrichten</string>
@@ -96,6 +97,8 @@
     <string name="main_log_in">Anmelden</string>
     <string name="main_session_expired">Die Sitzung ist abgelaufen</string>
     <string name="main_session_relogin">Die Sitzung ist abgelaufen, bitte loggen Sie sich erneut ein</string>
+    <string name="main_expired_credentials_description">Your account password has been changed. You need to log in to Wulkanowy again</string>
+    <string name="main_expired_credentials_title">Password changed</string>
     <string name="main_support_title">Anwendungsunterstützung</string>
     <string name="main_support_description">Gefällt Ihnen diese App? Unterstützen Sie ihre Entwicklung, indem Sie nicht-invasive Werbung aktivieren, die Sie jederzeit deaktivieren können</string>
     <string name="main_support_positive">Werbung aktivieren</string>
@@ -670,7 +673,7 @@
     <string name="pref_ads_support_category_name">Unterstützung</string>
     <string name="pref_ads_privacy_policy">Datenschutz-Bestimmungen</string>
     <string name="pref_ads_agreements">Vereinbarungen</string>
-    <string name="pref_ads_consent">Zustimmung zur Verarbeitung von Daten im Zusammenhang mit Anzeigen</string>
+    <string name="pref_ads_consent">Show consent to data processing</string>
     <string name="pref_ads_show_in_app">Anzeigen in der App anzeigen</string>
     <string name="pref_ads_support">Einzelanzeige ansehen, um Projekt zu unterstützen</string>
     <string name="pref_ads_privacy_title">Einwilligung in die Datenverarbeitung</string>
@@ -679,13 +682,6 @@
     <string name="pref_ads_privacy_link">Datenschutzerklärung</string>
     <string name="pref_ads_loading">Anzeige wird geladen</string>
     <string name="pref_ads_once_per_visit">Vielen Dank für Ihre Unterstützung, kommen Sie später wieder für weitere Anzeigen</string>
-    <string name="pref_ads_consent_title">Können wir Ihre Daten zur Anzeige von Werbung verwenden?</string>
-    <string name="pref_ads_consent_description">Sie können Ihre Wahl jederzeit in den App-Einstellungen ändern. Wir verwenden Ihre Daten, um auf Sie zugeschnittene Anzeigen anzuzeigen oder unter Verwendung weniger Ihrer Daten nicht personalisierte Werbung anzuzeigen. Bitte lesen Sie unsere Datenschutzerklärung für Details</string>
-    <string name="pref_ads_summary_personalized">Personalisierte Werbung</string>
-    <string name="pref_ads_summary_non_personalized">keine personalisierte Werbung</string>
-    <string name="pref_ads_over_18_years_old">Ich bin über 18 Jahre alt</string>
-    <string name="pref_ads_option_personalized">Ja, personalisierte Werbung</string>
-    <string name="pref_ads_option_non_personalized">Ja, nicht personalisierte Werbung</string>
     <string name="pref_settings_advanced_title">Erweitert</string>
     <string name="pref_settings_appearance_title">Aussehen &amp; Verhalten</string>
     <string name="pref_settings_notifications_title">Benachrichtigungen</string>
@@ -748,6 +744,9 @@
     <string name="auth_title">Authorization</string>
     <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
     <string name="auth_button_skip">Skip for now</string>
+    <!--Captcha-->
+    <string name="captcha_dialog_title">Verification is in progress. Wait…</string>
+    <string name="captcha_verified_message">Verified successfully</string>
     <!--Errors-->
     <string name="error_no_internet">Keine Internetverbindung</string>
     <string name="error_invalid_device_datetime">Es ist ein Fehler aufgetreten. Überprüfen Sie Ihre Geräteuhr</string>
@@ -757,6 +756,7 @@
     <string name="error_service_unavailable">Wartung im Gange UONET + Klassenbuch. Versuchen Sie es später noch einmal</string>
     <string name="error_unknown_uonet">Unbekannter UONET + Registerfehler. Versuchen Sie es später erneut</string>
     <string name="error_unknown_app">Unbekannter Anwendungsfehler. Bitte versuchen Sie es später noch einmal</string>
+    <string name="error_cloudflare_captcha">Captcha verification required</string>
     <string name="error_unknown">Ein unerwarteter Fehler ist aufgetreten</string>
     <string name="error_feature_disabled">Funktion, die von Ihrer Schule deaktiviert wurde</string>
     <string name="error_feature_not_available">Feature in diesem Modus nicht verfügbar</string>

app/src/main/res/values-es-rES/strings.xml

@@ -1,764 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Login</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Grades</string>
-    <string name="attendance_title">Attendance</string>
-    <string name="exam_title">Exams</string>
-    <string name="timetable_title">Timetable</string>
-    <string name="settings_title">Settings</string>
-    <string name="more_title">More</string>
-    <string name="about_title">About</string>
-    <string name="logviewer_title">Log viewer</string>
-    <string name="debug_title">Debug</string>
-    <string name="notification_debug_title">Notification debug</string>
-    <string name="contributors_title">Contributors</string>
-    <string name="license_title">Licenses</string>
-    <string name="message_title">Messages</string>
-    <string name="send_message_title">New message</string>
-    <string name="add_homework_title">New homework</string>
-    <string name="note_title">Notes and achievements</string>
-    <string name="homework_title">Homework</string>
-    <string name="account_title">Accounts manager</string>
-    <string name="account_quick_title">Select account</string>
-    <string name="account_details_title">Account details</string>
-    <string name="student_info_title">Student info</string>
-    <string name="dashboard_title">Dashboard</string>
-    <string name="notifications_center_title">Notifications center</string>
-    <string name="menu_order_title">Menu configuartion</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
-    <!--Login-->
-    <string name="login_header_default">Sign in with the student or parent account</string>
-    <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</string>
-    <string name="login_nickname_hint">Username</string>
-    <string name="login_email_hint">Email</string>
-    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
-    <string name="login_password_hint">Password</string>
-    <string name="login_host_hint">UONET+ register variant</string>
-    <string name="login_domain_suffix_hint">Custom domain suffix</string>
-    <string name="login_type_api">Mobile API</string>
-    <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hybrid</string>
-    <string name="login_token_hint">Token</string>
-    <string name="login_pin_hint">PIN</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
-    <string name="login_sign_in">Sign in</string>
-    <string name="login_invalid_password">Password too short</string>
-    <string name="login_incorrect_password_default">Login details are incorrect</string>
-    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</string>
-    <string name="login_invalid_pin">Invalid PIN</string>
-    <string name="login_invalid_token">Invalid token</string>
-    <string name="login_expired_token">Token expired</string>
-    <string name="login_invalid_email">Invalid email</string>
-    <string name="login_invalid_login">Use the assigned login instead of email</string>
-    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
-    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
-    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
-    <string name="login_duplicate_student">Selected student is already logged in</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
-    <string name="login_select_student">Select students to log in to the application</string>
-    <string name="login_advanced">Other options</string>
-    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
-    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
-    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</string>
-    <string name="login_privacy_policy">Privacy policy</string>
-    <string name="login_contact_header">Trouble signing in? Contact us!</string>
-    <string name="login_contact_email">Email</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Send email</string>
-    <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">Reset password</string>
-    <string name="login_recover_title">Recover your account</string>
-    <string name="login_recover">Recover</string>
-    <string name="login_signed_in">Student is already signed in</string>
-    <string name="login_host_standard">Standard</string>
-    <string name="login_other_search_locations">Other search locations</string>
-    <string name="login_no_active_student">No active students found</string>
-    <string name="login_symbol_enter">Enter a different symbol</string>
-    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name with the town (required)</string>
-    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
-    <string name="login_support_school_invalid">Enter correct name of the school</string>
-    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
-    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
-    <string name="login_support_submit">Submit</string>
-    <!--Notifications-->
-    <string name="notifications_header_title">Enable notifications</string>
-    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
-    <string name="notifications_skip">Skip</string>
-    <string name="notifications_enable">Enable</string>
-    <!--Main-->
-    <string name="main_account_picker">Account manager</string>
-    <string name="main_log_in">Log in</string>
-    <string name="main_session_expired">Session expired</string>
-    <string name="main_session_relogin">Session expired, log in again</string>
-    <string name="main_support_title">Application support</string>
-    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
-    <string name="main_support_positive">Enable ads</string>
-    <!--Grade-->
-    <string name="grade_header">Grade</string>
-    <string name="grade_semester">Semester %d</string>
-    <string name="grade_switch_semester">Change semester</string>
-    <string name="grade_no_items">No grades</string>
-    <string name="grade_weight">Weight</string>
-    <string name="grade_weight_value">Weight: %s</string>
-    <string name="grade_comment">Comment</string>
-    <string name="grade_number_new_items">Number of new ratings: %1$d</string>
-    <string name="grade_average">Average: %1$.2f</string>
-    <string name="grade_points_sum">Points: %s</string>
-    <string name="grade_no_average">No average</string>
-    <string name="grade_summary_points">Total points</string>
-    <string name="grade_summary_final_grade">Final grade</string>
-    <string name="grade_summary_predicted_grade">Predicted grade</string>
-    <string name="grade_summary_calculated_average">Calculated average</string>
-    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
-    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
-    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
-    <string name="grade_summary_final_average">Final average</string>
-    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
-    <string name="grade_menu_summary">Summary</string>
-    <string name="grade_menu_statistics">Class</string>
-    <string name="grade_menu_read">Mark as read</string>
-    <string name="grade_statistics_partial">Partial</string>
-    <string name="grade_statistics_semester">Semester</string>
-    <string name="grade_statistics_points">Points</string>
-    <string name="grade_statistics_legend">Legend</string>
-    <string name="grade_statistics_class_average">Class average: %1$s</string>
-    <string name="grade_statistics_student_average">Your average: %1$s</string>
-    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
-    <string name="grade_statistics_average_class">Class</string>
-    <string name="grade_statistics_average_student">Student</string>
-    <plurals name="grade_number_item">
-        <item quantity="one">%d grade</item>
-        <item quantity="other">%d grades</item>
-    </plurals>
-    <plurals name="grade_new_items">
-        <item quantity="one">New grade</item>
-        <item quantity="other">New grades</item>
-    </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
-        <item quantity="other">New predicted grades</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
-        <item quantity="other">New final grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items">
-        <item quantity="one">You received %1$d grade</item>
-        <item quantity="other">You received %1$d grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">You received %1$d predicted grade</item>
-        <item quantity="other">You received %1$d predicted grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">You received %1$d final grade</item>
-        <item quantity="other">You received %1$d final grades</item>
-    </plurals>
-    <!--Timetable-->
-    <string name="timetable_lesson">Lesson</string>
-    <string name="timetable_room">Room</string>
-    <string name="timetable_group">Group</string>
-    <string name="timetable_time">Hours</string>
-    <string name="timetable_changes">Changes</string>
-    <string name="timetable_no_items">No lessons this day</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sec</string>
-    <string name="timetable_time_left">%1$s left</string>
-    <string name="timetable_time_until">in %1$s</string>
-    <string name="timetable_finished">Finished</string>
-    <string name="timetable_now">Now: %s</string>
-    <string name="timetable_next">Next: %s</string>
-    <string name="timetable_later">Later: %s</string>
-    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
-    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
-    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
-    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
-    <plurals name="timetable_no_lesson">
-        <item quantity="one">No lesson</item>
-        <item quantity="other">No lessons</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items_title">
-        <item quantity="one">Timetable change</item>
-        <item quantity="other">Timetable changes</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items">
-        <item quantity="one">%1$s - %2$d change in timetable</item>
-        <item quantity="other">%1$s - %2$d  changes in timetable</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items_group">
-        <item quantity="one">%1$d change in timetable</item>
-        <item quantity="other">%1$d changes in timetable</item>
-    </plurals>
-    <plurals name="timetable_number_item">
-        <item quantity="one">%d change</item>
-        <item quantity="other">%d changes</item>
-    </plurals>
-    <!--Completed lessons-->
-    <string name="completed_lessons_title">Completed lessons</string>
-    <string name="completed_lessons_button">Show completed lessons</string>
-    <string name="completed_lessons_no_items">No info about completed lessons</string>
-    <string name="completed_lessons_topic">Topic</string>
-    <string name="completed_lessons_absence">Absence</string>
-    <string name="completed_lessons_resources">Resources</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Additional lessons</string>
-    <string name="additional_lessons_button">Show additional lessons</string>
-    <string name="additional_lessons_no_items">No info about additional lessons</string>
-    <string name="additional_lessons_add">New lesson</string>
-    <string name="additional_lessons_add_title">New additional lesson</string>
-    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
-    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
-    <string name="additional_lessons_repeat">Repeat weekly</string>
-    <string name="additional_lessons_delete_title">Delete additional lesson</string>
-    <string name="additional_lessons_delete_one">Just this lesson</string>
-    <string name="additional_lessons_delete_series">All in the series</string>
-    <string name="additional_lessons_start">Start time</string>
-    <string name="additional_lessons_end">End time</string>
-    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
-    <!--Attendance-->
-    <string name="attendance_summary_button">Attendance summary</string>
-    <string name="attendance_absence_school">Absent for school reasons</string>
-    <string name="attendance_absence_excused">Excused absence</string>
-    <string name="attendance_absence_unexcused">Unexcused absence</string>
-    <string name="attendance_exemption">Exemption</string>
-    <string name="attendance_excused_lateness">Excused lateness</string>
-    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
-    <string name="attendance_present">Present</string>
-    <string name="attendance_deleted">Deleted</string>
-    <string name="attendance_unknown">Unknown</string>
-    <string name="attendance_number">Number of lesson</string>
-    <string name="attendance_no_items">No entries</string>
-    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
-    <string name="attendance_excuse_dialog_submit">Send</string>
-    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
-    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
-    <string name="attendance_excuse_title">Excuse</string>
-    <plurals name="attendance_notify_new_items_title">
-        <item quantity="one">New attendance</item>
-        <item quantity="other">New attendance</item>
-    </plurals>
-    <plurals name="attendance_notify_new_items">
-        <item quantity="one">%1$d new attendance</item>
-        <item quantity="other">%1$d attendance</item>
-    </plurals>
-    <plurals name="attendance_number_item">
-        <item quantity="one">%d attendance</item>
-        <item quantity="other">%d attendance</item>
-    </plurals>
-    <!--Attendance summary-->
-    <string name="attendance_summary_total">Total</string>
-    <!--Exam-->
-    <string name="exam_no_items">No exams this week</string>
-    <string name="exam_type">Type</string>
-    <string name="exam_entry_date">Entry date</string>
-    <plurals name="exam_notify_new_item_title">
-        <item quantity="one">New exam</item>
-        <item quantity="other">New exams</item>
-    </plurals>
-    <plurals name="exam_notify_new_item_content">
-        <item quantity="one">%d new exam</item>
-        <item quantity="other">%d new exams</item>
-    </plurals>
-    <plurals name="exam_number_item">
-        <item quantity="one">%d exam</item>
-        <item quantity="other">%d exams</item>
-    </plurals>
-    <!--Message-->
-    <string name="message_inbox">Inbox</string>
-    <string name="message_sent">Sent</string>
-    <string name="message_trash">Trash</string>
-    <string name="message_no_subject">(no subject)</string>
-    <string name="message_no_items">No messages</string>
-    <string name="message_from">From:</string>
-    <string name="message_to">To:</string>
-    <string name="message_date">Date: %1$s</string>
-    <string name="message_reply">Reply</string>
-    <string name="message_forward">Forward</string>
-    <string name="message_select_all">Select all</string>
-    <string name="message_unselect_all">Unselect all</string>
-    <string name="message_move_to_trash">Move to trash</string>
-    <string name="message_delete_forever">Delete permanently</string>
-    <string name="message_delete_success">Message deleted successfully</string>
-    <string name="message_mailbox_type_student">student</string>
-    <string name="message_mailbox_type_parent">parent</string>
-    <string name="message_mailbox_type_guardian">guardian</string>
-    <string name="message_mailbox_type_employee">employee</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
-    <string name="message_subject">Subject</string>
-    <string name="message_content">Content</string>
-    <string name="message_send_successful">Message sent successfully</string>
-    <string name="message_not_exists">Message does not exist</string>
-    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
-    <string name="message_content_min_length">The message content must be at least 3 characters</string>
-    <string name="message_chip_all_mailboxes">All mailboxes</string>
-    <string name="message_chip_only_unread">Only unread</string>
-    <string name="message_chip_only_with_attachments">Only with attachments</string>
-    <string name="message_read">Read: %s</string>
-    <string name="message_read_by">Read by: %1$d of %2$d people</string>
-    <plurals name="message_number_item">
-        <item quantity="one">%1$d message</item>
-        <item quantity="other">%1$d messages</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one">New message</item>
-        <item quantity="other">New messages</item>
-    </plurals>
-    <string name="message_restore_dialog">Do you want to restore draft message?</string>
-    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">You received %1$d message</item>
-        <item quantity="other">You received %1$d messages</item>
-    </plurals>
-    <plurals name="message_selected_messages_count">
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
-    <string name="message_messages_deleted">Messages deleted</string>
-    <string name="message_mailbox_chooser_title">Choose mailbox</string>
-    <string name="message_incognito_mode_on">Incognito mode is on</string>
-    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
-    <!--Note-->
-    <string name="note_no_items">No info about notes</string>
-    <string name="note_points">Points</string>
-    <plurals name="note_number_item">
-        <item quantity="one">%d note</item>
-        <item quantity="other">%d notes</item>
-    </plurals>
-    <plurals name="note_new_items">
-        <item quantity="one">New note</item>
-        <item quantity="other">New notes</item>
-    </plurals>
-    <plurals name="note_notify_new_items">
-        <item quantity="one">You received %1$d note</item>
-        <item quantity="other">You received %1$d notes</item>
-    </plurals>
-    <!--Praise-->
-    <plurals name="praise_number_item">
-        <item quantity="one">%d praise</item>
-        <item quantity="other">%d praises</item>
-    </plurals>
-    <plurals name="praise_new_items">
-        <item quantity="one">New praise</item>
-        <item quantity="other">New praises</item>
-    </plurals>
-    <plurals name="praise_notify_new_items">
-        <item quantity="one">You received %1$d praise</item>
-        <item quantity="other">You received %1$d praises</item>
-    </plurals>
-    <!--Neutral notes-->
-    <plurals name="neutral_note_number_item">
-        <item quantity="one">%d neutral note</item>
-        <item quantity="other">%d neutral notes</item>
-    </plurals>
-    <plurals name="neutral_note_new_items">
-        <item quantity="one">New neutral note</item>
-        <item quantity="other">New neutral notes</item>
-    </plurals>
-    <plurals name="neutral_note_notify_new_items">
-        <item quantity="one">You received %1$d neutral note</item>
-        <item quantity="other">You received %1$d neutral notes</item>
-    </plurals>
-    <!--Homework-->
-    <string name="homework_no_items">No info about homework</string>
-    <string name="homework_mark_as_done">Mark as done</string>
-    <string name="homework_mark_as_undone">Mark as undone</string>
-    <string name="homework_add">Add homework</string>
-    <string name="homework_add_success">Homework added successfully</string>
-    <string name="homework_delete_success">Homework deleted successfully</string>
-    <string name="homework_attachments">Attachments</string>
-    <plurals name="homework_notify_new_item_title">
-        <item quantity="one">New homework</item>
-        <item quantity="other">New homework</item>
-    </plurals>
-    <plurals name="homework_notify_new_item_content">
-        <item quantity="one">You received %d new homework</item>
-        <item quantity="other">You received %d new homework</item>
-    </plurals>
-    <plurals name="homework_number_item">
-        <item quantity="one">%d homework</item>
-        <item quantity="other">%d homework</item>
-    </plurals>
-    <!--Lucky number-->
-    <string name="lucky_number_title">Lucky number</string>
-    <string name="lucky_number_header">Today\'s lucky number is</string>
-    <string name="lucky_number_empty">No info about the lucky number</string>
-    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
-    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
-    <string name="lucky_number_history_button">Show history</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Lucky number history</string>
-    <string name="lucky_number_history_empty">No info about lucky numbers</string>
-    <!--Mobile devices-->
-    <string name="mobile_devices_title">Mobile devices</string>
-    <string name="mobile_devices_no_items">No devices</string>
-    <string name="mobile_devices_unregister">Deregister</string>
-    <string name="mobile_device_removed">Device removed</string>
-    <string name="mobile_device_qr">QR code</string>
-    <string name="mobile_device_token">Token</string>
-    <string name="mobile_device_symbol">Symbol</string>
-    <string name="mobile_device_pin">PIN</string>
-    <!--School and teachers-->
-    <string name="schoolandteachers_title">School and teachers</string>
-    <!--School-->
-    <string name="school_title">School</string>
-    <string name="school_no_info">No info about school</string>
-    <string name="school_name">School name</string>
-    <string name="school_address">School address</string>
-    <string name="school_telephone">Telephone</string>
-    <string name="school_headmaster">Name of headmaster</string>
-    <string name="school_pedagogue">Name of pedagogue</string>
-    <string name="school_address_button">Show on map</string>
-    <string name="school_telephone_button">Call</string>
-    <!--Teacher-->
-    <string name="teachers_title">Teachers</string>
-    <string name="teacher_no_items">No info about teachers</string>
-    <string name="teacher_no_subject">No subject</string>
-    <!--Conference-->
-    <string name="conferences_title">Conferences</string>
-    <string name="conference_no_items">No info about conferences</string>
-    <plurals name="conference_number_item">
-        <item quantity="one">%d conference</item>
-        <item quantity="other">%d conferences</item>
-    </plurals>
-    <plurals name="conference_notify_new_item_title">
-        <item quantity="one">New conference</item>
-        <item quantity="other">New conferences</item>
-    </plurals>
-    <plurals name="conference_notify_new_items">
-        <item quantity="one">You have %1$d new conference</item>
-        <item quantity="other">You have %1$d new conferences</item>
-    </plurals>
-    <string name="conferences_present">Present at conference</string>
-    <string name="conference_agenda">Agenda</string>
-    <string name="conference_place">Place</string>
-    <string name="conference_topic">Topic</string>
-    <!--Director information-->
-    <string name="school_announcement_title">School announcements</string>
-    <string name="school_announcement_no_items">No school announcements</string>
-    <plurals name="school_announcement_number_item">
-        <item quantity="one">%d school announcement</item>
-        <item quantity="other">%d school announcements</item>
-    </plurals>
-    <plurals name="school_announcement_notify_new_item_title">
-        <item quantity="one">New school announcement</item>
-        <item quantity="other">New school announcements</item>
-    </plurals>
-    <plurals name="school_announcement_notify_new_items">
-        <item quantity="one">You have %1$d new school announcement</item>
-        <item quantity="other">You have %1$d new school announcements</item>
-    </plurals>
-    <!--Account-->
-    <string name="account_add_new">Add account</string>
-    <string name="account_logout">Logout</string>
-    <string name="account_confirm">Do you want to log out this student?</string>
-    <string name="account_logout_student">Student logout</string>
-    <string name="account_type_student">Student account</string>
-    <string name="account_type_parent">Parent account</string>
-    <string name="account_details_edit">Edit data</string>
-    <string name="account_quick_manager">Accounts manager</string>
-    <string name="account_select_student">Select student</string>
-    <string name="account_family">Family</string>
-    <string name="account_contact">Contact</string>
-    <string name="account_address">Residence details</string>
-    <string name="account_personal_data">Personal information</string>
-    <!--About-->
-    <string name="about_version">App version</string>
-    <string name="about_contributor">Contributors</string>
-    <string name="about_contributor_summary">List of Wulkanowy developers</string>
-    <string name="about_feedback">Report a bug</string>
-    <string name="about_feedback_summary">Send a bug report via e-mail</string>
-    <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Read Frequently Asked Questions</string>
-    <string name="about_discord">Discord server</string>
-    <string name="about_discord_summary">Join the Wulkanowy community</string>
-    <string name="about_facebook">Facebook fanpage</string>
-    <string name="about_twitter">Twitter page</string>
-    <string name="about_twitter_summary">Follow us on twitter</string>
-    <string name="about_facebook_summary">Like our facebook fanpage</string>
-    <string name="about_privacy">Privacy policy</string>
-    <string name="about_privacy_summary">Rules for collecting personal data</string>
-    <string name="about_system">System settings</string>
-    <string name="about_system_summary">Open system settings</string>
-    <string name="about_homepage">Homepage</string>
-    <string name="about_homepage_summary">Visit the website and help develop the application</string>
-    <string name="about_licenses">Licenses</string>
-    <string name="about_licenses_summary">Licenses of libraries used in the application</string>
-    <!--Licenses-->
-    <string name="license_dialog_title">License</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Avatar</string>
-    <string name="contributor_see_more">See more on GitHub</string>
-    <!--Student info-->
-    <string name="student_info_empty">No info about student or student family</string>
-    <string name="student_info_first_name">Name</string>
-    <string name="student_info_second_name">Second name</string>
-    <string name="student_info_gender">Gender</string>
-    <string name="student_info_polish_citizenship">Polish citizenship</string>
-    <string name="student_info_family_name">Family name</string>
-    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
-    <string name="student_info_phone">Phone</string>
-    <string name="student_info_cellphone">Cellphone</string>
-    <string name="student_info_email">E-mail</string>
-    <string name="student_info_address">Address of residence</string>
-    <string name="student_info_registered_address">Address of registration</string>
-    <string name="student_info_correspondence_address">Correspondence address</string>
-    <string name="student_info_full_name">Surname and first name</string>
-    <string name="student_info_kinship">Degree of kinship</string>
-    <string name="student_info_guardian_address">Address</string>
-    <string name="student_info_phones">Phones</string>
-    <string name="student_info_male">Male</string>
-    <string name="student_info_female">Female</string>
-    <string name="student_info_last_name">Last name</string>
-    <string name="student_info_guardian">Guardian</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Nick</string>
-    <string name="account_edit_header">Add nick</string>
-    <string name="account_edit_avatar_title">Choose avatar color</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Share logs</string>
-    <string name="logviewer_refresh">Refresh</string>
-    <!--Dashboard-->
-    <string name="dashboard_timetable_title">Lessons</string>
-    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
-    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
-    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
-    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
-    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
-    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
-    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
-    <string name="dashboard_timetable_second_lessons_title">Next:</string>
-    <string name="dashboard_timetable_third_title">Later:</string>
-    <plurals name="dashboard_timetable_third_value">
-        <item quantity="one">%1$d more lesson</item>
-        <item quantity="other">%1$d more lessons</item>
-    </plurals>
-    <string name="dashboard_timetable_third_time">until %1$s</string>
-    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
-    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
-    <string name="dashboard_homework_title">Homework</string>
-    <string name="dashboard_homework_no_homework">No homework to do</string>
-    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
-    <plurals name="dashboard_homework_more">
-        <item quantity="one">%1$d more homework</item>
-        <item quantity="other">%1$d more homework</item>
-    </plurals>
-    <string name="dashboard_homework_time">due %1$s</string>
-    <string name="dashboard_grade_title">Last grades</string>
-    <string name="dashboard_grade_no_grade">No new grades</string>
-    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
-    <string name="dashboard_announcements_title">School announcements</string>
-    <string name="dashboard_announcements_no_announcements">No current announcements</string>
-    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
-    <plurals name="dashboard_announcements_more">
-        <item quantity="one">%1$d more announcement</item>
-        <item quantity="other">%1$d more announcements</item>
-    </plurals>
-    <string name="dashboard_exams_title">Exams</string>
-    <string name="dashboard_exams_no_exams">No upcoming exams</string>
-    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
-    <plurals name="dashboard_exams_more">
-        <item quantity="one">%1$d more exam</item>
-        <item quantity="other">%1$d more exams</item>
-    </plurals>
-    <string name="dashboard_conferences_title">Conferences</string>
-    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
-    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
-    <plurals name="dashboard_conference_more">
-        <item quantity="one">%1$d more conference</item>
-        <item quantity="other">%1$d more conferences</item>
-    </plurals>
-    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
-    <string name="dashboard_horizontal_group_no_data">None</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Check for updates</string>
-    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
-    <!--Generic-->
-    <string name="all_content">Content</string>
-    <string name="all_retry">Retry</string>
-    <string name="all_description">Description</string>
-    <string name="all_no_description">No description</string>
-    <string name="all_teacher">Teacher</string>
-    <string name="all_date">Date</string>
-    <string name="all_entry_date">Entry date</string>
-    <string name="all_color">Color</string>
-    <string name="all_details">Details</string>
-    <string name="all_category">Category</string>
-    <string name="all_close">Close</string>
-    <string name="all_no_data">No data</string>
-    <string name="all_subject">Subject</string>
-    <string name="all_prev">Prev</string>
-    <string name="all_next">Next</string>
-    <string name="all_search">Search</string>
-    <string name="all_search_hint">Search…</string>
-    <string name="all_yes">Yes</string>
-    <string name="all_no">No</string>
-    <string name="all_save">Save</string>
-    <string name="all_title">Title</string>
-    <string name="all_add">Add</string>
-    <string name="all_copied">Copied</string>
-    <string name="all_undo">Undo</string>
-    <string name="all_change">Change</string>
-    <string name="all_add_to_calendar">Add to calendar</string>
-    <string name="all_cancel">Cancel</string>
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">No lessons</string>
-    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
-    <string name="widget_timetable_theme_title">Choose theme</string>
-    <string name="widget_timetable_theme_light">Light</string>
-    <string name="widget_timetable_theme_dark">Dark</string>
-    <string name="widget_timetable_theme_system">System Theme</string>
-    <!--Preferences-->
-    <string name="pref_view_header">App</string>
-    <string name="pref_view_list">Default view</string>
-    <string name="pref_view_grade_average_mode">Calculated average options</string>
-    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
-    <string name="pref_view_present">Show presence</string>
-    <string name="pref_view_app_theme">Theme</string>
-    <string name="pref_view_expand_grade">Grades expanding</string>
-    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
-    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
-    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
-    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
-    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
-    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
-    <string name="pref_view_app_language">Language</string>
-    <string name="pref_view_menu_order_title">Menu configuration</string>
-    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
-    <string name="pref_notify_header">Notifications</string>
-    <string name="pref_notify_header_other">Other</string>
-    <string name="pref_notify_switch">Show notifications</string>
-    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
-    <string name="pref_notify_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
-    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
-    <string name="pref_notify_open_system_settings">Open system notification settings</string>
-    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
-    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
-    <string name="pref_notify_debug_switch">Show debug notifications</string>
-    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
-    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
-    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
-    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
-    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
-    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
-    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
-    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
-    <string name="pref_notification_go_to_settings">Go to settings</string>
-    <string name="pref_services_header">Synchronization</string>
-    <string name="pref_services_switch">Automatic update</string>
-    <string name="pref_services_suspended">Suspended on holidays</string>
-    <string name="pref_services_interval">Updates interval</string>
-    <string name="pref_services_wifi">Wi-Fi only</string>
-    <string name="pref_services_force_sync">Sync now</string>
-    <string name="pref_services_message_sync_success">Synced!</string>
-    <string name="pref_services_message_sync_failed">Sync failed</string>
-    <string name="pref_services_sync_in_progress">Sync in progress</string>
-    <string name="pref_services_last_full_sync_date">Last full sync: %s</string>
-    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
-    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
-    <string name="pref_other_fill_message_content">Reply with message history</string>
-    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
-    <string name="pref_other_incognito_mode">Incognito mode</string>
-    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
-    <string name="pref_ads_support_category_name">Support</string>
-    <string name="pref_ads_privacy_policy">Privacy Policy</string>
-    <string name="pref_ads_agreements">Agreements</string>
-    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
-    <string name="pref_ads_show_in_app">Show ads in app</string>
-    <string name="pref_ads_support">Watch single ad to support project</string>
-    <string name="pref_ads_privacy_title">Consent to data processing</string>
-    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
-    <string name="pref_ads_privacy_agree">Agree</string>
-    <string name="pref_ads_privacy_link">Privacy policy</string>
-    <string name="pref_ads_loading">Ad is loading</string>
-    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
-    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
-    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
-    <string name="pref_ads_summary_personalized">Personalized ads</string>
-    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
-    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
-    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
-    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
-    <string name="pref_settings_advanced_title">Advanced</string>
-    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
-    <string name="pref_settings_notifications_title">Notifications</string>
-    <string name="pref_settings_sync_title">Synchronization</string>
-    <string name="pref_settings_ads_title">Advertisements</string>
-    <string name="pref_grades_appearance_header">Grades</string>
-    <string name="pref_dashboard_appearance_header">Dashboard</string>
-    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
-    <string name="pref_attendance_appearance_view">Attendance</string>
-    <string name="pref_timetable_appearance_view">Timetable</string>
-    <string name="pref_grades_advanced_header">Grades</string>
-    <string name="pref_counted_average_advanced_header">Calculated average</string>
-    <string name="pref_messages_advanced_header">Messages</string>
-    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
-    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
-    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
-    <string name="pref_notifications_category">Notifications</string>
-    <string name="pref_sync_category">Synchronization</string>
-    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
-    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
-    <string name="pref_advanced_category">Advanced</string>
-    <string name="pref_about_category_summary">App version, contributors, social portals</string>
-    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
-    <!--Notification Channels-->
-    <string name="channel_new_grades">New grades</string>
-    <string name="channel_new_homework">New homework</string>
-    <string name="channel_new_conference">New conferences</string>
-    <string name="channel_new_exam">New exams</string>
-    <string name="channel_lucky_number">Lucky number</string>
-    <string name="channel_new_message">New messages</string>
-    <string name="channel_new_notes">New notes</string>
-    <string name="channel_new_school_announcement">New school announcements</string>
-    <string name="channel_push">Push notifications</string>
-    <string name="channel_upcoming_lessons">Upcoming lessons</string>
-    <string name="channel_debug">Debug</string>
-    <string name="channel_change_timetable">Timetable change</string>
-    <string name="channel_new_attendance">New attendance</string>
-    <!--Colors-->
-    <string name="all_black">Black</string>
-    <string name="all_red">Red</string>
-    <string name="all_blue">Blue</string>
-    <string name="all_green">Green</string>
-    <string name="all_purple">Purple</string>
-    <string name="all_empty_color">No color</string>
-    <!--Update helper-->
-    <string name="update_download_started">Download of updates has started…</string>
-    <string name="update_download_success">An update has just been downloaded.</string>
-    <string name="update_download_success_button">Restart</string>
-    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
-    <!--Menu order-->
-    <string name="menu_order_confirm_title">Application restart</string>
-    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
-    <string name="menu_order_confirm_restart">Restart</string>
-    <!--Auth-->
-    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
-    <string name="auth_invalid_error">Invalid PESEL</string>
-    <string name="auth_pesel">PESEL</string>
-    <string name="auth_button">Authorize</string>
-    <string name="auth_success">Authorization completed successfully</string>
-    <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
-    <string name="auth_button_skip">Skip for now</string>
-    <!--Errors-->
-    <string name="error_no_internet">No internet connection</string>
-    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
-    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
-    <string name="error_login_failed">Loading data failed. Please try again later</string>
-    <string name="error_password_change_required">Register password change required</string>
-    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
-    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
-    <string name="error_unknown_app">Unknown application error. Please try again later</string>
-    <string name="error_unknown">An unexpected error occurred</string>
-    <string name="error_feature_disabled">Feature disabled by your school</string>
-    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
-    <string name="error_field_required">This field is required</string>
-</resources>

app/src/main/res/values-it-rIT/strings.xml

@@ -1,764 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Login</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Grades</string>
-    <string name="attendance_title">Attendance</string>
-    <string name="exam_title">Exams</string>
-    <string name="timetable_title">Timetable</string>
-    <string name="settings_title">Settings</string>
-    <string name="more_title">More</string>
-    <string name="about_title">About</string>
-    <string name="logviewer_title">Log viewer</string>
-    <string name="debug_title">Debug</string>
-    <string name="notification_debug_title">Notification debug</string>
-    <string name="contributors_title">Contributors</string>
-    <string name="license_title">Licenses</string>
-    <string name="message_title">Messages</string>
-    <string name="send_message_title">New message</string>
-    <string name="add_homework_title">New homework</string>
-    <string name="note_title">Notes and achievements</string>
-    <string name="homework_title">Homework</string>
-    <string name="account_title">Accounts manager</string>
-    <string name="account_quick_title">Select account</string>
-    <string name="account_details_title">Account details</string>
-    <string name="student_info_title">Student info</string>
-    <string name="dashboard_title">Dashboard</string>
-    <string name="notifications_center_title">Notifications center</string>
-    <string name="menu_order_title">Menu configuartion</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
-    <!--Login-->
-    <string name="login_header_default">Sign in with the student or parent account</string>
-    <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</string>
-    <string name="login_nickname_hint">Username</string>
-    <string name="login_email_hint">Email</string>
-    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
-    <string name="login_password_hint">Password</string>
-    <string name="login_host_hint">UONET+ register variant</string>
-    <string name="login_domain_suffix_hint">Custom domain suffix</string>
-    <string name="login_type_api">Mobile API</string>
-    <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hybrid</string>
-    <string name="login_token_hint">Token</string>
-    <string name="login_pin_hint">PIN</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
-    <string name="login_sign_in">Sign in</string>
-    <string name="login_invalid_password">Password too short</string>
-    <string name="login_incorrect_password_default">Login details are incorrect</string>
-    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</string>
-    <string name="login_invalid_pin">Invalid PIN</string>
-    <string name="login_invalid_token">Invalid token</string>
-    <string name="login_expired_token">Token expired</string>
-    <string name="login_invalid_email">Invalid email</string>
-    <string name="login_invalid_login">Use the assigned login instead of email</string>
-    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
-    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
-    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
-    <string name="login_duplicate_student">Selected student is already logged in</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
-    <string name="login_select_student">Select students to log in to the application</string>
-    <string name="login_advanced">Other options</string>
-    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
-    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
-    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</string>
-    <string name="login_privacy_policy">Privacy policy</string>
-    <string name="login_contact_header">Trouble signing in? Contact us!</string>
-    <string name="login_contact_email">Email</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Send email</string>
-    <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">Reset password</string>
-    <string name="login_recover_title">Recover your account</string>
-    <string name="login_recover">Recover</string>
-    <string name="login_signed_in">Student is already signed in</string>
-    <string name="login_host_standard">Standard</string>
-    <string name="login_other_search_locations">Other search locations</string>
-    <string name="login_no_active_student">No active students found</string>
-    <string name="login_symbol_enter">Enter a different symbol</string>
-    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name with the town (required)</string>
-    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
-    <string name="login_support_school_invalid">Enter correct name of the school</string>
-    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
-    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
-    <string name="login_support_submit">Submit</string>
-    <!--Notifications-->
-    <string name="notifications_header_title">Enable notifications</string>
-    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
-    <string name="notifications_skip">Skip</string>
-    <string name="notifications_enable">Enable</string>
-    <!--Main-->
-    <string name="main_account_picker">Account manager</string>
-    <string name="main_log_in">Log in</string>
-    <string name="main_session_expired">Session expired</string>
-    <string name="main_session_relogin">Session expired, log in again</string>
-    <string name="main_support_title">Application support</string>
-    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
-    <string name="main_support_positive">Enable ads</string>
-    <!--Grade-->
-    <string name="grade_header">Grade</string>
-    <string name="grade_semester">Semester %d</string>
-    <string name="grade_switch_semester">Change semester</string>
-    <string name="grade_no_items">No grades</string>
-    <string name="grade_weight">Weight</string>
-    <string name="grade_weight_value">Weight: %s</string>
-    <string name="grade_comment">Comment</string>
-    <string name="grade_number_new_items">Number of new ratings: %1$d</string>
-    <string name="grade_average">Average: %1$.2f</string>
-    <string name="grade_points_sum">Points: %s</string>
-    <string name="grade_no_average">No average</string>
-    <string name="grade_summary_points">Total points</string>
-    <string name="grade_summary_final_grade">Final grade</string>
-    <string name="grade_summary_predicted_grade">Predicted grade</string>
-    <string name="grade_summary_calculated_average">Calculated average</string>
-    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
-    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
-    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
-    <string name="grade_summary_final_average">Final average</string>
-    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
-    <string name="grade_menu_summary">Summary</string>
-    <string name="grade_menu_statistics">Class</string>
-    <string name="grade_menu_read">Mark as read</string>
-    <string name="grade_statistics_partial">Partial</string>
-    <string name="grade_statistics_semester">Semester</string>
-    <string name="grade_statistics_points">Points</string>
-    <string name="grade_statistics_legend">Legend</string>
-    <string name="grade_statistics_class_average">Class average: %1$s</string>
-    <string name="grade_statistics_student_average">Your average: %1$s</string>
-    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
-    <string name="grade_statistics_average_class">Class</string>
-    <string name="grade_statistics_average_student">Student</string>
-    <plurals name="grade_number_item">
-        <item quantity="one">%d grade</item>
-        <item quantity="other">%d grades</item>
-    </plurals>
-    <plurals name="grade_new_items">
-        <item quantity="one">New grade</item>
-        <item quantity="other">New grades</item>
-    </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
-        <item quantity="other">New predicted grades</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
-        <item quantity="other">New final grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items">
-        <item quantity="one">You received %1$d grade</item>
-        <item quantity="other">You received %1$d grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">You received %1$d predicted grade</item>
-        <item quantity="other">You received %1$d predicted grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">You received %1$d final grade</item>
-        <item quantity="other">You received %1$d final grades</item>
-    </plurals>
-    <!--Timetable-->
-    <string name="timetable_lesson">Lesson</string>
-    <string name="timetable_room">Room</string>
-    <string name="timetable_group">Group</string>
-    <string name="timetable_time">Hours</string>
-    <string name="timetable_changes">Changes</string>
-    <string name="timetable_no_items">No lessons this day</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sec</string>
-    <string name="timetable_time_left">%1$s left</string>
-    <string name="timetable_time_until">in %1$s</string>
-    <string name="timetable_finished">Finished</string>
-    <string name="timetable_now">Now: %s</string>
-    <string name="timetable_next">Next: %s</string>
-    <string name="timetable_later">Later: %s</string>
-    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
-    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
-    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
-    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
-    <plurals name="timetable_no_lesson">
-        <item quantity="one">No lesson</item>
-        <item quantity="other">No lessons</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items_title">
-        <item quantity="one">Timetable change</item>
-        <item quantity="other">Timetable changes</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items">
-        <item quantity="one">%1$s - %2$d change in timetable</item>
-        <item quantity="other">%1$s - %2$d  changes in timetable</item>
-    </plurals>
-    <plurals name="timetable_notify_new_items_group">
-        <item quantity="one">%1$d change in timetable</item>
-        <item quantity="other">%1$d changes in timetable</item>
-    </plurals>
-    <plurals name="timetable_number_item">
-        <item quantity="one">%d change</item>
-        <item quantity="other">%d changes</item>
-    </plurals>
-    <!--Completed lessons-->
-    <string name="completed_lessons_title">Completed lessons</string>
-    <string name="completed_lessons_button">Show completed lessons</string>
-    <string name="completed_lessons_no_items">No info about completed lessons</string>
-    <string name="completed_lessons_topic">Topic</string>
-    <string name="completed_lessons_absence">Absence</string>
-    <string name="completed_lessons_resources">Resources</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Additional lessons</string>
-    <string name="additional_lessons_button">Show additional lessons</string>
-    <string name="additional_lessons_no_items">No info about additional lessons</string>
-    <string name="additional_lessons_add">New lesson</string>
-    <string name="additional_lessons_add_title">New additional lesson</string>
-    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
-    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
-    <string name="additional_lessons_repeat">Repeat weekly</string>
-    <string name="additional_lessons_delete_title">Delete additional lesson</string>
-    <string name="additional_lessons_delete_one">Just this lesson</string>
-    <string name="additional_lessons_delete_series">All in the series</string>
-    <string name="additional_lessons_start">Start time</string>
-    <string name="additional_lessons_end">End time</string>
-    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
-    <!--Attendance-->
-    <string name="attendance_summary_button">Attendance summary</string>
-    <string name="attendance_absence_school">Absent for school reasons</string>
-    <string name="attendance_absence_excused">Excused absence</string>
-    <string name="attendance_absence_unexcused">Unexcused absence</string>
-    <string name="attendance_exemption">Exemption</string>
-    <string name="attendance_excused_lateness">Excused lateness</string>
-    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
-    <string name="attendance_present">Present</string>
-    <string name="attendance_deleted">Deleted</string>
-    <string name="attendance_unknown">Unknown</string>
-    <string name="attendance_number">Number of lesson</string>
-    <string name="attendance_no_items">No entries</string>
-    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
-    <string name="attendance_excuse_dialog_submit">Send</string>
-    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
-    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
-    <string name="attendance_excuse_title">Excuse</string>
-    <plurals name="attendance_notify_new_items_title">
-        <item quantity="one">New attendance</item>
-        <item quantity="other">New attendance</item>
-    </plurals>
-    <plurals name="attendance_notify_new_items">
-        <item quantity="one">%1$d new attendance</item>
-        <item quantity="other">%1$d attendance</item>
-    </plurals>
-    <plurals name="attendance_number_item">
-        <item quantity="one">%d attendance</item>
-        <item quantity="other">%d attendance</item>
-    </plurals>
-    <!--Attendance summary-->
-    <string name="attendance_summary_total">Total</string>
-    <!--Exam-->
-    <string name="exam_no_items">No exams this week</string>
-    <string name="exam_type">Type</string>
-    <string name="exam_entry_date">Entry date</string>
-    <plurals name="exam_notify_new_item_title">
-        <item quantity="one">New exam</item>
-        <item quantity="other">New exams</item>
-    </plurals>
-    <plurals name="exam_notify_new_item_content">
-        <item quantity="one">%d new exam</item>
-        <item quantity="other">%d new exams</item>
-    </plurals>
-    <plurals name="exam_number_item">
-        <item quantity="one">%d exam</item>
-        <item quantity="other">%d exams</item>
-    </plurals>
-    <!--Message-->
-    <string name="message_inbox">Inbox</string>
-    <string name="message_sent">Sent</string>
-    <string name="message_trash">Trash</string>
-    <string name="message_no_subject">(no subject)</string>
-    <string name="message_no_items">No messages</string>
-    <string name="message_from">From:</string>
-    <string name="message_to">To:</string>
-    <string name="message_date">Date: %1$s</string>
-    <string name="message_reply">Reply</string>
-    <string name="message_forward">Forward</string>
-    <string name="message_select_all">Select all</string>
-    <string name="message_unselect_all">Unselect all</string>
-    <string name="message_move_to_trash">Move to trash</string>
-    <string name="message_delete_forever">Delete permanently</string>
-    <string name="message_delete_success">Message deleted successfully</string>
-    <string name="message_mailbox_type_student">student</string>
-    <string name="message_mailbox_type_parent">parent</string>
-    <string name="message_mailbox_type_guardian">guardian</string>
-    <string name="message_mailbox_type_employee">employee</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
-    <string name="message_subject">Subject</string>
-    <string name="message_content">Content</string>
-    <string name="message_send_successful">Message sent successfully</string>
-    <string name="message_not_exists">Message does not exist</string>
-    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
-    <string name="message_content_min_length">The message content must be at least 3 characters</string>
-    <string name="message_chip_all_mailboxes">All mailboxes</string>
-    <string name="message_chip_only_unread">Only unread</string>
-    <string name="message_chip_only_with_attachments">Only with attachments</string>
-    <string name="message_read">Read: %s</string>
-    <string name="message_read_by">Read by: %1$d of %2$d people</string>
-    <plurals name="message_number_item">
-        <item quantity="one">%1$d message</item>
-        <item quantity="other">%1$d messages</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one">New message</item>
-        <item quantity="other">New messages</item>
-    </plurals>
-    <string name="message_restore_dialog">Do you want to restore draft message?</string>
-    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">You received %1$d message</item>
-        <item quantity="other">You received %1$d messages</item>
-    </plurals>
-    <plurals name="message_selected_messages_count">
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
-    <string name="message_messages_deleted">Messages deleted</string>
-    <string name="message_mailbox_chooser_title">Choose mailbox</string>
-    <string name="message_incognito_mode_on">Incognito mode is on</string>
-    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
-    <!--Note-->
-    <string name="note_no_items">No info about notes</string>
-    <string name="note_points">Points</string>
-    <plurals name="note_number_item">
-        <item quantity="one">%d note</item>
-        <item quantity="other">%d notes</item>
-    </plurals>
-    <plurals name="note_new_items">
-        <item quantity="one">New note</item>
-        <item quantity="other">New notes</item>
-    </plurals>
-    <plurals name="note_notify_new_items">
-        <item quantity="one">You received %1$d note</item>
-        <item quantity="other">You received %1$d notes</item>
-    </plurals>
-    <!--Praise-->
-    <plurals name="praise_number_item">
-        <item quantity="one">%d praise</item>
-        <item quantity="other">%d praises</item>
-    </plurals>
-    <plurals name="praise_new_items">
-        <item quantity="one">New praise</item>
-        <item quantity="other">New praises</item>
-    </plurals>
-    <plurals name="praise_notify_new_items">
-        <item quantity="one">You received %1$d praise</item>
-        <item quantity="other">You received %1$d praises</item>
-    </plurals>
-    <!--Neutral notes-->
-    <plurals name="neutral_note_number_item">
-        <item quantity="one">%d neutral note</item>
-        <item quantity="other">%d neutral notes</item>
-    </plurals>
-    <plurals name="neutral_note_new_items">
-        <item quantity="one">New neutral note</item>
-        <item quantity="other">New neutral notes</item>
-    </plurals>
-    <plurals name="neutral_note_notify_new_items">
-        <item quantity="one">You received %1$d neutral note</item>
-        <item quantity="other">You received %1$d neutral notes</item>
-    </plurals>
-    <!--Homework-->
-    <string name="homework_no_items">No info about homework</string>
-    <string name="homework_mark_as_done">Mark as done</string>
-    <string name="homework_mark_as_undone">Mark as undone</string>
-    <string name="homework_add">Add homework</string>
-    <string name="homework_add_success">Homework added successfully</string>
-    <string name="homework_delete_success">Homework deleted successfully</string>
-    <string name="homework_attachments">Attachments</string>
-    <plurals name="homework_notify_new_item_title">
-        <item quantity="one">New homework</item>
-        <item quantity="other">New homework</item>
-    </plurals>
-    <plurals name="homework_notify_new_item_content">
-        <item quantity="one">You received %d new homework</item>
-        <item quantity="other">You received %d new homework</item>
-    </plurals>
-    <plurals name="homework_number_item">
-        <item quantity="one">%d homework</item>
-        <item quantity="other">%d homework</item>
-    </plurals>
-    <!--Lucky number-->
-    <string name="lucky_number_title">Lucky number</string>
-    <string name="lucky_number_header">Today\'s lucky number is</string>
-    <string name="lucky_number_empty">No info about the lucky number</string>
-    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
-    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
-    <string name="lucky_number_history_button">Show history</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Lucky number history</string>
-    <string name="lucky_number_history_empty">No info about lucky numbers</string>
-    <!--Mobile devices-->
-    <string name="mobile_devices_title">Mobile devices</string>
-    <string name="mobile_devices_no_items">No devices</string>
-    <string name="mobile_devices_unregister">Deregister</string>
-    <string name="mobile_device_removed">Device removed</string>
-    <string name="mobile_device_qr">QR code</string>
-    <string name="mobile_device_token">Token</string>
-    <string name="mobile_device_symbol">Symbol</string>
-    <string name="mobile_device_pin">PIN</string>
-    <!--School and teachers-->
-    <string name="schoolandteachers_title">School and teachers</string>
-    <!--School-->
-    <string name="school_title">School</string>
-    <string name="school_no_info">No info about school</string>
-    <string name="school_name">School name</string>
-    <string name="school_address">School address</string>
-    <string name="school_telephone">Telephone</string>
-    <string name="school_headmaster">Name of headmaster</string>
-    <string name="school_pedagogue">Name of pedagogue</string>
-    <string name="school_address_button">Show on map</string>
-    <string name="school_telephone_button">Call</string>
-    <!--Teacher-->
-    <string name="teachers_title">Teachers</string>
-    <string name="teacher_no_items">No info about teachers</string>
-    <string name="teacher_no_subject">No subject</string>
-    <!--Conference-->
-    <string name="conferences_title">Conferences</string>
-    <string name="conference_no_items">No info about conferences</string>
-    <plurals name="conference_number_item">
-        <item quantity="one">%d conference</item>
-        <item quantity="other">%d conferences</item>
-    </plurals>
-    <plurals name="conference_notify_new_item_title">
-        <item quantity="one">New conference</item>
-        <item quantity="other">New conferences</item>
-    </plurals>
-    <plurals name="conference_notify_new_items">
-        <item quantity="one">You have %1$d new conference</item>
-        <item quantity="other">You have %1$d new conferences</item>
-    </plurals>
-    <string name="conferences_present">Present at conference</string>
-    <string name="conference_agenda">Agenda</string>
-    <string name="conference_place">Place</string>
-    <string name="conference_topic">Topic</string>
-    <!--Director information-->
-    <string name="school_announcement_title">School announcements</string>
-    <string name="school_announcement_no_items">No school announcements</string>
-    <plurals name="school_announcement_number_item">
-        <item quantity="one">%d school announcement</item>
-        <item quantity="other">%d school announcements</item>
-    </plurals>
-    <plurals name="school_announcement_notify_new_item_title">
-        <item quantity="one">New school announcement</item>
-        <item quantity="other">New school announcements</item>
-    </plurals>
-    <plurals name="school_announcement_notify_new_items">
-        <item quantity="one">You have %1$d new school announcement</item>
-        <item quantity="other">You have %1$d new school announcements</item>
-    </plurals>
-    <!--Account-->
-    <string name="account_add_new">Add account</string>
-    <string name="account_logout">Logout</string>
-    <string name="account_confirm">Do you want to log out this student?</string>
-    <string name="account_logout_student">Student logout</string>
-    <string name="account_type_student">Student account</string>
-    <string name="account_type_parent">Parent account</string>
-    <string name="account_details_edit">Edit data</string>
-    <string name="account_quick_manager">Accounts manager</string>
-    <string name="account_select_student">Select student</string>
-    <string name="account_family">Family</string>
-    <string name="account_contact">Contact</string>
-    <string name="account_address">Residence details</string>
-    <string name="account_personal_data">Personal information</string>
-    <!--About-->
-    <string name="about_version">App version</string>
-    <string name="about_contributor">Contributors</string>
-    <string name="about_contributor_summary">List of Wulkanowy developers</string>
-    <string name="about_feedback">Report a bug</string>
-    <string name="about_feedback_summary">Send a bug report via e-mail</string>
-    <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Read Frequently Asked Questions</string>
-    <string name="about_discord">Discord server</string>
-    <string name="about_discord_summary">Join the Wulkanowy community</string>
-    <string name="about_facebook">Facebook fanpage</string>
-    <string name="about_twitter">Twitter page</string>
-    <string name="about_twitter_summary">Follow us on twitter</string>
-    <string name="about_facebook_summary">Like our facebook fanpage</string>
-    <string name="about_privacy">Privacy policy</string>
-    <string name="about_privacy_summary">Rules for collecting personal data</string>
-    <string name="about_system">System settings</string>
-    <string name="about_system_summary">Open system settings</string>
-    <string name="about_homepage">Homepage</string>
-    <string name="about_homepage_summary">Visit the website and help develop the application</string>
-    <string name="about_licenses">Licenses</string>
-    <string name="about_licenses_summary">Licenses of libraries used in the application</string>
-    <!--Licenses-->
-    <string name="license_dialog_title">License</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Avatar</string>
-    <string name="contributor_see_more">See more on GitHub</string>
-    <!--Student info-->
-    <string name="student_info_empty">No info about student or student family</string>
-    <string name="student_info_first_name">Name</string>
-    <string name="student_info_second_name">Second name</string>
-    <string name="student_info_gender">Gender</string>
-    <string name="student_info_polish_citizenship">Polish citizenship</string>
-    <string name="student_info_family_name">Family name</string>
-    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
-    <string name="student_info_phone">Phone</string>
-    <string name="student_info_cellphone">Cellphone</string>
-    <string name="student_info_email">E-mail</string>
-    <string name="student_info_address">Address of residence</string>
-    <string name="student_info_registered_address">Address of registration</string>
-    <string name="student_info_correspondence_address">Correspondence address</string>
-    <string name="student_info_full_name">Surname and first name</string>
-    <string name="student_info_kinship">Degree of kinship</string>
-    <string name="student_info_guardian_address">Address</string>
-    <string name="student_info_phones">Phones</string>
-    <string name="student_info_male">Male</string>
-    <string name="student_info_female">Female</string>
-    <string name="student_info_last_name">Last name</string>
-    <string name="student_info_guardian">Guardian</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Nick</string>
-    <string name="account_edit_header">Add nick</string>
-    <string name="account_edit_avatar_title">Choose avatar color</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Share logs</string>
-    <string name="logviewer_refresh">Refresh</string>
-    <!--Dashboard-->
-    <string name="dashboard_timetable_title">Lessons</string>
-    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
-    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
-    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
-    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
-    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
-    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
-    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
-    <string name="dashboard_timetable_second_lessons_title">Next:</string>
-    <string name="dashboard_timetable_third_title">Later:</string>
-    <plurals name="dashboard_timetable_third_value">
-        <item quantity="one">%1$d more lesson</item>
-        <item quantity="other">%1$d more lessons</item>
-    </plurals>
-    <string name="dashboard_timetable_third_time">until %1$s</string>
-    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
-    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
-    <string name="dashboard_homework_title">Homework</string>
-    <string name="dashboard_homework_no_homework">No homework to do</string>
-    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
-    <plurals name="dashboard_homework_more">
-        <item quantity="one">%1$d more homework</item>
-        <item quantity="other">%1$d more homework</item>
-    </plurals>
-    <string name="dashboard_homework_time">due %1$s</string>
-    <string name="dashboard_grade_title">Last grades</string>
-    <string name="dashboard_grade_no_grade">No new grades</string>
-    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
-    <string name="dashboard_announcements_title">School announcements</string>
-    <string name="dashboard_announcements_no_announcements">No current announcements</string>
-    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
-    <plurals name="dashboard_announcements_more">
-        <item quantity="one">%1$d more announcement</item>
-        <item quantity="other">%1$d more announcements</item>
-    </plurals>
-    <string name="dashboard_exams_title">Exams</string>
-    <string name="dashboard_exams_no_exams">No upcoming exams</string>
-    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
-    <plurals name="dashboard_exams_more">
-        <item quantity="one">%1$d more exam</item>
-        <item quantity="other">%1$d more exams</item>
-    </plurals>
-    <string name="dashboard_conferences_title">Conferences</string>
-    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
-    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
-    <plurals name="dashboard_conference_more">
-        <item quantity="one">%1$d more conference</item>
-        <item quantity="other">%1$d more conferences</item>
-    </plurals>
-    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
-    <string name="dashboard_horizontal_group_no_data">None</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Check for updates</string>
-    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
-    <!--Generic-->
-    <string name="all_content">Content</string>
-    <string name="all_retry">Retry</string>
-    <string name="all_description">Description</string>
-    <string name="all_no_description">No description</string>
-    <string name="all_teacher">Teacher</string>
-    <string name="all_date">Date</string>
-    <string name="all_entry_date">Entry date</string>
-    <string name="all_color">Color</string>
-    <string name="all_details">Details</string>
-    <string name="all_category">Category</string>
-    <string name="all_close">Close</string>
-    <string name="all_no_data">No data</string>
-    <string name="all_subject">Subject</string>
-    <string name="all_prev">Prev</string>
-    <string name="all_next">Next</string>
-    <string name="all_search">Search</string>
-    <string name="all_search_hint">Search…</string>
-    <string name="all_yes">Yes</string>
-    <string name="all_no">No</string>
-    <string name="all_save">Save</string>
-    <string name="all_title">Title</string>
-    <string name="all_add">Add</string>
-    <string name="all_copied">Copied</string>
-    <string name="all_undo">Undo</string>
-    <string name="all_change">Change</string>
-    <string name="all_add_to_calendar">Add to calendar</string>
-    <string name="all_cancel">Cancel</string>
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">No lessons</string>
-    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
-    <string name="widget_timetable_theme_title">Choose theme</string>
-    <string name="widget_timetable_theme_light">Light</string>
-    <string name="widget_timetable_theme_dark">Dark</string>
-    <string name="widget_timetable_theme_system">System Theme</string>
-    <!--Preferences-->
-    <string name="pref_view_header">App</string>
-    <string name="pref_view_list">Default view</string>
-    <string name="pref_view_grade_average_mode">Calculated average options</string>
-    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
-    <string name="pref_view_present">Show presence</string>
-    <string name="pref_view_app_theme">Theme</string>
-    <string name="pref_view_expand_grade">Grades expanding</string>
-    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
-    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
-    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
-    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
-    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
-    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
-    <string name="pref_view_app_language">Language</string>
-    <string name="pref_view_menu_order_title">Menu configuration</string>
-    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
-    <string name="pref_notify_header">Notifications</string>
-    <string name="pref_notify_header_other">Other</string>
-    <string name="pref_notify_switch">Show notifications</string>
-    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
-    <string name="pref_notify_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
-    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
-    <string name="pref_notify_open_system_settings">Open system notification settings</string>
-    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
-    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
-    <string name="pref_notify_debug_switch">Show debug notifications</string>
-    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
-    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
-    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
-    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
-    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
-    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
-    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
-    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
-    <string name="pref_notification_go_to_settings">Go to settings</string>
-    <string name="pref_services_header">Synchronization</string>
-    <string name="pref_services_switch">Automatic update</string>
-    <string name="pref_services_suspended">Suspended on holidays</string>
-    <string name="pref_services_interval">Updates interval</string>
-    <string name="pref_services_wifi">Wi-Fi only</string>
-    <string name="pref_services_force_sync">Sync now</string>
-    <string name="pref_services_message_sync_success">Synced!</string>
-    <string name="pref_services_message_sync_failed">Sync failed</string>
-    <string name="pref_services_sync_in_progress">Sync in progress</string>
-    <string name="pref_services_last_full_sync_date">Last full sync: %s</string>
-    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
-    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
-    <string name="pref_other_fill_message_content">Reply with message history</string>
-    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
-    <string name="pref_other_incognito_mode">Incognito mode</string>
-    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
-    <string name="pref_ads_support_category_name">Support</string>
-    <string name="pref_ads_privacy_policy">Privacy Policy</string>
-    <string name="pref_ads_agreements">Agreements</string>
-    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
-    <string name="pref_ads_show_in_app">Show ads in app</string>
-    <string name="pref_ads_support">Watch single ad to support project</string>
-    <string name="pref_ads_privacy_title">Consent to data processing</string>
-    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
-    <string name="pref_ads_privacy_agree">Agree</string>
-    <string name="pref_ads_privacy_link">Privacy policy</string>
-    <string name="pref_ads_loading">Ad is loading</string>
-    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
-    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
-    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
-    <string name="pref_ads_summary_personalized">Personalized ads</string>
-    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
-    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
-    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
-    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
-    <string name="pref_settings_advanced_title">Advanced</string>
-    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
-    <string name="pref_settings_notifications_title">Notifications</string>
-    <string name="pref_settings_sync_title">Synchronization</string>
-    <string name="pref_settings_ads_title">Advertisements</string>
-    <string name="pref_grades_appearance_header">Grades</string>
-    <string name="pref_dashboard_appearance_header">Dashboard</string>
-    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
-    <string name="pref_attendance_appearance_view">Attendance</string>
-    <string name="pref_timetable_appearance_view">Timetable</string>
-    <string name="pref_grades_advanced_header">Grades</string>
-    <string name="pref_counted_average_advanced_header">Calculated average</string>
-    <string name="pref_messages_advanced_header">Messages</string>
-    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
-    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
-    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
-    <string name="pref_notifications_category">Notifications</string>
-    <string name="pref_sync_category">Synchronization</string>
-    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
-    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
-    <string name="pref_advanced_category">Advanced</string>
-    <string name="pref_about_category_summary">App version, contributors, social portals</string>
-    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
-    <!--Notification Channels-->
-    <string name="channel_new_grades">New grades</string>
-    <string name="channel_new_homework">New homework</string>
-    <string name="channel_new_conference">New conferences</string>
-    <string name="channel_new_exam">New exams</string>
-    <string name="channel_lucky_number">Lucky number</string>
-    <string name="channel_new_message">New messages</string>
-    <string name="channel_new_notes">New notes</string>
-    <string name="channel_new_school_announcement">New school announcements</string>
-    <string name="channel_push">Push notifications</string>
-    <string name="channel_upcoming_lessons">Upcoming lessons</string>
-    <string name="channel_debug">Debug</string>
-    <string name="channel_change_timetable">Timetable change</string>
-    <string name="channel_new_attendance">New attendance</string>
-    <!--Colors-->
-    <string name="all_black">Black</string>
-    <string name="all_red">Red</string>
-    <string name="all_blue">Blue</string>
-    <string name="all_green">Green</string>
-    <string name="all_purple">Purple</string>
-    <string name="all_empty_color">No color</string>
-    <!--Update helper-->
-    <string name="update_download_started">Download of updates has started…</string>
-    <string name="update_download_success">An update has just been downloaded.</string>
-    <string name="update_download_success_button">Restart</string>
-    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
-    <!--Menu order-->
-    <string name="menu_order_confirm_title">Application restart</string>
-    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
-    <string name="menu_order_confirm_restart">Restart</string>
-    <!--Auth-->
-    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
-    <string name="auth_invalid_error">Invalid PESEL</string>
-    <string name="auth_pesel">PESEL</string>
-    <string name="auth_button">Authorize</string>
-    <string name="auth_success">Authorization completed successfully</string>
-    <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
-    <string name="auth_button_skip">Skip for now</string>
-    <!--Errors-->
-    <string name="error_no_internet">No internet connection</string>
-    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
-    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
-    <string name="error_login_failed">Loading data failed. Please try again later</string>
-    <string name="error_password_change_required">Register password change required</string>
-    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
-    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
-    <string name="error_unknown_app">Unknown application error. Please try again later</string>
-    <string name="error_unknown">An unexpected error occurred</string>
-    <string name="error_feature_disabled">Feature disabled by your school</string>
-    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
-    <string name="error_field_required">This field is required</string>
-</resources>

app/src/main/res/values-pl/strings.xml

@@ -13,6 +13,7 @@
     <string name="logviewer_title">Przeglądarka logów</string>
     <string name="debug_title">Debugowanie</string>
     <string name="notification_debug_title">Debugowanie powiadomień</string>
+    <string name="debug_cookies_clear">Wyczyść ciasteczka webview</string>
     <string name="contributors_title">Twórcy</string>
     <string name="license_title">Licencje</string>
     <string name="message_title">Wiadomości</string>
@@ -96,6 +97,8 @@
     <string name="main_log_in">Zaloguj się</string>
     <string name="main_session_expired">Sesja wygasła</string>
     <string name="main_session_relogin">Sesja wygasła, zaloguj się ponownie</string>
+    <string name="main_expired_credentials_description">Hasło do Twojego konta zostało zmienione. Musisz zalogować się ponownie do Wulkanowego</string>
+    <string name="main_expired_credentials_title">Hasło zostało zmienione</string>
     <string name="main_support_title">Wparcie aplikacji</string>
     <string name="main_support_description">Podoba Ci się ta aplikacja? Wspieraj jej rozwój poprzez włączenie nieinwazyjnych reklam, które możesz wyłączyć w dowolnym momencie</string>
     <string name="main_support_positive">Włącz reklamy</string>
@@ -760,7 +763,7 @@
     <string name="pref_ads_support_category_name">Wsparcie</string>
     <string name="pref_ads_privacy_policy">Polityka prywatności</string>
     <string name="pref_ads_agreements">Zgody</string>
-    <string name="pref_ads_consent">Zgoda na przetwarzanie danych związanych z reklamami</string>
+    <string name="pref_ads_consent">Pokaż zgodę na przetwarzanie danych</string>
     <string name="pref_ads_show_in_app">Pokazuj reklamy w aplikacji</string>
     <string name="pref_ads_support">Obejrzyj pojedynczą reklamę, aby wesprzeć projekt</string>
     <string name="pref_ads_privacy_title">Zgoda na przetwarzanie danych</string>
@@ -769,13 +772,6 @@
     <string name="pref_ads_privacy_link">Polityka prywatności</string>
     <string name="pref_ads_loading">Ładowanie reklamy</string>
     <string name="pref_ads_once_per_visit">Dziękujemy za wsparcie, wróć później po więcej reklam</string>
-    <string name="pref_ads_consent_title">Czy możemy używać Twoich danych do wyświetlania reklam?</string>
-    <string name="pref_ads_consent_description">Możesz zmienić swój wybór w dowolnym momencie w ustawieniach aplikacji. Możemy wykorzystać Twoje dane do wyświetlania reklam dostosowanych do Ciebie lub, przy użyciu mniejszej ilości danych, wyświetlić niepersonalizowane reklamy. Zobacz naszą Politykę Prywatności, aby uzyskać więcej informacji</string>
-    <string name="pref_ads_summary_personalized">Spersonalizowane reklamy</string>
-    <string name="pref_ads_summary_non_personalized">Niespersonalizowane reklamy</string>
-    <string name="pref_ads_over_18_years_old">Mam ukończone 18 lat</string>
-    <string name="pref_ads_option_personalized">Tak, spersonalizowane reklamy</string>
-    <string name="pref_ads_option_non_personalized">Tak, niespersonalizowane reklamy</string>
     <string name="pref_settings_advanced_title">Zaawansowane</string>
     <string name="pref_settings_appearance_title">Wygląd i zachowanie</string>
     <string name="pref_settings_notifications_title">Powiadomienia</string>
@@ -838,6 +834,9 @@
     <string name="auth_title">Autoryzacja</string>
     <string name="auth_description">Rodzicu, musimy mieć pewność, że Twój adres e-mail został powiązany z prawidłowym kontem ucznia. W celu autoryzacji konta podaj numer PESEL ucznia &lt;b&gt;%1$s&lt;/b&gt; w polu poniżej</string>
     <string name="auth_button_skip">Na razie pomiń</string>
+    <!--Captcha-->
+    <string name="captcha_dialog_title">Trwa weryfikacja. Czekaj…</string>
+    <string name="captcha_verified_message">Pomyślnie zweryfikowano</string>
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_invalid_device_datetime">Wystąpił błąd. Sprawdź poprawność daty w urządzeniu</string>
@@ -847,6 +846,7 @@
     <string name="error_service_unavailable">Trwa przerwa techniczna dziennika UONET+. Spróbuj ponownie później</string>
     <string name="error_unknown_uonet">Nieznany błąd dziennika UONET+. Spróbuj ponownie później</string>
     <string name="error_unknown_app">Nieznany błąd aplikacji. Spróbuj ponownie później</string>
+    <string name="error_cloudflare_captcha">Wymagana weryfikacja captcha</string>
     <string name="error_unknown">Wystąpił nieoczekiwany błąd</string>
     <string name="error_feature_disabled">Funkcja wyłączona przez szkołę</string>
     <string name="error_feature_not_available">Funkcja niedostępna. Zaloguj się w trybie innym niż Mobilne API</string>

app/src/main/res/values-ru/strings.xml

@@ -13,6 +13,7 @@
     <string name="logviewer_title">Просмотр журнала</string>
     <string name="debug_title">Отладка</string>
     <string name="notification_debug_title">Отладка уведомлений</string>
+    <string name="debug_cookies_clear">Clear webview cookies</string>
     <string name="contributors_title">Разработчики</string>
     <string name="license_title">Лицензии</string>
     <string name="message_title">Сообщения</string>
@@ -96,6 +97,8 @@
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
     <string name="main_session_relogin">Сеанс истёк, авторизуйтесь снова</string>
+    <string name="main_expired_credentials_description">Your account password has been changed. You need to log in to Wulkanowy again</string>
+    <string name="main_expired_credentials_title">Password changed</string>
     <string name="main_support_title">Поддержка приложения</string>
     <string name="main_support_description">Вам нравится это приложение? Поддержите его разработку, включив неинвазивную рекламу, которую можно отключить в любое время</string>
     <string name="main_support_positive">Включить рекламу</string>
@@ -760,7 +763,7 @@
     <string name="pref_ads_support_category_name">Поддержка</string>
     <string name="pref_ads_privacy_policy">Политика приватности</string>
     <string name="pref_ads_agreements">Соглашения</string>
-    <string name="pref_ads_consent">Согласие на обработку данных, связанных с объявлениями</string>
+    <string name="pref_ads_consent">Show consent to data processing</string>
     <string name="pref_ads_show_in_app">Показать рекламу в приложении</string>
     <string name="pref_ads_support">Посмотреть рекламу для поддержки проекта</string>
     <string name="pref_ads_privacy_title">Согласие на обработку данных</string>
@@ -769,13 +772,6 @@
     <string name="pref_ads_privacy_link">Политика конфиденциальности</string>
     <string name="pref_ads_loading">Реклама загружается</string>
     <string name="pref_ads_once_per_visit">Спасибо за вашу поддержку, возвращайтесь позже для дополнительной рекламы</string>
-    <string name="pref_ads_consent_title">Можем ли мы использовать ваши данные для показа рекламы?</string>
-    <string name="pref_ads_consent_description">Вы можете изменить свой выбор в любое время в настройках приложения. Мы можем использовать ваши данные для показа объявлений в соответствии с вашими пожеланиями или, используя меньше данных, отображать неперсональную рекламу. Пожалуйста, ознакомьтесь с нашей политикой конфиденциальности для подробностей</string>
-    <string name="pref_ads_summary_personalized">Персонализированная реклама</string>
-    <string name="pref_ads_summary_non_personalized">Неперсонализированная реклама</string>
-    <string name="pref_ads_over_18_years_old">Я старше 18 лет</string>
-    <string name="pref_ads_option_personalized">Да, персонализировать рекламу</string>
-    <string name="pref_ads_option_non_personalized">Да, не персонализировать рекламу</string>
     <string name="pref_settings_advanced_title">Расширенные</string>
     <string name="pref_settings_appearance_title">Внешний вид и поведение</string>
     <string name="pref_settings_notifications_title">Уведомления</string>
@@ -833,11 +829,14 @@
     <string name="auth_api_error">Авторизация отклонена. Предоставленные данные не соответствуют записям в кабинете секретаря.</string>
     <string name="auth_invalid_error">Неправильный номер PESEL</string>
     <string name="auth_pesel">Номер PESEL</string>
-    <string name="auth_button">Authorize</string>
+    <string name="auth_button">Авторизовать</string>
     <string name="auth_success">Авторизация прошла успешно</string>
     <string name="auth_title">Авторизация</string>
     <string name="auth_description">Для работы приложения нам необходимо подтвердить вашу личность. Введите PESEL учащегося &lt;b&gt;%1$s&lt;/b&gt; в поле ниже</string>
     <string name="auth_button_skip">Пропустить сейчас</string>
+    <!--Captcha-->
+    <string name="captcha_dialog_title">Verification is in progress. Wait…</string>
+    <string name="captcha_verified_message">Verified successfully</string>
     <!--Errors-->
     <string name="error_no_internet">Интернет-соединение отсутствует</string>
     <string name="error_invalid_device_datetime">Произошла ошибка. Проверьте время на вашем устройстве</string>
@@ -847,6 +846,7 @@
     <string name="error_service_unavailable">UONET+ проводит техническое обслуживание, повторите попытку позже</string>
     <string name="error_unknown_uonet">Неизвестная ошибка дневника UONET+, повторите попытку позже</string>
     <string name="error_unknown_app">Неизвестная ошибка приложения, повторите попытку позже</string>
+    <string name="error_cloudflare_captcha">Captcha verification required</string>
     <string name="error_unknown">Произошла непредвиденная ошибка</string>
     <string name="error_feature_disabled">Функция отключена вашей школой</string>
     <string name="error_feature_not_available">Функция недоступна в режиме Mobile API. Воспользуйтесь другим режимом</string>

app/src/main/res/values-sk/strings.xml

@@ -13,6 +13,7 @@
     <string name="logviewer_title">Prehliadač protokolov</string>
     <string name="debug_title">Ladenie</string>
     <string name="notification_debug_title">Ladenie oznámení</string>
+    <string name="debug_cookies_clear">Vymazať súbory cookie webview</string>
     <string name="contributors_title">Tvorcovia</string>
     <string name="license_title">Licencie</string>
     <string name="message_title">Správy</string>
@@ -96,6 +97,8 @@
     <string name="main_log_in">Prihlásiť sa</string>
     <string name="main_session_expired">Relácia vypršala</string>
     <string name="main_session_relogin">Relácia vypršala. Prihláste sa prosím znovu</string>
+    <string name="main_expired_credentials_description">Heslo k vášmu účtu bolo zmenené. Musíte sa znovu prihlásiť do Wulkanového</string>
+    <string name="main_expired_credentials_title">Heslo bolo zmenené</string>
     <string name="main_support_title">Podpora aplikácie</string>
     <string name="main_support_description">Páči sa Vám táto aplikácia? Podporte jej vývoj tým, že povolíte neinvazívne reklamy, ktoré môžete kedykoľvek vypnúť</string>
     <string name="main_support_positive">Zapnúť reklamy</string>
@@ -760,7 +763,7 @@
     <string name="pref_ads_support_category_name">Podpora</string>
     <string name="pref_ads_privacy_policy">Ochrana osobných údajov</string>
     <string name="pref_ads_agreements">Súhlasy</string>
-    <string name="pref_ads_consent">Súhlas so spracovaním údajov súvisiacich s reklamami</string>
+    <string name="pref_ads_consent">Zobraziť súhlas so spracovaním údajov</string>
     <string name="pref_ads_show_in_app">Zobraziť reklamy v aplikácii</string>
     <string name="pref_ads_support">Pozrite sa na jednu reklamu pre podporu projektu</string>
     <string name="pref_ads_privacy_title">Súhlas so spracovaním dát</string>
@@ -769,13 +772,6 @@
     <string name="pref_ads_privacy_link">Ochrana osobných údajov</string>
     <string name="pref_ads_loading">Reklama sa načítava</string>
     <string name="pref_ads_once_per_visit">Ďakujeme za vašu podporu, vráťte sa neskôr pre viac reklám</string>
-    <string name="pref_ads_consent_title">Môžeme použiť Vaše údaje na zobrazenie reklám?</string>
-    <string name="pref_ads_consent_description">Voľbu môžete kedykoľvek zmeniť v nastavení aplikácie. Môžeme použiť vaše údaje na zobrazenie reklám šitých pre vás alebo pomocou menej vašich dát zobrazovať neprispôsobené reklamy. Podrobnosti nájdete v našich Zásadách ochrany osobných údajov</string>
-    <string name="pref_ads_summary_personalized">Prispôsobené reklamy</string>
-    <string name="pref_ads_summary_non_personalized">Neprispôsobené reklamy</string>
-    <string name="pref_ads_over_18_years_old">Mám viac ako 18 rokov</string>
-    <string name="pref_ads_option_personalized">Áno, prispôsobené reklamy</string>
-    <string name="pref_ads_option_non_personalized">Áno, neprispôsobené reklamy</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhľad a správanie</string>
     <string name="pref_settings_notifications_title">Oznámenia</string>
@@ -838,6 +834,9 @@
     <string name="auth_title">Autorizácia</string>
     <string name="auth_description">Na prevádzku aplikácie potrebujeme potvrdiť vašu identitu. Zadajte PESEL žiaka &lt;b&gt;%1$s&lt;/b&gt; v nižšie uvedenom poli</string>
     <string name="auth_button_skip">Zatiaľ preskočiť</string>
+    <!--Captcha-->
+    <string name="captcha_dialog_title">Overovanie prebieha. Počkajte…</string>
+    <string name="captcha_verified_message">Úspešne overené</string>
     <!--Errors-->
     <string name="error_no_internet">Žiadne internetové pripojenie</string>
     <string name="error_invalid_device_datetime">Vyskytla sa chyba. Skontrolujte hodiny svojho zariadenia</string>
@@ -847,6 +846,7 @@
     <string name="error_service_unavailable">Prebieha údržba denníka UONET+. Skúste to neskôr znova</string>
     <string name="error_unknown_uonet">Neznáma chyba dennika UONET+. Prosím skúste to znova neskôr</string>
     <string name="error_unknown_app">Neznáma chyba aplikácie. Prosím skúste to znova neskôr</string>
+    <string name="error_cloudflare_captcha">Vyžaduje sa overenie Captcha</string>
     <string name="error_unknown">Vyskytla sa neočakávaná chyba</string>
     <string name="error_feature_disabled">Funkcia je deaktivovaná cez vašou školou</string>
     <string name="error_feature_not_available">Funkcia nie je k dispozícii. Prihláste sa v inom režime než Mobile API</string>

app/src/main/res/values-uk/strings.xml

@@ -13,6 +13,7 @@
     <string name="logviewer_title">Переглядач логів</string>
     <string name="debug_title">Відладка</string>
     <string name="notification_debug_title">Відладка сповіщень</string>
+    <string name="debug_cookies_clear">Очистити кукі веб - перегляду</string>
     <string name="contributors_title">Розробники</string>
     <string name="license_title">Ліцензії</string>
     <string name="message_title">Листи</string>
@@ -96,6 +97,8 @@
     <string name="main_log_in">Увійти</string>
     <string name="main_session_expired">Минув термін дії сесії</string>
     <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
+    <string name="main_expired_credentials_description">Your account password has been changed. You need to log in to Wulkanowy again</string>
+    <string name="main_expired_credentials_title">Password changed</string>
     <string name="main_support_title">Підтримка додатку</string>
     <string name="main_support_description">Вам подобається цей додаток? Підтримайте його розвиток, увімкнувши неінвазивну рекламу, яку ви можете відключити в будь-який час</string>
     <string name="main_support_positive">Увімкнути рекламу</string>
@@ -760,7 +763,7 @@
     <string name="pref_ads_support_category_name">Підтримка</string>
     <string name="pref_ads_privacy_policy">Політика конфіденційності</string>
     <string name="pref_ads_agreements">Угоди</string>
-    <string name="pref_ads_consent">Згода на обробку даних, пов\'язаних з рекламою</string>
+    <string name="pref_ads_consent">Показати згоду на обробку даних</string>
     <string name="pref_ads_show_in_app">Показувати рекламу в додатку</string>
     <string name="pref_ads_support">Подивіться одну рекламу для підтримки проєкту</string>
     <string name="pref_ads_privacy_title">Згода в обробці даних</string>
@@ -769,13 +772,6 @@
     <string name="pref_ads_privacy_link">Політика конфіденційності</string>
     <string name="pref_ads_loading">Реклама завантажується</string>
     <string name="pref_ads_once_per_visit">Дякуємо за вашу підтримку, повертайтеся пізніше для більшої кількості реклам</string>
-    <string name="pref_ads_consent_title">Чи можемо ми використовувати ваші дані для висвітлювання реклами?</string>
-    <string name="pref_ads_consent_description">Ви можете змінити свій вибір в будь-який час в налаштуваннях додатку. Ми можемо використовувати ваші дані для висвітлювання реклами, адаптованої до вас або, використовуючи менше ваших даних, висвітлювати неперсоналізовану рекламу. Перегляньте нашу Політику конфіденційності для подробиць</string>
-    <string name="pref_ads_summary_personalized">Персоналізована реклама</string>
-    <string name="pref_ads_summary_non_personalized">Неперсоналізована реклама</string>
-    <string name="pref_ads_over_18_years_old">Мені більше 18 років</string>
-    <string name="pref_ads_option_personalized">Так, персоналізована реклама</string>
-    <string name="pref_ads_option_non_personalized">Так, неперсоналізована реклама</string>
     <string name="pref_settings_advanced_title">Додатково</string>
     <string name="pref_settings_appearance_title">Вигляд та поведінка</string>
     <string name="pref_settings_notifications_title">Сповіщення</string>
@@ -838,6 +834,9 @@
     <string name="auth_title">Авторизувати</string>
     <string name="auth_description">Для роботи програми нам потрібно підтвердити вашу особу. Будь ласка, введіть число PESEL &lt;b&gt;%1$s&lt;/b&gt; студента в поле нижче</string>
     <string name="auth_button_skip">Поки що пропустити</string>
+    <!--Captcha-->
+    <string name="captcha_dialog_title">Верифікація в процесі. Чекайте…</string>
+    <string name="captcha_verified_message">Верифікація завершена</string>
     <!--Errors-->
     <string name="error_no_internet">Немає з\'єднання з інтернетом</string>
     <string name="error_invalid_device_datetime">Сталася помилка. Перевірте годинник пристрою</string>
@@ -847,6 +846,7 @@
     <string name="error_service_unavailable">UONET+ проводить технічне осблуговування, спробуйте пізніше</string>
     <string name="error_unknown_uonet">Невідома помилка щоденника UONET+, спробуйте пізніше</string>
     <string name="error_unknown_app">Невідома помилка програми, спробуйте пізніше</string>
+    <string name="error_cloudflare_captcha">Необхідна перевірка Captcha</string>
     <string name="error_unknown">Відбулася несподівана помилка</string>
     <string name="error_feature_disabled">Функція вимкнена вашою школою</string>
     <string name="error_feature_not_available">Функція недоступна в режимі Mobile API. Увійдіть в інший режим</string>

app/src/main/res/values/preferences_keys.xml

@@ -37,8 +37,7 @@
     <string name="pref_key_ads_single_support">single_ad_support</string>
     <string name="pref_key_ads_enabled">ads_enabled</string>
     <string name="pref_key_ads_privacy_policy">ads_privacy_policy</string>
-    <string name="pref_key_ads_consent_data_processing">ads_consent_data_processing</string>
+    <string name="pref_key_ads_ump_agreements">ads_ump_agreements</string>
-    <string name="pref_key_ads_over_eighteen">ads_over_eighteen</string>
     <string name="pref_key_incognito_moge">incognito_mode</string>
     <string name="pref_key_menu_order">appearance_menu_order</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -14,6 +14,7 @@
     <string name="logviewer_title">Log viewer</string>
     <string name="debug_title">Debug</string>
     <string name="notification_debug_title">Notification debug</string>
+    <string name="debug_cookies_clear">Clear webview cookies</string>
     <string name="contributors_title">Contributors</string>
     <string name="license_title">Licenses</string>
     <string name="message_title">Messages</string>
@@ -107,6 +108,8 @@
     <string name="main_log_in">Log in</string>
     <string name="main_session_expired">Session expired</string>
     <string name="main_session_relogin">Session expired, log in again</string>
+    <string name="main_expired_credentials_description">Your account password has been changed. You need to log in to Wulkanowy again</string>
+    <string name="main_expired_credentials_title">Password changed</string>
     <string name="main_support_title">Application support</string>
     <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
     <string name="main_support_positive">Enable ads</string>
@@ -749,7 +752,7 @@
     <string name="pref_ads_support_category_name">Support</string>
     <string name="pref_ads_privacy_policy">Privacy Policy</string>
     <string name="pref_ads_agreements">Agreements</string>
-    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_consent">Show consent to data processing</string>
     <string name="pref_ads_show_in_app">Show ads in app</string>
     <string name="pref_ads_support">Watch single ad to support project</string>
     <string name="pref_ads_privacy_title">Consent to data processing</string>
@@ -758,13 +761,6 @@
     <string name="pref_ads_privacy_link">Privacy policy</string>
     <string name="pref_ads_loading">Ad is loading</string>
     <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
-    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
-    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
-    <string name="pref_ads_summary_personalized">Personalized ads</string>
-    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
-    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
-    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
-    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
     <string name="pref_settings_advanced_title">Advanced</string>
     <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
     <string name="pref_settings_notifications_title">Notifications</string>
@@ -838,6 +834,11 @@
     <string name="auth_button_skip">Skip for now</string>
 
 
+    <!--Captcha-->
+    <string name="captcha_dialog_title">Verification is in progress. Wait…</string>
+    <string name="captcha_verified_message">Verified successfully</string>
+
+
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
@@ -847,6 +848,7 @@
     <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
     <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
     <string name="error_unknown_app">Unknown application error. Please try again later</string>
+    <string name="error_cloudflare_captcha">Captcha verification required</string>
     <string name="error_unknown">An unexpected error occurred</string>
     <string name="error_feature_disabled">Feature disabled by your school</string>
     <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>

app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt

@@ -2,19 +2,17 @@ package io.github.wulkanowy.ui.modules.settings.ads
 
 import android.os.Bundle
 import android.view.View
-import androidx.preference.CheckBoxPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.DialogAdsConsentBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
@@ -24,6 +22,9 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
     @Inject
     lateinit var presenter: AdsPresenter
 
+    @Inject
+    lateinit var adsHelper: AdsHelper
+
     override val titleStringId = R.string.pref_settings_ads_title
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -46,11 +47,18 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
             true
         }
 
-        findPreference<CheckBoxPreference>(getString(R.string.pref_key_ads_consent_data_processing))
+        findPreference<Preference>(getString(R.string.pref_key_ads_ump_agreements))?.setOnPreferenceClickListener {
-            ?.setOnPreferenceChangeListener { _, newValue ->
+            presenter.onUmpAgreementsSelected()
-                presenter.onConsentSelected(newValue as Boolean)
+            true
-                true
+        }
-            }
+
+        findPreference<Preference>(getString(R.string.pref_key_ads_single_support))
+            ?.isEnabled = adsHelper.canShowAd
+
+        findPreference<SwitchPreferenceCompat>(getString(R.string.pref_key_ads_enabled))?.setOnPreferenceChangeListener { _, newValue ->
+            presenter.onAdsEnabledSelected(newValue as Boolean)
+            true
+        }
     }
 
     override fun showAd(ad: RewardedInterstitialAd) {
@@ -59,48 +67,6 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
         }
     }
 
-    override fun showPrivacyPolicyDialog() {
-        val dialogAdsConsentBinding = DialogAdsConsentBinding.inflate(layoutInflater)
-
-        val dialog = MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.pref_ads_consent_title)
-            .setMessage(R.string.pref_ads_consent_description)
-            .setView(dialogAdsConsentBinding.root)
-            .setOnCancelListener { presenter.onPrivacyDialogCanceled() }
-            .show()
-
-        dialogAdsConsentBinding.adsConsentOver.setOnCheckedChangeListener { _, isChecked ->
-            dialogAdsConsentBinding.adsConsentPersonalised.isEnabled = isChecked
-        }
-
-        dialogAdsConsentBinding.adsConsentPersonalised.setOnClickListener {
-            presenter.onPersonalizedAgree()
-            dialog.dismiss()
-        }
-
-        dialogAdsConsentBinding.adsConsentNonPersonalised.setOnClickListener {
-            presenter.onNonPersonalizedAgree()
-            dialog.dismiss()
-        }
-
-        dialogAdsConsentBinding.adsConsentPrivacy.setOnClickListener { presenter.onPrivacySelected() }
-        dialogAdsConsentBinding.adsConsentCancel.setOnClickListener { dialog.cancel() }
-    }
-
-    override fun showProcessingDataSummary(isPersonalized: Boolean?) {
-        val summaryText = isPersonalized?.let {
-            getString(if (it) R.string.pref_ads_summary_personalized else R.string.pref_ads_summary_non_personalized)
-        }
-
-        findPreference<CheckBoxPreference>(getString(R.string.pref_key_ads_consent_data_processing))
-            ?.summary = summaryText
-    }
-
-    override fun setCheckedProcessingData(checked: Boolean) {
-        findPreference<CheckBoxPreference>(getString(R.string.pref_key_ads_consent_data_processing))
-            ?.isChecked = checked
-    }
-
     override fun setCheckedAdsEnabled(checked: Boolean) {
         findPreference<SwitchPreferenceCompat>(getString(R.string.pref_key_ads_enabled))
             ?.isChecked = checked
@@ -135,8 +101,16 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
         (activity as? BaseActivity<*, *>)?.showMessage(text)
     }
 
-    override fun showExpiredDialog() {
+    override fun showExpiredCredentialsDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredCredentialsDialog()
+    }
+
+    override fun onCaptchaVerificationRequired(url: String?) {
+        (activity as? BaseActivity<*, *>)?.onCaptchaVerificationRequired(url)
+    }
+
+    override fun showDecryptionFailedDialog() {
+        (activity as? BaseActivity<*, *>)?.showDecryptionFailedDialog()
     }
 
     override fun showChangePasswordSnackbar(redirectUrl: String) {

app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt

@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.settings.ads
 
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -13,18 +12,12 @@ class AdsPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val adsHelper: AdsHelper,
-    private val preferencesRepository: PreferencesRepository
 ) : BasePresenter<AdsView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: AdsView) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Settings ads view was initialized")
-
-        view.showProcessingDataSummary(
-            preferencesRepository.isPersonalizedAdsEnabled.takeIf {
-                preferencesRepository.isAgreeToProcessData
-            })
     }
 
     fun onWatchSingleAdSelected() {
@@ -50,38 +43,17 @@ class AdsPresenter @Inject constructor(
         }
     }
 
-    fun onConsentSelected(isChecked: Boolean) {
-        if (isChecked) {
-            view?.showPrivacyPolicyDialog()
-        } else {
-            view?.showProcessingDataSummary(null)
-            view?.setCheckedAdsEnabled(false)
-        }
-    }
-
     fun onPrivacySelected() {
         view?.openPrivacyPolicy()
     }
 
-    fun onPrivacyDialogCanceled() {
+    fun onAdsEnabledSelected(newValue: Boolean) {
-        view?.setCheckedProcessingData(false)
+        if (newValue) {
+            adsHelper.initialize()
+        }
     }
 
-    fun onNonPersonalizedAgree() {
+    fun onUmpAgreementsSelected() {
-        preferencesRepository.isPersonalizedAdsEnabled = false
+        adsHelper.openAdsUmpAgreements()
-
-        adsHelper.initialize()
-
-        view?.setCheckedProcessingData(true)
-        view?.showProcessingDataSummary(false)
-    }
-
-    fun onPersonalizedAgree() {
-        preferencesRepository.isPersonalizedAdsEnabled = true
-
-        adsHelper.initialize()
-
-        view?.setCheckedProcessingData(true)
-        view?.showProcessingDataSummary(true)
     }
 }

app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsView.kt

@@ -9,8 +9,6 @@ interface AdsView : BaseView {
 
     fun showAd(ad: RewardedInterstitialAd)
 
-    fun showPrivacyPolicyDialog()
-
     fun openPrivacyPolicy()
 
     fun showLoadingSupportAd(show: Boolean)
@@ -18,8 +16,4 @@ interface AdsView : BaseView {
     fun showWatchAdOncePerVisit(show: Boolean)
 
     fun setCheckedAdsEnabled(checked: Boolean)
-
-    fun setCheckedProcessingData(checked: Boolean)
-
-    fun showProcessingDataSummary(isPersonalized: Boolean?)
 }

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

@@ -1,49 +1,110 @@
 package io.github.wulkanowy.utils
 
+import android.app.Activity
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
-import android.os.Bundle
 import android.view.View
 import androidx.core.content.getSystemService
-import com.google.ads.mediation.admob.AdMobAdapter
+import com.google.android.gms.ads.AdListener
-import com.google.android.gms.ads.*
+import com.google.android.gms.ads.AdRequest
+import com.google.android.gms.ads.AdSize
+import com.google.android.gms.ads.AdView
+import com.google.android.gms.ads.LoadAdError
+import com.google.android.gms.ads.MobileAds
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAdLoadCallback
+import com.google.android.ump.ConsentInformation
+import com.google.android.ump.ConsentRequestParameters
+import com.google.android.ump.UserMessagingPlatform
 import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.android.scopes.ActivityScoped
 import io.github.wulkanowy.BuildConfig
 import io.github.wulkanowy.data.repositories.PreferencesRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+import timber.log.Timber
 import java.net.UnknownHostException
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 
-
+@ActivityScoped
 class AdsHelper @Inject constructor(
+    private val activity: Activity,
     @ApplicationContext private val context: Context,
-    private val preferencesRepository: PreferencesRepository
+    preferencesRepository: PreferencesRepository
 ) {
 
+    private var isMobileAdsInitializeCalled = AtomicBoolean(false)
+    private var consentInformation: ConsentInformation? = null
+
+    private val canRequestAd get() = consentInformation?.canRequestAds() == true
+    val isMobileAdsSdkInitialized = MutableStateFlow(false)
+    val canShowAd get() = isMobileAdsSdkInitialized.value && canRequestAd
+
+    init {
+        if (preferencesRepository.isAdsEnabled) {
+            initialize()
+        }
+    }
+
     fun initialize() {
-        if (preferencesRepository.isAgreeToProcessData) {
+        val consentRequestParameters = ConsentRequestParameters.Builder()
-            MobileAds.initialize(context)
+            .build()
+
+        consentInformation = UserMessagingPlatform.getConsentInformation(context)
+        consentInformation?.requestConsentInfoUpdate(
+            activity,
+            consentRequestParameters,
+            {
+                UserMessagingPlatform.loadAndShowConsentFormIfRequired(
+                    activity
+                ) { loadAndShowError ->
+
+                    if (loadAndShowError != null) {
+                        Timber.e(IllegalStateException("${loadAndShowError.errorCode}: ${loadAndShowError.message}"))
+                    }
+
+                    if (canRequestAd) {
+                        initializeMobileAds()
+                    }
+                }
+            },
+            { requestConsentError ->
+                Timber.e(IllegalStateException("${requestConsentError.errorCode}: ${requestConsentError.message}"))
+            })
+
+        if (canRequestAd) {
+            initializeMobileAds()
+        }
+    }
+
+    fun openAdsUmpAgreements() {
+        UserMessagingPlatform.showPrivacyOptionsForm(activity) {
+            if (it != null) {
+                Timber.e(IllegalStateException("${it.errorCode}: ${it.message}"))
+            }
+        }
+    }
+
+    private fun initializeMobileAds() {
+        if (isMobileAdsInitializeCalled.getAndSet(true)) return
+
+        MobileAds.initialize(context) {
+            isMobileAdsSdkInitialized.value = true
         }
     }
 
     suspend fun getSupportAd(): RewardedInterstitialAd? {
+        if (!canRequestAd) return null
         if (!context.isInternetConnected()) {
             throw UnknownHostException()
         }
 
-        val extra = Bundle().apply { putString("npa", "1") }
         val adRequest = AdRequest.Builder()
-            .apply {
-                if (!preferencesRepository.isPersonalizedAdsEnabled) {
-                    addNetworkExtrasBundle(AdMobAdapter::class.java, extra)
-                }
-            }
             .build()
 
         return suspendCoroutine {
@@ -64,13 +125,8 @@ class AdsHelper @Inject constructor(
     }
 
     suspend fun getDashboardTileAdBanner(width: Int): AdBanner {
-        val extra = Bundle().apply { putString("npa", "1") }
+        if (!canShowAd) throw IllegalStateException("Cannot show ad")
         val adRequest = AdRequest.Builder()
-            .apply {
-                if (!preferencesRepository.isPersonalizedAdsEnabled) {
-                    addNetworkExtrasBundle(AdMobAdapter::class.java, extra)
-                }
-            }
             .build()
 
         return suspendCoroutine {

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

@@ -1,25 +1,24 @@
 package io.github.wulkanowy.utils
 
 import android.app.Activity
-import android.content.Context
 import android.os.Bundle
+import com.google.firebase.Firebase
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.analytics.analytics
-import dagger.hilt.android.qualifiers.ApplicationContext
+import com.google.firebase.crashlytics.crashlytics
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AnalyticsHelper @Inject constructor(
-    @ApplicationContext private val context: Context,
     preferencesRepository: PreferencesRepository,
     appInfo: AppInfo,
 ) {
 
-    private val analytics by lazy { FirebaseAnalytics.getInstance(context) }
+    private val analytics by lazy { Firebase.analytics }
 
-    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
+    private val crashlytics by lazy { Firebase.crashlytics }
 
     init {
         if (!appInfo.isDebug) {

app/src/play/res/xml/scheme_preferences_ads.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+    <SwitchPreferenceCompat
+        app:defaultValue="@string/pref_key_ads_enabled"
+        app:iconSpaceReserved="false"
+        app:key="@string/pref_key_ads_enabled"
+        app:singleLineTitle="false"
+        app:title="@string/pref_ads_show_in_app" />
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:title="@string/pref_ads_agreements">
@@ -8,25 +14,17 @@
             app:key="@string/pref_key_ads_privacy_policy"
             app:singleLineTitle="false"
             app:title="@string/pref_ads_privacy_policy" />
-        <CheckBoxPreference
+        <Preference
-            app:defaultValue="@bool/pref_default_ads_consent_data_processing"
+            app:dependency="@string/pref_key_ads_enabled"
             app:iconSpaceReserved="false"
-            app:key="@string/pref_key_ads_consent_data_processing"
+            app:key="@string/pref_key_ads_ump_agreements"
             app:singleLineTitle="false"
             app:title="@string/pref_ads_consent" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:title="@string/pref_ads_support_category_name">
-        <SwitchPreferenceCompat
-            app:defaultValue="@string/pref_key_ads_enabled"
-            app:dependency="@string/pref_key_ads_consent_data_processing"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_ads_enabled"
-            app:singleLineTitle="false"
-            app:title="@string/pref_ads_show_in_app" />
         <Preference
-            app:dependency="@string/pref_key_ads_consent_data_processing"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_ads_single_support"
             app:singleLineTitle="false"

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.22'
-        about_libraries = '10.9.2'
+        about_libraries = '10.10.0'
         hilt_version = '2.50'
     }
     repositories {
@@ -14,10 +14,10 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.16"
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.4.0'
-        classpath 'com.huawei.agconnect:agcp:1.9.1.302'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.303'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         classpath "com.github.triplet.gradle:play-publisher:3.8.4"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.2"
@@ -29,6 +29,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenLocal()
         mavenCentral()
         google()
         maven { url "https://jitpack.io" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
+# Collect all arguments for the java command:
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     shell script including quotes and variable substitutions, so put them in
+#     and any embedded shellness will be escaped.
-#     double quotes to make sure that they get re-expanded; and
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#   * put everything else in single quotes, so that it's not re-expanded.
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \