prepare code for the inclusion of connection validator

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt

@@ -1,12 +1,12 @@
 package com.owncloud.android.lib.common
 
+import com.owncloud.android.lib.common.http.methods.HttpBaseMethod
+import com.owncloud.android.lib.common.http.methods.nonwebdav.HttpMethod
 import timber.log.Timber
 
-class ConnectionValidator (
+class ConnectionValidator {
-        private val ocClient: OwnCloudClient
-    ) {
 
-    fun dosomething() {
+    fun validate(method: HttpBaseMethod, client: OwnCloudClient) {
-        Timber.d(ocClient.toString())
+        Timber.d("hello world")
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java

@@ -28,7 +28,6 @@ package com.owncloud.android.lib.common;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
 import android.net.Uri;
-import android.util.Log;
 
 import at.bitfire.dav4jvm.exception.HttpException;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
@@ -38,7 +37,6 @@ import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
-import com.owncloud.android.lib.common.http.methods.nonwebdav.HttpMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.RandomUtils;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
@@ -70,26 +68,32 @@ public class OwnCloudClient extends HttpClient {
     private Uri mBaseUri;
     private OwnCloudVersion mVersion = null;
     private OwnCloudAccount mAccount;
-    private ConnectionValidator mConnectionValidator;
+    private final ConnectionValidator mConnectionValidator;
+    private Object mRequestMutex = new Object();
 
-    private static Boolean mHoldRequests = false;
+    // If set to true a mutex will be used to prevent parallel execution of the execute() method
+    // if false the execute() method can be called even though the mutex is already aquired.
+    // This is used for the ConnectionValidator, which has to be able to execute OperationsWhile all "normal" operations net
+    // to be set on hold.
+    private final Boolean mSynchronizeRequests;
 
     private SingleSessionManager mSingleSessionManager = null;
 
     private boolean mFollowRedirects;
 
-    public OwnCloudClient(Uri baseUri) {
+    public OwnCloudClient(Uri baseUri, ConnectionValidator connectionValidator, boolean synchronizeRequests) {
         if (baseUri == null) {
             throw new IllegalArgumentException("Parameter 'baseUri' cannot be NULL");
         }
         mBaseUri = baseUri;
+        mSynchronizeRequests = synchronizeRequests;
 
         mInstanceNumber = sIntanceCounter++;
         Timber.d("#" + mInstanceNumber + "Creating OwnCloudClient");
 
         clearCredentials();
         clearCookies();
-        mConnectionValidator = new ConnectionValidator(this);
+        mConnectionValidator = connectionValidator;
     }
 
     public void clearCredentials() {
@@ -99,10 +103,21 @@ public class OwnCloudClient extends HttpClient {
     }
 
     public int executeHttpMethod(HttpBaseMethod method) throws Exception {
+        if(mSynchronizeRequests) {
+            synchronized (mRequestMutex) {
+                return saveExecuteHttpMethod(method);
+            }
+        } else {
+            return saveExecuteHttpMethod(method);
+        }
+    }
+
+    private int saveExecuteHttpMethod(HttpBaseMethod method) throws Exception {
         boolean repeatWithFreshCredentials;
         int repeatCounter = 0;
         int status;
 
+        boolean retry = false;
         do {
             String requestId = RandomUtils.generateRandomUUID();
 
@@ -117,44 +132,14 @@ public class OwnCloudClient extends HttpClient {
 
             status = method.execute();
             stacklog(status, method);
-            /*
-            synchronized (mHoldRequests) {
-                while (mHoldRequests) {
-                    while (true) {
-                        try {
-                            throw new Exception("Stack log");
-                        } catch (Exception e) {
-                            Timber.d( "HATL BEFORE" +
-                                    "\nThread: " + Thread.currentThread().getName() +
-                                            "\nobject: " + this.toString() +
-                                            "\nMethod: " + method.getHttpUrl() +
-                                            "\ntrace: " + ExceptionUtils.getStackTrace(e));
-                        }
-                        Thread.sleep(40000);
-                    }
-                }
-                status = method.execute();
-                if (status == 302) {
-                    mHoldRequests = true;
-                    while (mHoldRequests) {
-                        try {
-                            throw new Exception("Stack log");
-                        } catch (Exception e) {
-                            Timber.d( "HALT AFTER" +
-                                    "\nresponsecode: " + Integer.toString(status) +
-                                            "\nThread: " + Thread.currentThread().getName() +
-                                            "\nobject: " + this.toString() +
-                                            "\nMethod: " + method.getHttpUrl() +
-                                            "\ntrace: " + ExceptionUtils.getStackTrace(e));
-                        }
-                        Thread.sleep(40000);
-                    }
-                }
 
+            if (status == HttpConstants.HTTP_MOVED_TEMPORARILY) {
+                mConnectionValidator.validate(method, this);
+                retry = true;
             }
-            */
 
             if (mFollowRedirects) {
+
                 status = followRedirection(method).getLastStatus();
             }
 
@@ -163,6 +148,7 @@ public class OwnCloudClient extends HttpClient {
                 repeatCounter++;
             }
         } while (repeatWithFreshCredentials);
+//        } while (retry);
 
         return status;
     }
@@ -384,22 +370,20 @@ public class OwnCloudClient extends HttpClient {
         boolean credentialsWereRefreshed = false;
 
         if (shouldInvalidateAccountCredentials(status)) {
-            boolean invalidated = invalidateAccountCredentials();
+            invalidateAccountCredentials();
 
-            if (invalidated) {
+            if (getCredentials().authTokenCanBeRefreshed() &&
-                if (getCredentials().authTokenCanBeRefreshed() &&
+                    repeatCounter < MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS) {
-                        repeatCounter < MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS) {
+                try {
-                    try {
+                    mAccount.loadCredentials(getContext());
-                        mAccount.loadCredentials(getContext());
+                    // if mAccount.getCredentials().length() == 0 --> refresh failed
-                        // if mAccount.getCredentials().length() == 0 --> refresh failed
+                    setCredentials(mAccount.getCredentials());
-                        setCredentials(mAccount.getCredentials());
+                    credentialsWereRefreshed = true;
-                        credentialsWereRefreshed = true;
 
-                    } catch (AccountsException | IOException e) {
+                } catch (AccountsException | IOException e) {
-                        Timber.e(e, "Error while trying to refresh auth token for %s",
+                    Timber.e(e, "Error while trying to refresh auth token for %s",
-                                mAccount.getSavedAccount().name
+                            mAccount.getSavedAccount().name
-                        );
+                    );
-                    }
                 }
 
                 if (!credentialsWereRefreshed && mSingleSessionManager != null) {
@@ -441,16 +425,14 @@ public class OwnCloudClient extends HttpClient {
      * <p>
      * {@link #shouldInvalidateAccountCredentials(int)} should be called first.
      *
-     * @return 'True' if invalidation was successful, 'false' otherwise.
      */
-    private boolean invalidateAccountCredentials() {
+    private void invalidateAccountCredentials() {
         AccountManager am = AccountManager.get(getContext());
         am.invalidateAuthToken(
                 mAccount.getSavedAccount().type,
                 mCredentials.getAuthToken()
         );
         am.clearPassword(mAccount.getSavedAccount()); // being strict, only needed for Basic Auth credentials
-        return true;
     }
 
     public boolean followRedirects() {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SingleSessionManager.java

@@ -49,6 +49,7 @@ public class SingleSessionManager {
 
     private static SingleSessionManager sDefaultSingleton;
     private static String sUserAgent;
+    private static ConnectionValidator sConnectionValidator;
 
     private ConcurrentMap<String, OwnCloudClient> mClientsWithKnownUsername = new ConcurrentHashMap<>();
     private ConcurrentMap<String, OwnCloudClient> mClientsWithUnknownUsername = new ConcurrentHashMap<>();
@@ -60,6 +61,14 @@ public class SingleSessionManager {
         return sDefaultSingleton;
     }
 
+    public static void setConnectionValidator(ConnectionValidator connectionValidator) {
+        sConnectionValidator = connectionValidator;
+    }
+
+    public static ConnectionValidator getConnectionValidator() {
+        return sConnectionValidator;
+    }
+
     public static String getUserAgent() {
         return sUserAgent;
     }
@@ -68,15 +77,23 @@ public class SingleSessionManager {
         sUserAgent = userAgent;
     }
 
-    private static OwnCloudClient createOwnCloudClient(Uri uri, Context context, boolean followRedirects) {
+    private static OwnCloudClient createOwnCloudClient(Uri uri, Context context, boolean followRedirects, ConnectionValidator connectionValidator) {
-        OwnCloudClient client = new OwnCloudClient(uri);
+        OwnCloudClient client = new OwnCloudClient(uri, connectionValidator, true);
         client.setFollowRedirects(followRedirects);
         HttpClient.setContext(context);
 
         return client;
     }
 
-    public OwnCloudClient getClientFor(OwnCloudAccount account, Context context) throws OperationCanceledException,
+    public OwnCloudClient getClientFor(OwnCloudAccount account,
+                                       Context context) throws OperationCanceledException,
+            AuthenticatorException, IOException {
+        return getClientFor(account, context, getConnectionValidator());
+    }
+
+    public OwnCloudClient getClientFor(OwnCloudAccount account,
+                                       Context context,
+                                       ConnectionValidator connectionValidator) throws OperationCanceledException,
             AuthenticatorException, IOException {
 
         Timber.d("getClientFor starting ");
@@ -115,7 +132,8 @@ public class SingleSessionManager {
             client = createOwnCloudClient(
                     account.getBaseUri(),
                     context.getApplicationContext(),
-                    true);    // TODO remove dependency on OwnCloudClientFactory
+                    true,
+                    connectionValidator);    // TODO remove dependency on OwnCloudClientFactory
 
             //the next two lines are a hack because okHttpclient is used as a singleton instead of being an
             //injected instance that can be deleted when required

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java

@@ -159,7 +159,7 @@ public abstract class RemoteOperation<T> implements Runnable {
             if (mAccount != null && mContext != null) {
                 OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
                 mClient = SingleSessionManager.getDefaultSingleton().
-                        getClientFor(ocAccount, mContext);
+                        getClientFor(ocAccount, mContext, SingleSessionManager.getConnectionValidator());
             } else {
                 throw new IllegalStateException("Trying to run a remote operation " +
                         "asynchronously with no client and no chance to create one (no account)");