Change default symbol for standard register variant (#2421)

2024-02-09 16:35:18 +01:00 · 2024-02-09 16:35:18 +01:00 · 8183d7d5a0
commit 8183d7d5a0
parent 3f199cb610
12 changed files with 19 additions and 19 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -195,7 +195,7 @@ ext {
 }

 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.3.7'
+    implementation 'io.github.wulkanowy:sdk:2.3.8-SNAPSHOT'

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'

--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt
@ -7,5 +7,6 @@ data class LoginData(
    val password: String,
    val baseUrl: String,
    val domainSuffix: String,
-    val symbol: String?,
+    val defaultSymbol: String,
+    val userEnteredSymbol: String? = null,
 ) : Serializable
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@ -155,7 +155,7 @@ class LoginAdvancedPresenter @Inject constructor(
                            password = view?.formPassValue.orEmpty().trim(),
                            baseUrl = view?.formHostValue.orEmpty().trim(),
                            domainSuffix = view?.formDomainSuffix.orEmpty().trim(),
-                            symbol = view?.formSymbolValue.orEmpty().trim().getNormalizedSymbol(),
+                            defaultSymbol = view?.formSymbolValue.orEmpty().trim().getNormalizedSymbol(),
                        )
                        when (it.data.symbols.size) {
                            0 -> view?.navigateToSymbol(loginData)
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@ -148,7 +148,7 @@ class LoginFormPresenter @Inject constructor(
            password = password,
            baseUrl = host,
            domainSuffix = domainSuffix,
-            symbol = symbol
+            defaultSymbol = symbol
        )
    }

@ -167,7 +167,7 @@ class LoginFormPresenter @Inject constructor(
                password = loginData.password,
                scrapperBaseUrl = loginData.baseUrl,
                domainSuffix = loginData.domainSuffix,
-                symbol = loginData.symbol.orEmpty(),
+                symbol = loginData.defaultSymbol,
            )
        }
            .logResourceStatus("login")
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
@ -60,7 +60,7 @@ class LoginRecoverPresenter @Inject constructor(
        resourceFlow {
            recoverRepository.getReCaptchaSiteKey(
                host,
-                symbol.ifBlank { "Default" })
+                symbol.ifBlank { "default" })
        }.onEach {
            when (it) {
                is Resource.Loading -> view?.run {
@ -103,7 +103,7 @@ class LoginRecoverPresenter @Inject constructor(
    fun onReCaptchaVerified(reCaptchaResponse: String) {
        val username = view?.recoverNameValue.orEmpty()
        val host = view?.recoverHostValue.orEmpty()
-        val symbol = view?.formHostSymbol.ifNullOrBlank { "Default" }
+        val symbol = view?.formHostSymbol.ifNullOrBlank { "default" }

        resourceFlow {
            recoverRepository.sendRecoverRequest(
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@ -10,13 +10,11 @@ import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.support.LoginSupportDialog
 import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.serializable
 import javax.inject.Inject
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@ -111,8 +111,8 @@ class LoginStudentSelectPresenter @Inject constructor(
        val notEmptySymbols = registerUser.symbols.filter { it.schools.isNotEmpty() }
        val emptySymbols = registerUser.symbols.filter { it.schools.isEmpty() }

-        if (emptySymbols.isNotEmpty() && notEmptySymbols.isNotEmpty() && emptySymbols.any { it.symbol == loginData.symbol }) {
-            add(createEmptySymbolItem(emptySymbols.first { it.symbol == loginData.symbol }))
+        if (emptySymbols.isNotEmpty() && notEmptySymbols.isNotEmpty() && emptySymbols.any { it.symbol == loginData.userEnteredSymbol }) {
+            add(createEmptySymbolItem(emptySymbols.first { it.symbol == loginData.userEnteredSymbol }))
        }

        addAll(createNotEmptySymbolItems(notEmptySymbols, students))
@ -317,7 +317,7 @@ class LoginStudentSelectPresenter @Inject constructor(
                loginData = loginData,
                registerUser = registerUser,
                lastErrorMessage = lastError?.message,
-                enteredSymbol = loginData.symbol,
+                enteredSymbol = loginData.userEnteredSymbol,
            )
        )
    }
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportDialog.kt
@ -105,7 +105,7 @@ class LoginSupportDialog : BaseDialogFragment<DialogLoginSupportBinding>() {
                    "${appInfo.systemManufacturer} ${appInfo.systemModel}",
                    appInfo.systemVersion.toString(),
                    "${appInfo.versionName}-${appInfo.buildFlavor}",
-                    supportInfo.loginData.baseUrl + "/" + supportInfo.loginData.symbol,
+                    supportInfo.loginData.let { "${it.baseUrl}/${it.defaultSymbol}/${it.userEnteredSymbol}" },
                    preferencesRepository.installationId,
                    getLastErrorFromStudentSelectScreen(),
                    dialogLoginSupportSchoolInput.text.takeIf { !it.isNullOrBlank() }
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@ -60,7 +60,7 @@ class LoginSymbolPresenter @Inject constructor(
        }

        loginData = loginData.copy(
-            symbol = view?.symbolValue?.getNormalizedSymbol(),
+            userEnteredSymbol = view?.symbolValue?.getNormalizedSymbol(),
        )
        resourceFlow {
            studentRepository.getUserSubjectsFromScrapper(
@ -68,7 +68,7 @@ class LoginSymbolPresenter @Inject constructor(
                password = loginData.password,
                scrapperBaseUrl = loginData.baseUrl,
                domainSuffix = loginData.domainSuffix,
-                symbol = loginData.symbol.orEmpty(),
+                symbol = loginData.userEnteredSymbol.orEmpty(),
            )
        }.onEach { user ->
            registerUser = user.dataOrNull
@ -93,7 +93,7 @@ class LoginSymbolPresenter @Inject constructor(
                        else -> {
                            val enteredSymbolDetails = user.data.symbols
                                .firstOrNull()
-                                ?.takeIf { it.symbol == loginData.symbol }
+                                ?.takeIf { it.symbol == loginData.userEnteredSymbol }

                            if (enteredSymbolDetails?.error is InvalidSymbolException) {
                                view?.run {
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@ -47,7 +47,7 @@
        <item>https://wulkanowy.net.pl/?email</item>
    </string-array>
    <string-array name="hosts_symbols">
-        <item>Default</item>
+        <item>warszawa</item>
        <item>opole</item>
        <item>gdansk</item>
        <item>lublin</item>
@ -66,7 +66,7 @@
        <item>gminaulanmajorat</item>
        <item>gminaozorkow</item>
        <item>gminalopiennikgorny</item>
-        <item>Default</item>
+        <item>warszawa</item>
        <item>powiatwulkanowy</item>
    </string-array>
 </resources>
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@ -42,6 +42,7 @@ fun getSemesterPojo(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalD
    diaryName = "$semesterId",
    schoolYear = 1970,
    classId = 0,
+    className = "Ti",
    semesterNumber = semesterName,
    unitId = 1,
    start = start,
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@ -58,7 +58,7 @@ class LoginStudentSelectPresenterTest {
        login = "",
        password = "",
        baseUrl = "",
-        symbol = null,
+        defaultSymbol = "warszawa",
        domainSuffix = "",
    )