mirror of
https://github.com/nerzhul/ownCloud-SMS-App.git
synced 2025-06-23 07:46:22 +00:00
Refactor a little bit LoginActitivy error handlers
This commit is contained in:
parent
678fe0b720
commit
2acfb6655d
@ -302,37 +302,37 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
settingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
settingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
getApplicationContext().startActivity(settingsIntent);
|
getApplicationContext().startActivity(settingsIntent);
|
||||||
} else {
|
} else {
|
||||||
|
boolean serverViewRequestFocus = true;
|
||||||
switch (_returnCode) {
|
switch (_returnCode) {
|
||||||
case OK:
|
|
||||||
break;
|
|
||||||
case INVALID_ADDR:
|
case INVALID_ADDR:
|
||||||
_serverView.setError(getString(R.string.error_invalid_server_address));
|
_serverView.setError(getString(R.string.error_invalid_server_address));
|
||||||
_serverView.requestFocus();
|
|
||||||
break;
|
break;
|
||||||
case HTTP_CONN_FAILED:
|
case HTTP_CONN_FAILED:
|
||||||
_serverView.setError(getString(R.string.error_http_connection_failed));
|
_serverView.setError(getString(R.string.error_http_connection_failed));
|
||||||
_serverView.requestFocus();
|
|
||||||
break;
|
break;
|
||||||
case CONN_FAILED:
|
case CONN_FAILED:
|
||||||
_serverView.setError(getString(R.string.error_connection_failed));
|
_serverView.setError(getString(R.string.error_connection_failed));
|
||||||
_serverView.requestFocus();
|
|
||||||
break;
|
break;
|
||||||
case CONN_FAILED_NOT_FOUND:
|
case CONN_FAILED_NOT_FOUND:
|
||||||
_serverView.setError(getString(R.string.error_connection_failed_not_found));
|
_serverView.setError(getString(R.string.error_connection_failed_not_found));
|
||||||
_serverView.requestFocus();
|
|
||||||
break;
|
break;
|
||||||
case INVALID_LOGIN:
|
|
||||||
_passwordView.setError(getString(R.string.error_invalid_login));
|
|
||||||
_passwordView.requestFocus();
|
|
||||||
break;
|
|
||||||
case UNKNOWN_ERROR:
|
case UNKNOWN_ERROR:
|
||||||
_serverView.setError("UNK");
|
_serverView.setError("UNK");
|
||||||
_serverView.requestFocus();
|
|
||||||
break;
|
break;
|
||||||
default:
|
case INVALID_LOGIN:
|
||||||
break;
|
_passwordView.setError(getString(R.string.error_invalid_login));
|
||||||
|
_passwordView.requestFocus();
|
||||||
|
// Warning, there is no break here to disable serverViewRequestFocus too
|
||||||
|
case OK:
|
||||||
|
default:
|
||||||
|
serverViewRequestFocus = false;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (serverViewRequestFocus) {
|
||||||
|
_serverView.requestFocus();
|
||||||
|
}
|
||||||
|
|
||||||
// If not ok, reset the progress
|
// If not ok, reset the progress
|
||||||
if (_returnCode != LoginReturnCode.OK) {
|
if (_returnCode != LoginReturnCode.OK) {
|
||||||
_signInButton.setProgress(0);
|
_signInButton.setProgress(0);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user