X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c3482e1fd0da42aba795b608136a84b6104281ab..c06007b98a004ff7b03b08ef1e9136614ee15290:/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index ab31a5d5..5c9d093e 100644
--- a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
@@ -20,6 +20,7 @@ package eu.alefzero.owncloud.ui.activity;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLEncoder;
 
 import android.accounts.Account;
 import android.accounts.AccountAuthenticatorActivity;
@@ -167,6 +168,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
             String username = username_text.getText().toString().trim();
             String accountName = username + "@" + url.getHost();
+            if (url.getPort() >= 0) {
+                accountName += ":" + url.getPort();
+            }
             Account account = new Account(accountName,
                     AccountAuthenticator.ACCOUNT_TYPE);
             AccountManager accManager = AccountManager.get(this);
@@ -343,6 +347,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 if (uri.length() != 0) {
                     setResultIconAndText(R.drawable.progress_small,
                             R.string.auth_testing_connection);
+                    findViewById(R.id.buttonOK).setEnabled(false);  // avoid connect can be clicked if the test was previously passed
                     mConnChkRunnable = new ConnectionCheckerRunnable(uri, this);
                     mConnChkRunnable.setListener(this, mHandler);
                     mAuthThread = new Thread(mConnChkRunnable);