github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-31 23:02:45 +01:00
Code

Fix wrong index in form host value (#507)

Browse Source
This commit is contained in:
Rafał Borcz 2019-09-16 23:27:58 +02:00 committed by Mikołaj Pich
parent 3ee98e2bd0
commit 6089df9462
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
override val formPassValue get() = loginFormPass.text.toString() override val formPassValue get() = loginFormPass.text.toString()
override val formHostValue get() = hostValues[(hostKeys.indexOf(loginFormHost.text.toString()))] override val formHostValue get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
private lateinit var hostKeys: Array<String> private lateinit var hostKeys: Array<String>
@ -146,13 +146,8 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
loginFormPrivacyLink.visibility = VISIBLE loginFormPrivacyLink.visibility = VISIBLE
} }
override fun notifyParentAccountLogged(students: List<Student>) { override fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
(activity as? LoginActivity)?.onFormFragmentAccountLogged(students, (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, loginData)
Triple(
loginFormName.text.toString(),
loginFormPass.text.toString(),
formHostValue
))
} }
override fun openPrivacyPolicyPage() { override fun openPrivacyPolicyPage() {

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

@ -40,7 +40,9 @@ class LoginFormPresenter @Inject constructor(
view?.apply { view?.apply {
clearPassError() clearPassError()
clearNameError() clearNameError()
if (formHostValue.contains("fakelog")) setCredentials("jan@fakelog.cf", "jan123") if (formHostValue?.contains("fakelog") == true) {
setCredentials("jan@fakelog.cf", "jan123")
}
} }
} }
@ -79,7 +81,7 @@ class LoginFormPresenter @Inject constructor(
.subscribe({ .subscribe({
Timber.i("Login result: Success") Timber.i("Login result: Success")
analytics.logEvent("registration_form", "success" to true, "students" to it.size, "endpoint" to endpoint, "error" to "No error") analytics.logEvent("registration_form", "success" to true, "students" to it.size, "endpoint" to endpoint, "error" to "No error")
view?.notifyParentAccountLogged(it) view?.notifyParentAccountLogged(it, Triple(email, password, endpoint))
}, { }, {
Timber.i("Login result: An exception occurred") Timber.i("Login result: An exception occurred")
analytics.logEvent("registration_form", "success" to false, "students" to -1, "endpoint" to endpoint, "error" to it.message.ifNullOrBlank { "No message" }) analytics.logEvent("registration_form", "success" to false, "students" to -1, "endpoint" to endpoint, "error" to it.message.ifNullOrBlank { "No message" })

4
app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
View File

@ -11,7 +11,7 @@ interface LoginFormView : BaseView {
val formPassValue: String val formPassValue: String
val formHostValue: String val formHostValue: String?
fun setCredentials(name: String, pass: String) fun setCredentials(name: String, pass: String)
@ -39,7 +39,7 @@ interface LoginFormView : BaseView {
fun showPrivacyPolicy() fun showPrivacyPolicy()
fun notifyParentAccountLogged(students: List<Student>) fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>)
fun openPrivacyPolicyPage() fun openPrivacyPolicyPage()
} }