Keep refactoring wrapper

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

@@ -33,8 +33,8 @@ import android.net.Uri;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentials;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory.OwnCloudAnonymousCredentials;
-import com.owncloud.android.lib.common.interceptors.HttpInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor;
-import com.owncloud.android.lib.common.interceptors.UserAgentInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.UserAgentInterceptor;
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -59,7 +59,6 @@ import java.util.Arrays;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
-import okhttp3.Response;
 
 public class OwnCloudClient extends HttpClient {
 

src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java

@@ -24,8 +24,8 @@
 package com.owncloud.android.lib.common.authentication;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.interceptors.BasicAuthInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor;
-import com.owncloud.android.lib.common.interceptors.HttpInterceptor.RequestInterceptor;
+import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor.RequestInterceptor;
 
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthPolicy;

src/com/owncloud/android/lib/common/http/HttpBaseMethod.java

@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import okhttp3.Headers;
+import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.internal.http2.Header;
@@ -43,10 +44,15 @@ import okhttp3.internal.http2.Header;
  */
 public abstract class HttpBaseMethod {
     public abstract int execute() throws Exception;
+    protected Request mRequest;
     protected Response mResponse;
-    private static final String TAG = HttpBaseMethod.class.getSimpleName();
 
-    // Status
+    // Request
+    public Headers getRequestHeaders() {
+        return mRequest.headers();
+    }
+
+    // Response
     public int getStatusCode() {
         return mResponse.code();
     }
@@ -55,7 +61,6 @@ public abstract class HttpBaseMethod {
         return mResponse.message();
     }
 
-    // Response
     public String getResponseBodyAsString() throws IOException {
         return mResponse.body().string();
     }

src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.interceptors;
+package com.owncloud.android.lib.common.http.interceptors;
 
 import okhttp3.Request;
 

src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.interceptors;
+package com.owncloud.android.lib.common.http.interceptors;
 
 import java.io.IOException;
 import java.util.ArrayList;

src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.interceptors;
+package com.owncloud.android.lib.common.http.interceptors;
 
 import okhttp3.Request;
 

src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java

@@ -22,11 +22,10 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * OkHttp delete calls wrapper
@@ -40,13 +39,10 @@ public class DeleteMethod extends HttpMethod{
 
     @Override
     public int execute() throws Exception {
-        Request request = mRequest
+        mRequest.newBuilder()
-                .newBuilder()
                 .delete()
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
+        return super.executeRequest();
-
-        return mResponse.code();
     }
 }

src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java

@@ -22,13 +22,12 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import java.io.IOException;
 
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
 
 /**
  * OkHttp get calls wrapper
@@ -46,13 +45,10 @@ public class GetMethod extends HttpMethod {
 
     @Override
     public int execute() throws IOException {
-        Request request = mRequest
+        mRequest.newBuilder()
-                .newBuilder()
                 .get()
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
+        return super.executeRequest();
-
-        return mResponse.code();
     }
 }

src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java

@@ -22,10 +22,12 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
 
+import java.io.IOException;
+
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -37,7 +39,6 @@ import okhttp3.Request;
  */
 public abstract class HttpMethod extends HttpBaseMethod {
     protected OkHttpClient mOkHttpClient;
-    protected Request mRequest;
 
     public HttpMethod(OkHttpClient okHttpClient, String httpUrl) {
         mOkHttpClient = okHttpClient;
@@ -64,4 +65,9 @@ public abstract class HttpMethod extends HttpBaseMethod {
         mRequest.newBuilder()
                 .header(name, value);
     }
+
+    public int executeRequest() throws IOException {
+        mResponse = mOkHttpClient.newCall(mRequest).execute();
+        return super.getStatusCode();
+    }
 }

src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java

@@ -22,12 +22,11 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import okhttp3.Response;
 
 /**
  * OkHttp post calls wrapper
@@ -44,13 +43,10 @@ public class PostMethod extends HttpMethod {
 
     @Override
     public int execute() throws Exception {
-        Request request = mRequest
+        mRequest.newBuilder()
-                .newBuilder()
                 .post(mRequestBody)
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
+        return super.executeRequest();
-
-        return mResponse.code();
     }
 }

src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java

@@ -22,12 +22,11 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.nonwebdav;
+package com.owncloud.android.lib.common.http.methods.nonwebdav;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import okhttp3.Response;
 
 public class PutMethod extends HttpMethod{
 
@@ -40,13 +39,10 @@ public class PutMethod extends HttpMethod{
 
     @Override
     public int execute() throws Exception {
-        Request request = mRequest
+        mRequest.newBuilder()
-                .newBuilder()
                 .put(mRequestBody)
                 .build();
 
-        mResponse = mOkHttpClient.newCall(request).execute();
+        return super.executeRequest();
-
-        return mResponse.code();
     }
 }

src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.webdav;
+package com.owncloud.android.lib.common.http.methods.webdav;
 
 import com.owncloud.android.lib.common.http.HttpBaseMethod;
 

src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java

@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.common.http.webdav;
+package com.owncloud.android.lib.common.http.methods.webdav;
 
 import java.io.IOException;
 import java.util.Set;
@@ -34,7 +34,6 @@ import at.bitfire.dav4android.exception.HttpException;
 import at.bitfire.dav4android.exception.UnauthorizedException;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
-import okhttp3.Response;
 
 /**
  * Propfind calls wrapper
@@ -59,9 +58,10 @@ public class PropfindMethod extends DavMethod {
             // Do nothing, we will use the 401 code to handle the situation
         }
 
+        mRequest = mDavResource.getRequest();
         mResponse = mDavResource.getResponse();
 
-        return mResponse.code();
+        return super.getStatusCode();
     }
 
     public int getDepth() {

src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java

@@ -26,7 +26,7 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.webdav.PropfindMethod;
+import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;

src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java

@@ -26,7 +26,7 @@ package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.webdav.PropfindMethod;
+import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;

src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java

@@ -31,7 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.PostMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;

src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java

@@ -30,7 +30,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;

src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java

@@ -32,7 +32,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;

src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java

@@ -31,7 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;

src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java

@@ -29,7 +29,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;

src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java

@@ -31,7 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.DeleteMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.DeleteMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;

src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java

@@ -29,7 +29,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.PutMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.PutMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;

src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java

@@ -31,7 +31,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;

src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java

@@ -30,7 +30,7 @@ import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -99,7 +99,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
 //                );
 //                get.releaseConnection();
 //                get = new GetMethod(redirectedLocation);
-//                status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
+//                status = client.executeRequest(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
 //                mLatestResult = new RemoteOperationResult(
 //                    (status == HttpStatus.SC_OK),
 //                    get

src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java

@@ -26,7 +26,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;

src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java

@@ -31,10 +31,9 @@ import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.common.http.nonwebdav.GetMethod;
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 
 import okhttp3.Request;
-import okhttp3.Response;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK;