Fix #47 Pressing enter when finished writing in the password field should automatically connect

2 files changed, 27 insertions, 12 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java
index 70a00707..8841b5fa 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java
@@ -11,9 +11,11 @@ import android.support.v7.app.AppCompatActivity;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
@@ -91,20 +93,18 @@ public class SettingsActivity extends AppCompatActivity {
         field_username.setText(preferences.getString(SETTINGS_USERNAME, DEFAULT_SETTINGS));
         field_password.setText(preferences.getString(SETTINGS_PASSWORD, DEFAULT_SETTINGS));
 
+        field_password.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                login();
+                return true;
+            }
+        });
+
         btn_submit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String url = field_url.getText().toString();
-                String username = field_username.getText().toString();
-                String password = field_password.getText().toString();
-
-                if (!url.endsWith("/")) {
-                    url += "/";
-                }
-                if (!url.startsWith("http://") && !url.startsWith("https://")) {
-                    url = "https://" + url;
-                }
-                new LoginValidatorAsyncTask().execute(url, username, password);
+                login();
             }
         });
     }
@@ -119,6 +119,20 @@ public class SettingsActivity extends AppCompatActivity {
         }
     }
 
+    private void login() {
+        String url = field_url.getText().toString();
+        String username = field_username.getText().toString();
+        String password = field_password.getText().toString();
+
+        if (!url.endsWith("/")) {
+            url += "/";
+        }
+        if (!url.startsWith("http://") && !url.startsWith("https://")) {
+            url = "https://" + url;
+        }
+        new LoginValidatorAsyncTask().execute(url, username, password);
+    }
+
     /************************************ Async Tasks ************************************/
 
     /**
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index a0e35180..6f5088b4 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -41,7 +41,8 @@
             android:id="@+id/settings_username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/settings_username" />
+            android:hint="@string/settings_username"
+            android:inputType="text"/>
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout