From 2acfb6655d09bb4e973f489108628f3b797e4ffa Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sat, 27 Aug 2016 21:01:00 +0200
Subject: [PATCH] Refactor a little bit LoginActitivy error handlers

---
 .../activities/LoginActivity.java             | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java
index 0fcbf16..2a19929 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java
@@ -302,37 +302,37 @@ public class LoginActivity extends AppCompatActivity {
 				settingsIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 				getApplicationContext().startActivity(settingsIntent);
 			} else {
+                boolean serverViewRequestFocus = true;
 				switch (_returnCode) {
-                    case OK:
-                        break;
                     case INVALID_ADDR:
 						_serverView.setError(getString(R.string.error_invalid_server_address));
-						_serverView.requestFocus();
 						break;
 					case HTTP_CONN_FAILED:
 						_serverView.setError(getString(R.string.error_http_connection_failed));
-						_serverView.requestFocus();
 						break;
 					case CONN_FAILED:
 						_serverView.setError(getString(R.string.error_connection_failed));
-						_serverView.requestFocus();
 						break;
                     case CONN_FAILED_NOT_FOUND:
                         _serverView.setError(getString(R.string.error_connection_failed_not_found));
-                        _serverView.requestFocus();
                         break;
-					case INVALID_LOGIN:
-						_passwordView.setError(getString(R.string.error_invalid_login));
-						_passwordView.requestFocus();
-						break;
 					case UNKNOWN_ERROR:
                         _serverView.setError("UNK");
-                        _serverView.requestFocus();
 						break;
-				default:
-					break;
+                    case INVALID_LOGIN:
+                        _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 (_returnCode != LoginReturnCode.OK) {
                     _signInButton.setProgress(0);