Merge branch 'main' into fix/nearby-pins-disappearing

This commit is contained in:
Nicolas Raoul 2024-12-21 19:56:56 +09:00 committed by GitHub
commit 4325420b89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -182,11 +182,11 @@ class LoginActivity : AccountAuthenticatorActivity() {
override fun onSaveInstanceState(outState: Bundle) {
// if progressDialog is visible during the configuration change then store state as true else false so that
// we maintain visibility of progressDailog after configuration change
// we maintain visibility of progressDialog after configuration change
if (progressDialog != null && progressDialog!!.isShowing) {
outState.putBoolean(saveProgressDailog, true)
outState.putBoolean(saveProgressDialog, true)
} else {
outState.putBoolean(saveProgressDailog, false)
outState.putBoolean(saveProgressDialog, false)
}
outState.putString(
saveErrorMessage,
@ -206,7 +206,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
super.onRestoreInstanceState(savedInstanceState)
binding!!.loginUsername.setText(savedInstanceState.getString(saveUsername))
binding!!.loginPassword.setText(savedInstanceState.getString(savePassword))
if (savedInstanceState.getBoolean(saveProgressDailog)) {
if (savedInstanceState.getBoolean(saveProgressDialog)) {
performLogin()
}
val errorMessage = savedInstanceState.getString(saveErrorMessage)
@ -396,7 +396,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
fun startYourself(context: Context) =
context.startActivity(Intent(context, LoginActivity::class.java))
const val saveProgressDailog: String = "ProgressDailog_state"
const val saveProgressDialog: String = "ProgressDialog_state"
const val saveErrorMessage: String = "errorMessage"
const val saveUsername: String = "username"
const val savePassword: String = "password"