From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 25 Sep 2015 14:09:01 +0000 (+0200)
Subject: Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~19
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5417b2a4e5114686aa1f9fadb55a6d464947acb8?ds=inline;hp=-c

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

5417b2a4e5114686aa1f9fadb55a6d464947acb8
diff --combined res/layout/account_setup.xml
index 7ac0f365,876d834c..d5fd3234
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -40,6 -40,7 +40,7 @@@
              android:layout_height="wrap_content"
              android:layout_marginBottom="20dp"
              android:layout_marginTop="10dp"
+             android:background="@color/login_logo_background_color"
              android:src="@drawable/logo"
              android:contentDescription="@string/app_name"/>
  
@@@ -96,6 -97,7 +97,6 @@@
  			    android:padding="0dp"
  			    android:scaleType="fitCenter"
  			    android:src="@drawable/ic_action_refresh_grey"
 -            	android:onClick="onRefreshClick"
  				android:visibility="gone"
  				android:background="@android:color/transparent"
                  android:contentDescription="@string/auth_refresh_button"
diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 73bd6e4a,02ab3c7b..4173ca42
--- 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();
      }
      
@@@ -816,8 -811,8 +816,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);
@@@ -1378,6 -1373,7 +1378,7 @@@
      public void onAuthenticatorTaskCallback(RemoteOperationResult result) {
          mWaitingForOpId = Long.MAX_VALUE;
          dismissDialog(WAIT_DIALOG_TAG);
+         mAsyncTask = null;
  
          if (result.isSuccess()) {
              Log_OC.d(TAG, "Successful access - time to save the account");
@@@ -1629,6 -1625,18 +1630,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.