Merge branch 'bugfix/2.5.2' into develop

app/build.gradle

@@ -27,8 +27,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 150
+        versionCode 151
-        versionName "2.5.1"
+        versionName "2.5.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,7 +161,7 @@ play {
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
     userFraction = 0.50d
-    updatePriority = 1
+    updatePriority = 3
     enabled.set(false)
 }
 
@@ -191,7 +191,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.5.1'
+    implementation 'io.github.wulkanowy:sdk:2.5.2'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 

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

@@ -38,6 +38,7 @@ class WulkanowySdkFactory @Inject constructor(
             schoolSymbol = student.schoolSymbol
             studentId = student.studentId
             classId = student.classId
+            isEduOne = student.isEduOne
             emptyCookieJarInterceptor = true
 
             if (Sdk.Mode.valueOf(student.loginMode) == Sdk.Mode.HEBE) {

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

@@ -174,6 +174,7 @@ import javax.inject.Singleton
         AutoMigration(from = 58, to = 59),
         AutoMigration(from = 59, to = 60),
         AutoMigration(from = 60, to = 61),
+        AutoMigration(from = 61, to = 62),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -182,7 +183,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 61
+        const val VERSION_SCHEMA = 62
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -309,6 +310,6 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val adminMessagesDao: AdminMessageDao
 
     abstract val mutedMessageSendersDao: MutedMessageSendersDao
-  
+
     abstract val gradeDescriptiveDao: GradeDescriptiveDao
 }

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

@@ -9,6 +9,7 @@ import androidx.room.Transaction
 import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentIsAuthorized
 import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import javax.inject.Singleton
@@ -23,6 +24,9 @@ abstract class StudentDao {
     @Delete
     abstract suspend fun delete(student: Student)
 
+    @Update(entity = Student::class)
+    abstract suspend fun update(studentIsAuthorized: StudentIsAuthorized)
+
     @Update(entity = Student::class)
     abstract suspend fun update(studentNickAndAvatar: StudentNickAndAvatar)
 

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

@@ -78,6 +78,13 @@ data class Student(
 
     @ColumnInfo(name = "registration_date")
     val registrationDate: Instant,
+
+    @ColumnInfo(name = "is_authorized", defaultValue = "0")
+    val isAuthorized: Boolean,
+
+    @ColumnInfo(name = "is_edu_one", defaultValue = "0")
+    val isEduOne: Boolean,
+
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -0,0 +1,16 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity
+data class StudentIsAuthorized(
+    @ColumnInfo(name = "is_authorized", defaultValue = "0")
+    val isAuthorized: Boolean,
+) : Serializable {
+
+    @PrimaryKey
+    var id: Long = 0
+}

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

@@ -34,17 +34,19 @@ fun SdkRegisterUser.mapToPojo(password: String?) = RegisterUser(
                     error = it.error,
                     students = it.subjects
                         .filterIsInstance<SdkRegisterStudent>()
-                        .map { registerSubject ->
+                        .map { registerStudent ->
                             RegisterStudent(
-                                studentId = registerSubject.studentId,
+                                studentId = registerStudent.studentId,
-                                studentName = registerSubject.studentName,
+                                studentName = registerStudent.studentName,
-                                studentSecondName = registerSubject.studentSecondName,
+                                studentSecondName = registerStudent.studentSecondName,
-                                studentSurname = registerSubject.studentSurname,
+                                studentSurname = registerStudent.studentSurname,
-                                className = registerSubject.className,
+                                className = registerStudent.className,
-                                classId = registerSubject.classId,
+                                classId = registerStudent.classId,
-                                isParent = registerSubject.isParent,
+                                isParent = registerStudent.isParent,
-                                semesters = registerSubject.semesters
+                                isAuthorized = registerStudent.isAuthorized,
-                                    .mapToEntities(registerSubject.studentId),
+                                isEduOne = registerStudent.isEduOne,
+                                semesters = registerStudent.semesters
+                                    .mapToEntities(registerStudent.studentId),
                             )
                         },
                 )
@@ -84,6 +86,8 @@ fun RegisterStudent.mapToStudentWithSemesters(
         password = user.password.orEmpty(),
         isCurrent = false,
         registrationDate = Instant.now(),
+        isAuthorized = this.isAuthorized,
+        isEduOne = this.isEduOne,
     ).apply {
         avatarColor = colors.random()
     },

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

@@ -45,4 +45,6 @@ data class RegisterStudent(
     val classId: Int,
     val isParent: Boolean,
     val semesters: List<Semester>,
+    val isAuthorized: Boolean,
+    val isEduOne: Boolean
 ) : java.io.Serializable

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

@@ -7,6 +7,7 @@ import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentIsAuthorized
 import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
@@ -15,6 +16,7 @@ import io.github.wulkanowy.data.mappers.mapToPojo
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.utils.getCurrentOrLast
 import io.github.wulkanowy.utils.security.Scrambler
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
@@ -99,6 +101,25 @@ class StudentRepository @Inject constructor(
         return student
     }
 
+    suspend fun checkCurrentStudentAuthorizationStatus() {
+        val student = getCurrentStudent()
+
+        if (!student.isAuthorized) {
+            val currentSemester = semesterDb.loadAll(
+                studentId = student.studentId,
+                classId = student.classId,
+            ).getCurrentOrLast()
+            val initializedSdk = wulkanowySdkFactory.create(student, currentSemester)
+            val isAuthorized = initializedSdk.getCurrentStudent()?.isAuthorized ?: false
+
+            if (isAuthorized) {
+                studentDb.update(StudentIsAuthorized(isAuthorized = true).apply {
+                    id = student.id
+                })
+            } else throw NoAuthorizationException()
+        }
+    }
+
     suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
         val student = studentDb.loadCurrent() ?: throw NoCurrentStudentException()
 
@@ -173,3 +194,6 @@ class StudentRepository @Inject constructor(
         }
     }
 }
+
+class NoAuthorizationException : Exception()
+

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

@@ -3,7 +3,7 @@ package io.github.wulkanowy.ui.base
 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.data.repositories.NoAuthorizationException
 import io.github.wulkanowy.sdk.scrapper.exception.CloudflareVerificationException
 import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
@@ -40,7 +40,7 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
             is ScramblerException -> onDecryptionFailed()
             is BadCredentialsException -> onExpiredCredentials()
             is NoCurrentStudentException -> onNoCurrentStudent()
-            is AuthorizationRequiredException -> onAuthorizationRequired()
+            is NoAuthorizationException -> onAuthorizationRequired()
             is CloudflareVerificationException -> onCaptchaVerificationRequired(error.originalUrl)
         }
     }

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

@@ -73,6 +73,7 @@ class MainPresenter @Inject constructor(
         syncManager.startPeriodicSyncWorker()
 
         checkAppSupport()
+        checkCurrentStudentAuthorizationStatus()
 
         analytics.logEvent("app_open", "destination" to initDestination.toString())
         Timber.i("Main view was initialized with $initDestination")
@@ -191,4 +192,13 @@ class MainPresenter @Inject constructor(
 
         view?.showStudentAvatar(currentStudent)
     }
+
+    private fun checkCurrentStudentAuthorizationStatus() {
+        presenterScope.launch {
+            runCatching { studentRepository.checkCurrentStudentAuthorizationStatus() }
+                .onFailure { errorHandler.dispatch(it) }
+
+            Timber.i("Current student authorization status checked")
+        }
+    }
 }

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

@@ -1,11 +1,7 @@
-Wersja 2.5.1
+Wersja 2.5.2
 
-— dodaliśmy wyświetlanie ogłoszeń
+— naprawiliśmy omyłkowe wyświetlanie ekranu z wymaganą autoryzacją numerem PESEL
-— dodaliśmy opcję przywracania wiadomości z kosza
+— naprawiliśmy kilka problemów ze stabilnością
-— dodaliśmy opcję wyciszania nadawców wiadomości
+— poprawiliśmy wyświetlanie kolorów we frekwencji
-— naprawiliśmy opcjonalne liczenie średniej arytmetycznej, kiedy brak ocen z wagą w drugim semestrze
-— usprawniliśmy ładowanie frekwencji i planu lekcji
-— naprawiliśmy usprawiedliwianie nieobecności i autoryzację u użytkowników eduOne
-— zmieniliśmy komunikat o zmienionym haśle
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt

@@ -5,8 +5,8 @@ import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import java.time.LocalDate
 import java.time.Instant.now
+import java.time.LocalDate
 import io.github.wulkanowy.sdk.pojo.Semester as SdkSemester
 
 fun getSemesterEntity(diaryId: Int = 1, semesterId: Int = 1, start: LocalDate = LocalDate.now(), end: LocalDate = LocalDate.now(), semesterName: Int = 1) = Semester(
@@ -72,6 +72,8 @@ fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.HEBE) = Student(
     symbol = "",
     userLoginId = 1,
     userName = "",
+    isEduOne = false,
+    isAuthorized = false
 ).apply {
     id = 1
 }

app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt

@@ -222,5 +222,7 @@ class GetMailboxByStudentUseCaseTest {
         symbol = "",
         userLoginId = 1,
         userName = userName,
+        isAuthorized = false,
+        isEduOne = false
     )
 }

app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt

@@ -72,7 +72,9 @@ class GradeAverageProviderTest {
         className = "",
         classId = 1,
         isCurrent = true,
-        registrationDate = Instant.now()
+        registrationDate = Instant.now(),
+        isAuthorized = false,
+        isEduOne = false
     )
 
     private val semesters = mutableListOf(

app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt

@@ -71,6 +71,8 @@ class LoginStudentSelectPresenterTest {
         classId = 0,
         isParent = false,
         semesters = listOf(),
+        isEduOne = false,
+        isAuthorized = false,
     )
 
     private val school = RegisterUnit(

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

@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.main
 
+import io.github.wulkanowy.MainCoroutineRule
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
@@ -7,14 +8,23 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.clearMocks
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import io.mockk.verify
 import kotlinx.serialization.json.Json
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 
 class MainPresenterTest {
 
+    @get:Rule
+    val coroutineRule = MainCoroutineRule()
+
     @MockK(relaxed = true)
     lateinit var errorHandler: ErrorHandler