Merge branch 'release/2.6.0'

app/build.gradle

@@ -27,8 +27,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 165
-        versionName "2.6.5"
+        versionCode 160
+        versionName "2.6.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -160,8 +160,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
-    userFraction = 0.99d
-    updatePriority = 3
+    userFraction = 0.25d
+    updatePriority = 1
     enabled.set(false)
 }
 
@@ -191,23 +191,23 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.6.4'
+    implementation 'io.github.wulkanowy:sdk:2.6.0'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.13.0'
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.activity:activity-ktx:1.9.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.7.0"
+    implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation "androidx.annotation:annotation:1.7.1"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-rc01"
+    implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
@@ -248,13 +248,13 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.12.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:33.0.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.8.1')
     playImplementation 'com.google.firebase:firebase-analytics'
     playImplementation 'com.google.firebase:firebase-messaging'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.firebase:firebase-config'
 
-    playImplementation 'com.google.android.gms:play-services-ads:22.6.0'
+    playImplementation 'com.google.android.gms:play-services-ads:23.0.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'

app/google-services.json

@@ -36,37 +36,6 @@
           "status": 2
         }
       }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:1091101852179:android:b558a25f65d088b1",
-        "android_client_info": {
-          "package_name": "io.github.wulkanowy"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": ""
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 1
-        },
-        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
-        }
-      }
     }
   ],
   "configuration_version": "1"

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

@@ -13,8 +13,8 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import io.github.wulkanowy.data.api.services.SchoolsService
-import io.github.wulkanowy.data.api.services.WulkanowyService
+import io.github.wulkanowy.data.api.AdminMessageService
+import io.github.wulkanowy.data.api.SchoolsService
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
@@ -71,7 +71,7 @@ internal class DataModule {
         okHttpClient: OkHttpClient,
         json: Json,
         appInfo: AppInfo
-    ): WulkanowyService = Retrofit.Builder()
+    ): AdminMessageService = Retrofit.Builder()
         .baseUrl(appInfo.messagesBaseUrl)
         .client(okHttpClient)
         .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))

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

@@ -5,7 +5,6 @@ import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentIsEduOne
-import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.RemoteConfigHelper
 import io.github.wulkanowy.utils.WebkitCookieManagerProxy
@@ -21,7 +20,6 @@ class WulkanowySdkFactory @Inject constructor(
     private val remoteConfig: RemoteConfigHelper,
     private val webkitCookieManagerProxy: WebkitCookieManagerProxy,
     private val studentDb: StudentDao,
-    private val wulkanowyRepository: WulkanowyRepository,
 ) {
 
     private val eduOneMutex = Mutex()
@@ -38,29 +36,14 @@ class WulkanowySdkFactory @Inject constructor(
         addInterceptor(chuckerInterceptor, network = true)
     }
 
-    fun createBase() = sdk
-
-    suspend fun create(): Sdk {
-        val mapping = wulkanowyRepository.getMapping()
-
-        return createBase().apply {
-            if (mapping != null) {
-                endpointsMapping = mapping.endpoints
-                vTokenMapping = mapping.vTokens
-            }
-        }
-    }
+    fun create() = sdk
 
     suspend fun create(student: Student, semester: Semester? = null): Sdk {
         val overrideIsEduOne = checkEduOneAndMigrateIfNecessary(student)
         return buildSdk(student, semester, overrideIsEduOne)
     }
 
-    private suspend fun buildSdk(
-        student: Student,
-        semester: Semester?,
-        isStudentEduOne: Boolean
-    ): Sdk {
+    private fun buildSdk(student: Student, semester: Semester?, isStudentEduOne: Boolean): Sdk {
         return create().apply {
             email = student.email
             password = student.password

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

@@ -1,16 +1,12 @@
-package io.github.wulkanowy.data.api.services
+package io.github.wulkanowy.data.api
 
-import io.github.wulkanowy.data.api.models.Mapping
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import retrofit2.http.GET
 import javax.inject.Singleton
 
 @Singleton
-interface WulkanowyService {
+interface AdminMessageService {
 
     @GET("/v1.json")
     suspend fun getAdminMessages(): List<AdminMessage>
-
-    @GET("/mapping1.json")
-    suspend fun getMapping(): Mapping
-}
+}

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

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.api.services
+package io.github.wulkanowy.data.api
 
 import io.github.wulkanowy.data.pojos.IntegrityRequest
 import io.github.wulkanowy.data.pojos.LoginEvent

app/src/main/java/io/github/wulkanowy/data/api/models/Mapping.kt

@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.api.models
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Mapping(
-
-    @SerialName("endpoints")
-    val endpoints: Map<String, Map<String, Map<String, String>>>,
-
-    @SerialName("vTokens")
-    val vTokens: Map<String, Map<String, Map<String, String>>>,
-)

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

@@ -1,23 +1,20 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.api.models.Mapping
-import io.github.wulkanowy.data.api.services.WulkanowyService
+import io.github.wulkanowy.data.api.AdminMessageService
 import io.github.wulkanowy.data.db.dao.AdminMessageDao
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.networkBoundResource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.sync.Mutex
-import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class WulkanowyRepository @Inject constructor(
-    private val wulkanowyService: WulkanowyService,
+class AdminMessageRepository @Inject constructor(
+    private val adminMessageService: AdminMessageService,
     private val adminMessageDao: AdminMessageDao,
-    private val preferencesRepository: PreferencesRepository,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -27,28 +24,11 @@ class WulkanowyRepository @Inject constructor(
             mutex = saveFetchResultMutex,
             isResultEmpty = { false },
             query = { adminMessageDao.loadAll() },
-            fetch = { wulkanowyService.getAdminMessages() },
+            fetch = { adminMessageService.getAdminMessages() },
             shouldFetch = { true },
             saveFetchResult = { oldItems, newItems ->
                 adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
             },
         )
             .filterNot { it is Resource.Intermediate }
-
-    suspend fun getMapping(): Mapping? {
-        var savedMapping = preferencesRepository.mapping
-
-        if (savedMapping == null) {
-            fetchMapping()
-            savedMapping = preferencesRepository.mapping
-        }
-
-        return savedMapping
-    }
-
-    suspend fun fetchMapping() {
-        runCatching { wulkanowyService.getMapping() }
-            .onFailure { Timber.e(it) }
-            .onSuccess { preferencesRepository.mapping = it }
-    }
 }

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

@@ -9,7 +9,6 @@ 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.api.models.Mapping
 import io.github.wulkanowy.data.enums.AppTheme
 import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode
 import io.github.wulkanowy.data.enums.GradeColorTheme
@@ -376,15 +375,6 @@ class PreferencesRepository @Inject constructor(
         get() = sharedPref.getString(PREF_KEY_INSTALLATION_ID, null).orEmpty()
         private set(value) = sharedPref.edit { putString(PREF_KEY_INSTALLATION_ID, value) }
 
-    var mapping: Mapping?
-        get() {
-            val value = sharedPref.getString("mapping", null)
-            return value?.let { json.decodeFromString(it) }
-        }
-        set(value) = sharedPref.edit(commit = true) {
-            putString("mapping", value?.let { json.encodeToString(it) })
-        }
-
     init {
         if (installationId.isEmpty()) {
             installationId = UUID.randomUUID().toString()

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

@@ -1,7 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.WulkanowySdkFactory
-import io.github.wulkanowy.data.api.services.SchoolsService
+import io.github.wulkanowy.data.api.SchoolsService
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters

app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt

@@ -5,14 +5,14 @@ import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageType
 import io.github.wulkanowy.data.mapResourceData
+import io.github.wulkanowy.data.repositories.AdminMessageRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.utils.AppInfo
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetAppropriateAdminMessageUseCase @Inject constructor(
-    private val wulkanowyRepository: WulkanowyRepository,
+    private val adminMessageRepository: AdminMessageRepository,
     private val preferencesRepository: PreferencesRepository,
     private val appInfo: AppInfo
 ) {
@@ -22,7 +22,7 @@ class GetAppropriateAdminMessageUseCase @Inject constructor(
     }
 
     operator fun invoke(scrapperBaseUrl: String, type: MessageType): Flow<Resource<AdminMessage?>> {
-        return wulkanowyRepository.getAdminMessages().mapResourceData { adminMessages ->
+        return adminMessageRepository.getAdminMessages().mapResourceData { adminMessages ->
             adminMessages
                 .asSequence()
                 .filter { it.isNotDismissed() }

app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt

@@ -59,7 +59,7 @@ class GetMailboxByStudentUseCase @Inject constructor(
     private fun String.getUnauthorizedVersion(): String {
         return normalizeStudentName().split(" ")
             .joinToString(" ") {
-                it.firstOrNull()?.toString().orEmpty() + "*".repeat((it.length - 1).coerceAtLeast(0))
+                it.first() + "*".repeat(it.length - 1)
             }
     }
 }

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

@@ -59,7 +59,7 @@ class CaptchaDialog : BaseDialogFragment<DialogCaptchaBinding>() {
             webView = this
             with(settings) {
                 javaScriptEnabled = true
-                userAgentString = wulkanowySdkFactory.createBase().userAgent
+                userAgentString = wulkanowySdkFactory.create().userAgent
             }
 
             webViewClient = object : WebViewClient() {

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

@@ -118,6 +118,5 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     override fun onResume() {
         super.onResume()
         inAppUpdateHelper.onResume()
-        presenter.updateSdkMappings()
     }
 }

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

@@ -1,15 +1,12 @@
 package io.github.wulkanowy.ui.modules.login
 
 import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginPresenter @Inject constructor(
-    private val wulkanowyRepository: WulkanowyRepository,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
 ) : BasePresenter<LoginView>(errorHandler, studentRepository) {
@@ -19,11 +16,4 @@ class LoginPresenter @Inject constructor(
         view.initView()
         Timber.i("Login view was initialized")
     }
-
-    fun updateSdkMappings() {
-        presenterScope.launch {
-            runCatching { wulkanowyRepository.fetchMapping() }
-                .onFailure { Timber.e(it) }
-        }
-    }
 }

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

@@ -138,7 +138,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     override fun onResume() {
         super.onResume()
         inAppUpdateHelper.onResume()
-        presenter.updateSdkMappings()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {

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

@@ -6,7 +6,6 @@ import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -30,7 +29,6 @@ class MainPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val preferencesRepository: PreferencesRepository,
-    private val wulkanowyRepository: WulkanowyRepository,
     private val syncManager: SyncManager,
     private val analytics: AnalyticsHelper,
     private val json: Json,
@@ -201,11 +199,4 @@ class MainPresenter @Inject constructor(
                 .onFailure { errorHandler.dispatch(it) }
         }
     }
-
-    fun updateSdkMappings() {
-        presenterScope.launch {
-            runCatching { wulkanowyRepository.fetchMapping() }
-                .onFailure { Timber.e(it) }
-        }
-    }
 }

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

@@ -1,5 +1,8 @@
-Wersja 2.6.5
+Wersja 2.6.0
 
-— naprawiliśmy pozostałe bieżące problemy spowodowane ostatnimi blokadami Wulkanowego przez wiadomo kogo
+— dodaliśmy kalkulator frekwencji
+— dodaliśmy wyświetlanie lekcji dodatkowych w planie lekcji
+— ulepszyliśmy wyjaśnienie na ekranie z miejscem na wpisanie numeru PESEL
+— naprawiliśmy rzadkie sytuacje, gdy plan lekcji nakładał się na informację o jego braku
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

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

@@ -28,7 +28,7 @@
     <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 configuration</string>
+    <string name="menu_order_title">Menu configuartion</string>
 
 
     <!--Subtitles-->

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

@@ -8,7 +8,6 @@ import io.mockk.mockk
 
 fun createWulkanowySdkFactoryMock(sdk: Sdk) = mockk<WulkanowySdkFactory>()
     .apply {
-        every { createBase() } returns sdk
-        coEvery { create() } returns sdk
+        every { create() } returns sdk
         coEvery { create(any(), any()) } returns sdk
     }

app/src/test/java/io/github/wulkanowy/data/WulkanowySdkFactoryTest.kt

@@ -11,6 +11,7 @@ import io.github.wulkanowy.sdk.pojo.RegisterStudent
 import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
 import io.mockk.spyk
@@ -39,12 +40,11 @@ class WulkanowySdkFactoryTest {
                 chuckerInterceptor = mockk(),
                 remoteConfig = mockk(relaxed = true),
                 webkitCookieManagerProxy = mockk(),
-                studentDb = studentDao,
-                wulkanowyRepository = mockk(relaxed = true),
+                studentDb = studentDao
             )
         )
 
-        coEvery { wulkanowySdkFactory.create() } returns sdk
+        every { wulkanowySdkFactory.create() } returns sdk
     }
 
     @Test

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

@@ -3,7 +3,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.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AdsHelper
@@ -32,9 +31,6 @@ class MainPresenterTest {
     @MockK
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
-    lateinit var wulkanowyRepository: WulkanowyRepository
-
     @MockK(relaxed = true)
     lateinit var prefRepository: PreferencesRepository
 
@@ -69,8 +65,7 @@ class MainPresenterTest {
             analytics = analytics,
             json = Json,
             appInfo = appInfo,
-            adsHelper = adsHelper,
-            wulkanowyRepository = wulkanowyRepository
+            adsHelper = adsHelper
         )
         presenter.onAttachView(mainView, null)
     }

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
-        kotlin_version = '1.9.24'
-        about_libraries = '11.1.4'
+        kotlin_version = '1.9.23'
+        about_libraries = '11.1.3'
         hilt_version = '2.51.1'
     }
     repositories {
@@ -13,8 +13,8 @@ buildscript {
     dependencies {
         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.20"
-        classpath 'com.android.tools.build:gradle:8.4.1'
+        classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.19"
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.4.1'
         classpath 'com.huawei.agconnect:agcp:1.9.1.303'