diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-03 17:55:33 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-04 11:54:35 +0000 |
| commit | ec0c5b7f1c17c8b759a0e0052b36666d11f2cfaf (patch) | |
| tree | 1006f437ea0a2f2060e100a721b138e9f50a42ff /android/src/main | |
| parent | d156324a9868c6c9389a9a33f38cda06861990fe (diff) | |
| download | mullvadvpn-ec0c5b7f1c17c8b759a0e0052b36666d11f2cfaf.tar.xz mullvadvpn-ec0c5b7f1c17c8b759a0e0052b36666d11f2cfaf.zip | |
Rename widget reference property to `accountLogin`
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt index 7bb365b096..0deaff3ed8 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt @@ -29,7 +29,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { private lateinit var loggingInStatus: View private lateinit var loggedInStatus: View private lateinit var loginFailStatus: View - private lateinit var accountInput: AccountLogin + private lateinit var accountLogin: AccountLogin private lateinit var scrollArea: ScrollView private val loggedIn = CompletableDeferred<LoginResult>() @@ -47,8 +47,8 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { loggedInStatus = view.findViewById(R.id.logged_in_status) loginFailStatus = view.findViewById(R.id.login_fail_status) - accountInput = view.findViewById(R.id.account_login) - accountInput.onLogin = { accountToken -> login(accountToken) } + accountLogin = view.findViewById(R.id.account_login) + accountLogin.onLogin = { accountToken -> login(accountToken) } view.findViewById<Button>(R.id.create_account) .setOnClickAction("createAccount", jobTracker) { createAccount() } @@ -56,7 +56,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { scrollArea = view.findViewById(R.id.scroll_area) fetchHistory() - scrollToShow(accountInput) + scrollToShow(accountLogin) return view } @@ -91,7 +91,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { loginFailStatus.visibility = View.GONE loggedInStatus.visibility = View.GONE - accountInput.state = LoginState.InProgress + accountLogin.state = LoginState.InProgress scrollToShow(loggingInStatus) @@ -114,7 +114,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { loginFailStatus.visibility = View.GONE loggedInStatus.visibility = View.GONE - accountInput.state = LoginState.InProgress + accountLogin.state = LoginState.InProgress scrollToShow(loggingInStatus) @@ -123,7 +123,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { private fun fetchHistory() { jobTracker.newUiJob("fetchHistory") { - accountInput.accountHistory = jobTracker.runOnBackground() { + accountLogin.accountHistory = jobTracker.runOnBackground() { daemon.getAccountHistory() } } @@ -177,7 +177,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { loginFailStatus.visibility = View.GONE loggedInStatus.visibility = View.VISIBLE - accountInput.state = LoginState.Success + accountLogin.state = LoginState.Success scrollToShow(loggedInStatus) } @@ -197,8 +197,8 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { loginFailStatus.visibility = View.VISIBLE loggedInStatus.visibility = View.GONE - accountInput.state = LoginState.Failure + accountLogin.state = LoginState.Failure - scrollToShow(accountInput) + scrollToShow(accountLogin) } } |