From 183544646846be7f6fd1c160825b3a07e8c4e39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 26 Sep 2023 21:01:59 +0200
Subject: [PATCH] Fix password reset related issues (#2308)

* Fix login hint in password reset field

* Don't hide first password reset button

* Change recover button label
---
 .../wulkanowy/ui/modules/login/form/LoginFormFragment.kt      | 3 +--
 .../ui/modules/login/recover/LoginRecoverPresenter.kt         | 4 ++--
 app/src/main/res/values/strings.xml                           | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index aa2da311..0a2ea5d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -238,8 +238,7 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     }
 
     override fun showContact(show: Boolean) {
-        binding.loginFormContact.visibility = if (show) VISIBLE else GONE
-        binding.loginFormRecoverLink.visibility = if (show) GONE else VISIBLE
+        binding.loginFormContact.isVisible = show
     }
 
     override fun openPrivacyPolicyPage() {
diff --git 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
index 3d049301..a424df40 100644
--- 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
@@ -46,7 +46,7 @@ class LoginRecoverPresenter @Inject constructor(
 
     fun updateFields() {
         view?.run {
-            setUsernameHint(if ("standard" in recoverHostValue) emailHintString else loginPeselEmailHintString)
+            setUsernameHint(if ("email" in recoverHostValue) emailHintString else loginPeselEmailHintString)
         }
     }
 
@@ -92,7 +92,7 @@ class LoginRecoverPresenter @Inject constructor(
             isCorrect = false
         }
 
-        if ("standard" in host && "@" !in username) {
+        if ("email" in host && "@" !in username) {
             view?.setUsernameError(view?.invalidEmailString.orEmpty())
             isCorrect = false
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce277bdc..7da41b3d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,7 +76,7 @@
     <string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string>
     <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nIdentyfikator instalacji: %5$s\nOstatni błąd: %6$s\n\nNazwa szkoły i miejscowość: </string>
     <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">I forgot my password</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>