Merge branch 'develop' into login_toggle_password_icon

diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt
index 1cfdddc..d85eb89 100644 (file)
--- a/THIRD_PARTY.txt
+++ b/THIRD_PARTY.txt
@@ -44,7 +44,7 @@ The third party software included and used by this project is:
    Original license document included at libs/LICENSE.txt
    See http://jackrabbit.apache.org/
  
- * Transifex client.JavaMail API, version 1.4.3
+ * Transifex client.
    Copyright (C) Transifex.
    Licensed under GNU General Public License.
    Placed at third_party/transifex-client.

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 52f5392..dea86cd 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -50,10 +50,10 @@
                            android:id="@+id/LinearLayout1"\r
                            android:layout_width="match_parent"\r
                            android:layout_height="wrap_content"\r
-                           android:layout_margin="8dp"\r
                            android:focusable="true"\r
                            android:gravity="center"\r
-                           android:orientation="vertical" >\r
+                           android:orientation="vertical"\r
+                           android:padding="8dp" >\r
                \r
                                <EditText\r
                                        android:id="@+id/hostUrlInput"\r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 01593fa..688e525 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -17,24 +17,20 @@
   You should have received a copy of the GNU General Public License\r
   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 -->\r
-\r
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
     android:layout_gravity="center"\r
-       android:padding="8dip"\r
     android:fillViewport="true"\r
-    android:orientation="vertical"\r
-    >\r
+    android:orientation="vertical" >\r
 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
-               android:layout_margin="8dip"\r
-        android:gravity="center"\r
-        android:orientation="vertical" \r
         android:focusable="true"\r
-        >\r
+        android:gravity="center"\r
+        android:orientation="vertical"\r
+        android:padding="8dp" >\r
 \r
         <ImageView\r
             android:id="@+id/imageView1"\r
@@ -133,7 +129,7 @@
             android:enabled="false"\r
             android:onClick="onOkClick"\r
             android:text="@string/setup_btn_connect"\r
-            android:textColor="@android:color/black" />\r
+            />\r
 \r
         <Button\r
             android:id="@+id/account_register"\r

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 77fa724..7a48232 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -48,7 +48,9 @@ import android.net.Uri;
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
+import android.text.Editable;\r
 import android.text.InputType;\r
+import android.text.TextWatcher;\r
 import android.view.KeyEvent;\r
 import android.view.MotionEvent;\r
 import android.view.View;\r
@@ -266,6 +268,22 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 return true;\r
             }\r
         });\r
+        mHostUrlInput.addTextChangedListener(new TextWatcher() {\r
+\r
+            @Override\r
+            public void afterTextChanged(Editable s) {\r
+                if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {\r
+                    mOkButton.setEnabled(false);\r
+                }\r
+            }\r
+\r
+            @Override\r
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}\r
+\r
+            @Override\r
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}\r
+            \r
+        });\r
         mPasswordInput.setOnFocusChangeListener(this);\r
         mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);\r
         mPasswordInput.setOnEditorActionListener(this);\r
@@ -409,6 +427,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void onUrlInputFocusLost(TextView hostInput) {\r
         if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {\r
             checkOcServer();\r
+        } else {\r
+            mOkButton.setEnabled(mServerIsValid);\r
         }\r
     }\r
 \r
@@ -660,7 +680,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 url = url.substring(0, url.length() - 1);\r
             }\r
         }\r
-        return url;\r
+        return (url != null ? url : "");\r
     }\r
 \r
     /**\r