X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a4ba6170ea7696e085b07adfef73eeb8b77cb8e2..ceb3dfdd059dd4f2aca8a784476fb60e610b78f6:/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 4aa7cddd..a1098094 100644
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -41,6 +41,7 @@ import android.content.ContentResolver;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -228,13 +229,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }
     }
     public void onCancelClick(View view) {
+        setResult(RESULT_CANCELED);
         finish();
     }
     
     public void onOkClick(View view) {
         String prefix = "";
         String url = ((TextView) findViewById(R.id.host_URL)).getText()
-                .toString();
+                .toString().trim();
         if (mIsSslConn) {
             prefix = "https://";
         } else {
@@ -246,10 +248,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }
         continueConnection(prefix);
     }
+    
+    public void onRegisterClick(View view) {
+        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse("https://owncloud.com/mobile/new"));
+        setResult(RESULT_CANCELED);
+        startActivity(register);
+    }
 
     private void continueConnection(String prefix) {
         String url = ((TextView) findViewById(R.id.host_URL)).getText()
-                .toString();
+                .toString().trim();
         String username = ((TextView) findViewById(R.id.account_username))
                 .getText().toString();
         String password = ((TextView) findViewById(R.id.account_password))
@@ -266,7 +274,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             String url_str = prefix + url + webdav_path;
             uri = new URL(url_str);
         } catch (MalformedURLException e) {
-            // should not happend
+            // should not happen
             e.printStackTrace();
         }
 
@@ -282,7 +290,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mStatusText = mStatusIcon = 0;
         mStatusCorrect = false;
         String t_url = ((TextView) findViewById(R.id.host_URL)).getText()
-                .toString().toLowerCase();
+                .toString().trim().toLowerCase();
 
         switch (type) {
         case OK_SSL:
@@ -302,12 +310,33 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mStatusIcon = android.R.drawable.ic_partial_secure;
             }
             break;
+        case BAD_OC_VERSION:
+            mStatusIcon = R.drawable.common_error;
+            mStatusText = R.string.auth_bad_oc_version_title;
+            break;
+        case WRONG_CONNECTION:
+            mStatusIcon = R.drawable.common_error;
+            mStatusText = R.string.auth_wrong_connection_title;
+            break;
         case TIMEOUT:
-        case INORRECT_ADDRESS:
+            mStatusIcon = R.drawable.common_error;
+            mStatusText = R.string.auth_timeout_title;
+            break;
+        case INCORRECT_ADDRESS:
+            mStatusIcon = R.drawable.common_error;
+            mStatusText = R.string.auth_incorrect_address_title;
+            break;
+        case SSL_UNVERIFIED_SERVER:
+            mStatusIcon = R.drawable.common_error;
+            mStatusText = R.string.auth_ssl_unverified_server_title;
+            break;
         case SSL_INIT_ERROR:
+            mStatusIcon = R.drawable.common_error;
+            mStatusText = R.string.auth_ssl_general_error_title;
+            break;
         case HOST_NOT_AVAILABLE:
             mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_unknow_host_title;
+            mStatusText = R.string.auth_unknown_host_title;
             break;
         case NO_NETWORK_CONNECTION:
             mStatusIcon = R.drawable.no_network;
@@ -319,7 +348,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             break;
         case UNKNOWN_ERROR:
             mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_unknow_error;
+            mStatusText = R.string.auth_unknown_error_title;
             break;
         case FILE_NOT_FOUND:
             mStatusIcon = R.drawable.common_error;
@@ -341,7 +370,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         if (view.getId() == R.id.host_URL) {
             if (!hasFocus) {
                 TextView tv = ((TextView) findViewById(R.id.host_URL));
-                String uri = tv.getText().toString();
+                String uri = tv.getText().toString().trim();
                 if (uri.length() != 0) {
                     setResultIconAndText(R.drawable.progress_small,
                             R.string.auth_testing_connection);