X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/832c1f4842ea279f145d8b6e0be71222a90a026e..a20681b06320824a80f6da1e86c1c2d52a371636:/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 bd0ddb0b..caa9820a 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);
@@ -204,8 +208,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             setResult(RESULT_OK, intent);
             Bundle bundle = new Bundle();
             bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-            getContentResolver().startSync(ProviderTableMeta.CONTENT_URI,
-                    bundle);
+            //getContentResolver().startSync(ProviderTableMeta.CONTENT_URI,
+            //        bundle);
+            ContentResolver.requestSync(account, "org.owncloud", bundle);
 
             /*
              * if
@@ -279,25 +284,22 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 .toString().toLowerCase();
 
         switch (type) {
-        case OK:
-            // ugly as hell
-            if (t_url.startsWith("http://") || t_url.startsWith("https://")) {
-                mIsSslConn = t_url.startsWith("http://") ? false : true;
-                mStatusIcon = R.drawable.ic_ok;
-                mStatusText = R.string.auth_connection_established;
-                mStatusCorrect = true;
-            } else {
-                mIsSslConn = true;
-                mStatusIcon = android.R.drawable.ic_secure;
-                mStatusText = R.string.auth_secure_connection;
-                mStatusCorrect = true;
-            }
-            break;
-        case OK_NO_SSL:
+        case OK_SSL:
+            mIsSslConn = true;
             mStatusIcon = android.R.drawable.ic_secure;
-            mStatusText = R.string.auth_nossl_plain_ok_title;
+            mStatusText = R.string.auth_secure_connection;
             mStatusCorrect = true;
+            break;
+        case OK_NO_SSL:
             mIsSslConn = false;
+            mStatusCorrect = true;
+            if (t_url.startsWith("http://") ) {
+                mStatusText = R.string.auth_connection_established;
+                mStatusIcon = R.drawable.ic_ok;
+            } else {
+                mStatusText = R.string.auth_nossl_plain_ok_title;
+                mStatusIcon = android.R.drawable.ic_partial_secure;
+            }
             break;
         case TIMEOUT:
         case INORRECT_ADDRESS:
@@ -342,6 +344,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);