Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #1406 - Error messages in LoginActivity disappear after orientation change. #1407

Merged
merged 4 commits into from
Apr 30, 2018
Merged

Fixes #1406 - Error messages in LoginActivity disappear after orientation change. #1407

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
964c612
Merge pull request #4 from commons-app/master
knight-shade Mar 17, 2018
52eac7c
Merge pull request #5 from commons-app/master
knight-shade Mar 23, 2018
71235b3
Merge pull request #6 from commons-app/master
knight-shade Mar 30, 2018
1e37cb6
Error messages in LoginActivity persist after orientation change.
knight-shade Apr 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ public class LoginActivity extends AccountAuthenticatorActivity {
private LoginTextWatcher textWatcher = new LoginTextWatcher();

private Boolean loginCurrentlyInProgress = false;
private Boolean errorMessageShown = false;
private String resultantError;
private static final String RESULTANT_ERROR = "resultantError";
private static final String ERROR_MESSAGE_SHOWN = "errorMessageShown";
private static final String LOGING_IN = "logingIn";

@Override
Expand Down Expand Up @@ -215,6 +219,8 @@ private void handleLogin(String username, String password, String result) {
handlePassResult(username, password);
} else {
loginCurrentlyInProgress = false;
errorMessageShown = true;
resultantError = result;
handleOtherResults(result);
}
}
Expand Down Expand Up @@ -341,15 +347,22 @@ public MenuInflater getMenuInflater() {
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(LOGING_IN, loginCurrentlyInProgress);
outState.putBoolean(ERROR_MESSAGE_SHOWN, errorMessageShown);
outState.putString(RESULTANT_ERROR, resultantError);
}

@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
loginCurrentlyInProgress = savedInstanceState.getBoolean(LOGING_IN, false);
errorMessageShown = savedInstanceState.getBoolean(ERROR_MESSAGE_SHOWN, false);
if(loginCurrentlyInProgress){
performLogin();
}
if(errorMessageShown){
resultantError = savedInstanceState.getString(RESULTANT_ERROR);
handleOtherResults(resultantError);
}
}

public void askUserForTwoFactorAuth() {
Expand All @@ -361,7 +374,9 @@ public void askUserForTwoFactorAuth() {

public void showMessageAndCancelDialog(@StringRes int resId) {
showMessage(resId, R.color.secondaryDarkColor);
progressDialog.cancel();
if(progressDialog != null){
progressDialog.cancel();
}
}

public void showSuccessAndDismissDialog() {
Expand Down