X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5be4bf17e11bfae134f24bbc8501b618304467b4..c38a3b2ef12a3f6b4b1f0dad611d31cbd0686793:/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
index 6704bdea..5035269a 100644
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -72,6 +72,7 @@ import android.view.View.OnFocusChangeListener;
 import android.view.Window;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.owncloud.android.R;
@@ -201,9 +202,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         tv.setOnFocusChangeListener(this);
         tv2.setOnFocusChangeListener(this);
         
+        Button b = (Button) findViewById(R.id.account_register);
+        if (b != null) {
+            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));
+        }
+
         mNewCapturedUriFromOAuth2Redirection = null;
-        
-        Log.d(TAG, "onCreate");
     }
 
     
@@ -443,7 +447,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens
             }
             TextView tv = (TextView) findViewById(R.id.account_username);
-            tv.setError(message);
+            tv.setError(message + "        ");  // the extra spaces are a workaround for an ugly bug: 
+                                                // 1. insert wrong credentials and connect
+                                                // 2. put the focus on the user name field with using hardware controls (don't touch the screen); the error is shown UNDER the field
+                                                // 3. touch the user name field; the software keyboard appears; the error popup is moved OVER the field and SHRINKED in width, losing the last word
+                                                // Seen, at least, in Android 2.x devices
         }
     }
     public void onCancelClick(View view) {
@@ -484,7 +492,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
 
     public void onRegisterClick(View view) {
-        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse("https://owncloud.com/mobile/new"));
+        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));
         setResult(RESULT_CANCELED);
         startActivity(register);
     }
@@ -666,8 +674,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             onFocusChange(findViewById(R.id.host_URL), false);
         } else if (v.getId() == R.id.viewPassword) {
             TextView view = (TextView) findViewById(R.id.account_password);
-            int input_type = InputType.TYPE_CLASS_TEXT
-                    | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
+            int input_type = view.getInputType();
+            if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {
+                input_type = InputType.TYPE_CLASS_TEXT
+                        | InputType.TYPE_TEXT_VARIATION_PASSWORD;
+            } else {
+                input_type = InputType.TYPE_CLASS_TEXT
+                        | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
+            }
             view.setInputType(input_type);
         }
     }