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

diff --combined res/layout/account_setup.xml
index 7ac0f36,876d834..d5fd323
--- 1/res/layout/account_setup.xml
--- 2/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -40,6 -40,7 +40,7 @@@
              android:layout_height="wrap_content"\r
              android:layout_marginBottom="20dp"\r
              android:layout_marginTop="10dp"\r
+             android:background="@color/login_logo_background_color"\r
              android:src="@drawable/logo"\r
              android:contentDescription="@string/app_name"/>\r
  \r
@@@ -96,6 -97,7 +97,6 @@@
                            android:padding="0dp"\r
                            android:scaleType="fitCenter"\r
                            android:src="@drawable/ic_action_refresh_grey"\r
 -              android:onClick="onRefreshClick"\r
                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r
                  android:contentDescription="@string/auth_refresh_button"\r

diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 73bd6e4,02ab3c7..4173ca4
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/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;\r
      private EditText mPasswordInput;\r
      private View mOkButton;\r
 -    private View mCenteredRefreshButton;\r
      private TextView mAuthStatusView;\r
  \r
      private int mAuthStatusText = 0, mAuthStatusIcon = 0;\r
@@@ -260,22 -261,16 +260,22 @@@
              }\r
          });\r
  \r
 -        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);\r
 -        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {\r
 +        findViewById(R.id.centeredRefreshButton).setOnClickListener(new View.OnClickListener() {\r
  \r
              @Override\r
              public void onClick(View v) {\r
                  checkOcServer();\r
              }\r
          });\r
 -        \r
 -        mOkButton = findViewById(R.id.buttonOK);\r
 +\r
 +        findViewById(R.id.embeddedRefreshButton).setOnClickListener(new View.OnClickListener() {\r
 +\r
 +            @Override\r
 +            public void onClick(View v) {\r
 +                checkOcServer();\r
 +            }\r
 +        });\r
 +\r
  \r
          /// initialize block to be moved to single Fragment to check server and get info about it \r
          initServerPreFragment(savedInstanceState);\r
@@@ -707,7 -702,7 +707,7 @@@
          \r
          mHostUrlInput.removeTextChangedListener(mHostUrlInputWatcher);\r
          mHostUrlInput.setOnFocusChangeListener(null);\r
 -        \r
 +\r
          super.onPause();\r
      }\r
      \r
@@@ -816,8 -811,8 +816,8 @@@
              Intent getServerInfoIntent = new Intent();\r
              getServerInfoIntent.setAction(OperationsService.ACTION_GET_SERVER_INFO);\r
              getServerInfoIntent.putExtra(\r
 -                OperationsService.EXTRA_SERVER_URL,\r
 -                normalizeUrlSuffix(uri)\r
 +                    OperationsService.EXTRA_SERVER_URL,\r
 +                    normalizeUrlSuffix(uri)\r
              );\r
              if (mOperationsServiceBinder != null) {\r
                  mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);\r
@@@ -1378,6 -1373,7 +1378,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
@@@ -1629,6 -1625,18 +1630,6 @@@
      }\r
  \r
      /**\r
 -     * Called when the refresh button in the input field for ownCloud host is clicked.\r
 -     * \r
 -     * Performs a new check on the URL in the input field.\r
 -     * \r
 -     * @param view      Refresh 'button'\r
 -     */\r
 -    public void onRefreshClick(View view) {\r
 -        checkOcServer();\r
 -    }\r
 -\r
 -\r
 -    /**\r
       * Called when the eye icon in the password field is clicked.\r
       * \r
       * Toggles the visibility of the password in the field. \r