summaryrefslogtreecommitdiffhomepage
path: root/android/app
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2022-07-26 15:22:29 +0200
committerAlbin <albin@mullvad.net>2022-07-26 15:22:29 +0200
commit5a0de4ae7ee5703bd7d45398f9836fa9f7592cca (patch)
treec5d6b89ef93cbaecf709181feb3a0ecffb607520 /android/app
parent44e2f20343304ecba21c44ccf73e82a157f6f588 (diff)
parent62118b2d86f87d0e08f4232e359e9226c8bb6f2b (diff)
downloadmullvadvpn-5a0de4ae7ee5703bd7d45398f9836fa9f7592cca.tar.xz
mullvadvpn-5a0de4ae7ee5703bd7d45398f9836fa9f7592cca.zip
Merge branch 'fix-login-error-message'
Diffstat (limited to 'android/app')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
index 18e2f08b95..1503052c93 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
@@ -169,7 +169,7 @@ class LoginFragment : BaseFragment(), NavigationBarPainter {
}
is LoginViewModel.LoginUiState.OtherError -> {
- loginFailure(uiState.errorMessage)
+ loginFailure(resources.getString(R.string.error_occurred))
}
}
}