From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sun, 22 Nov 2015 16:10:37 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ecdb95fa0cef923d76ce8d17b2d535247707466b?ds=inline;hp=-c

Merge branch 'master' of https://github.com/owncloud/android into material_buttons
---

ecdb95fa0cef923d76ce8d17b2d535247707466b
diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 4173ca42,7b0398e8..418cdd5f
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -176,6 -176,7 +176,6 @@@ public class AuthenticatorActivity exte
      private EditText mUsernameInput;
      private EditText mPasswordInput;
      private View mOkButton;
 -    private View mCenteredRefreshButton;
      private TextView mAuthStatusView;
  
      private int mAuthStatusText = 0, mAuthStatusIcon = 0;
@@@ -260,22 -261,16 +260,22 @@@
              }
          });
  
 -        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);
 -        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {
 +        findViewById(R.id.centeredRefreshButton).setOnClickListener(new View.OnClickListener() {
  
              @Override
              public void onClick(View v) {
                  checkOcServer();
              }
          });
 -        
 -        mOkButton = findViewById(R.id.buttonOK);
 +
 +        findViewById(R.id.embeddedRefreshButton).setOnClickListener(new View.OnClickListener() {
 +
 +            @Override
 +            public void onClick(View v) {
 +                checkOcServer();
 +            }
 +        });
 +
  
          /// initialize block to be moved to single Fragment to check server and get info about it 
          initServerPreFragment(savedInstanceState);
@@@ -707,7 -702,7 +707,7 @@@
          
          mHostUrlInput.removeTextChangedListener(mHostUrlInputWatcher);
          mHostUrlInput.setOnFocusChangeListener(null);
 -        
 +
          super.onPause();
      }
      
@@@ -747,7 -742,7 +747,7 @@@
                  mOAuthTokenEndpointText.getText().toString().trim());
          
          getServerInfoIntent.putExtra(
-                 OperationsService.EXTRA_OAUTH2_QUERY_PARAMETERS, 
+                 OperationsService.EXTRA_OAUTH2_QUERY_PARAMETERS,
                  queryParameters);
          
          if (mOperationsServiceBinder != null) {
@@@ -806,6 -801,8 +806,8 @@@
          showRefreshButton(false);
  
          if (uri.length() != 0) {
+             uri = stripIndexPhpOrAppsFiles(uri, mHostUrlInput);
+ 
              // Handle internationalized domain names
              uri = DisplayUtils.convertIdn(uri, true);
  
@@@ -816,8 -813,8 +818,8 @@@
              Intent getServerInfoIntent = new Intent();
              getServerInfoIntent.setAction(OperationsService.ACTION_GET_SERVER_INFO);
              getServerInfoIntent.putExtra(
 -                OperationsService.EXTRA_SERVER_URL,
 -                normalizeUrlSuffix(uri)
 +                    OperationsService.EXTRA_SERVER_URL,
 +                    normalizeUrlSuffix(uri)
              );
              if (mOperationsServiceBinder != null) {
                  mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);
@@@ -1148,6 -1145,17 +1150,17 @@@
          return url;
      }
  
+     private String stripIndexPhpOrAppsFiles(String url, EditText mHostUrlInput) {
+         if (url.endsWith("/index.php")) {
+             url = url.substring(0, url.lastIndexOf("/index.php"));
+             mHostUrlInput.setText(url);
+         } else if (url.contains("/index.php/apps/")) {
+             url = url.substring(0, url.lastIndexOf("/index.php/apps/"));
+             mHostUrlInput.setText(url);
+         }
+ 
+         return url;
+     }
  
      // TODO remove, if possible
      private String trimUrlWebdav(String url){       
@@@ -1630,6 -1638,18 +1643,6 @@@
      }
  
      /**
 -     * Called when the refresh button in the input field for ownCloud host is clicked.
 -     * 
 -     * Performs a new check on the URL in the input field.
 -     * 
 -     * @param view      Refresh 'button'
 -     */
 -    public void onRefreshClick(View view) {
 -        checkOcServer();
 -    }
 -
 -
 -    /**
       * Called when the eye icon in the password field is clicked.
       * 
       * Toggles the visibility of the password in the field.