Merge pull request #1119 from owncloud/strip-index-php-from-server-url

Strip away index.php/apps/files to allow copy pasting from the server

diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 02ab3c7,42b45ea..7b0398e
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -742,7 -742,7 +742,7 @@@ public class AuthenticatorActivity exte
                  mOAuthTokenEndpointText.getText().toString().trim());\r
          \r
          getServerInfoIntent.putExtra(\r
-                 OperationsService.EXTRA_OAUTH2_QUERY_PARAMETERS, \r
+                 OperationsService.EXTRA_OAUTH2_QUERY_PARAMETERS,\r
                  queryParameters);\r
          \r
          if (mOperationsServiceBinder != null) {\r
@@@ -801,6 -801,8 +801,8 @@@
          showRefreshButton(false);\r
  \r
          if (uri.length() != 0) {\r
+             uri = stripIndexPhpOrAppsFiles(uri, mHostUrlInput);\r
+ \r
              // Handle internationalized domain names\r
              uri = DisplayUtils.convertIdn(uri, true);\r
  \r
@@@ -1143,6 -1145,17 +1145,17 @@@
          return url;\r
      }\r
  \r
+     private String stripIndexPhpOrAppsFiles(String url, EditText mHostUrlInput) {\r
+         if (url.endsWith("/index.php")) {\r
+             url = url.substring(0, url.lastIndexOf("/index.php"));\r
+             mHostUrlInput.setText(url);\r
+         } else if (url.contains("/index.php/apps/")) {\r
+             url = url.substring(0, url.lastIndexOf("/index.php/apps/"));\r
+             mHostUrlInput.setText(url);\r
+         }\r
+ \r
+         return url;\r
+     }\r
  \r
      // TODO remove, if possible\r
      private String trimUrlWebdav(String url){       \r
@@@ -1373,7 -1386,6 +1386,7 @@@
      public void onAuthenticatorTaskCallback(RemoteOperationResult result) {\r
          mWaitingForOpId = Long.MAX_VALUE;\r
          dismissDialog(WAIT_DIALOG_TAG);\r
 +        mAsyncTask = null;\r
  \r
          if (result.isSuccess()) {\r
              Log_OC.d(TAG, "Successful access - time to save the account");\r