Consider possible trailing / in input URL in login view

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 716bf7f..2087a27 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -71,6 +71,7 @@ import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
 import com.owncloud.android.lib.common.operations.RemoteOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.lib.common.operations.RemoteOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;\r

+import com.owncloud.android.lib.common.utils.Log_OC;\r

 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r


@@ -84,7 +85,6 @@ import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r

-import com.owncloud.android.utils.Log_OC;\r

 \r
 /**\r
  * This Activity is used to add an ownCloud account to the App\r
 \r
 /**\r
  * This Activity is used to add an ownCloud account to the App\r


@@ -733,7 +733,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             \r
             Intent getServerInfoIntent = new Intent();\r
             getServerInfoIntent.setAction(OperationsService.ACTION_GET_SERVER_INFO);\r
             \r
             Intent getServerInfoIntent = new Intent();\r
             getServerInfoIntent.setAction(OperationsService.ACTION_GET_SERVER_INFO);\r

-            getServerInfoIntent.putExtra(OperationsService.EXTRA_SERVER_URL, uri);\r
+            getServerInfoIntent.putExtra(\r
+                OperationsService.EXTRA_SERVER_URL, \r
+                normalizeUrlSuffix(uri)\r
+            );\r

             if (mOperationsServiceBinder != null) {\r
                 mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
             } else {\r
             if (mOperationsServiceBinder != null) {\r
                 mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
             } else {\r


@@ -1080,16 +1083,20 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                     url = "http://" + url;\r
                 }\r
             }\r
                     url = "http://" + url;\r
                 }\r
             }\r

-            \r
-            url = trimUrlWebdav(url);\r
-\r
-            if (url.endsWith("/")) {\r
-                url = url.substring(0, url.length() - 1);\r
-            }\r
-\r
+        \r
+            url = normalizeUrlSuffix(url);\r

         }\r
         return (url != null ? url : "");\r
     }\r
         }\r
         return (url != null ? url : "");\r
     }\r

+    \r
+    \r
+    private String normalizeUrlSuffix(String url) {\r
+        if (url.endsWith("/")) {\r
+            url = url.substring(0, url.length() - 1);\r
+        }\r
+        url = trimUrlWebdav(url);\r
+        return url;\r
+    }\r

 \r
 \r
     // TODO remove, if possible\r
 \r
 \r
     // TODO remove, if possible\r


@@ -1697,14 +1704,6 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         dialog.show(ft, UNTRUSTED_CERT_DIALOG_TAG);\r
     }\r
 \r
         dialog.show(ft, UNTRUSTED_CERT_DIALOG_TAG);\r
     }\r
 \r

-    /**\r
-     * Show authentication dialog \r
-     */\r
-    public void showAuthenticationDialog(WebView webView, HttpAuthHandler handler) {\r
-        // Show a dialog for the authentication\r
-        createAuthenticationDialog(webView, handler);\r
-        \r
-    }\r

 \r
     /**\r
      * Show untrusted cert dialog \r
 \r
     /**\r
      * Show untrusted cert dialog \r


@@ -1798,11 +1797,11 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * Create dialog for request authentication to the user\r
+     * Create and show dialog for request authentication to the user\r

      * @param webView\r
      * @param handler\r
      */\r
      * @param webView\r
      * @param handler\r
      */\r

-    private void createAuthenticationDialog(WebView webView, HttpAuthHandler handler) {\r
+    public void createAuthenticationDialog(WebView webView, HttpAuthHandler handler) {\r

 \r
         // Show a dialog with the certificate info\r
         CredentialsDialogFragment dialog = CredentialsDialogFragment.newInstanceForCredentials(webView, handler);\r
 \r
         // Show a dialog with the certificate info\r
         CredentialsDialogFragment dialog = CredentialsDialogFragment.newInstanceForCredentials(webView, handler);\r