From f5795d1c03c598682a3cd42b904f2edecb3a42a8 Mon Sep 17 00:00:00 2001 From: davigonz Date: Mon, 11 Jun 2018 10:48:07 +0200 Subject: [PATCH] Keep refactoring wrapper --- .../owncloud/android/lib/common/OwnCloudClient.java | 7 +++---- .../authentication/OwnCloudBasicCredentials.java | 4 ++-- .../android/lib/common/http/HttpBaseMethod.java | 11 ++++++++--- .../{ => http}/interceptors/BasicAuthInterceptor.java | 2 +- .../{ => http}/interceptors/HttpInterceptor.java | 2 +- .../{ => http}/interceptors/UserAgentInterceptor.java | 2 +- .../http/{ => methods}/nonwebdav/DeleteMethod.java | 10 +++------- .../http/{ => methods}/nonwebdav/GetMethod.java | 10 +++------- .../http/{ => methods}/nonwebdav/HttpMethod.java | 10 ++++++++-- .../http/{ => methods}/nonwebdav/PostMethod.java | 10 +++------- .../http/{ => methods}/nonwebdav/PutMethod.java | 10 +++------- .../common/http/{ => methods}/webdav/DavMethod.java | 2 +- .../http/{ => methods}/webdav/PropfindMethod.java | 6 +++--- .../files/ExistenceCheckRemoteOperation.java | 2 +- .../resources/files/ReadRemoteFolderOperation.java | 2 +- .../resources/shares/CreateRemoteShareOperation.java | 2 +- .../lib/resources/shares/GetRemoteShareOperation.java | 2 +- .../resources/shares/GetRemoteShareesOperation.java | 2 +- .../shares/GetRemoteSharesForFileOperation.java | 2 +- .../resources/shares/GetRemoteSharesOperation.java | 2 +- .../resources/shares/RemoveRemoteShareOperation.java | 2 +- .../resources/shares/UpdateRemoteShareOperation.java | 2 +- .../status/GetRemoteCapabilitiesOperation.java | 2 +- .../resources/status/GetRemoteStatusOperation.java | 4 ++-- .../resources/users/GetRemoteUserAvatarOperation.java | 2 +- .../resources/users/GetRemoteUserInfoOperation.java | 3 +-- 26 files changed, 54 insertions(+), 61 deletions(-) rename src/com/owncloud/android/lib/common/{ => http}/interceptors/BasicAuthInterceptor.java (96%) rename src/com/owncloud/android/lib/common/{ => http}/interceptors/HttpInterceptor.java (98%) rename src/com/owncloud/android/lib/common/{ => http}/interceptors/UserAgentInterceptor.java (96%) rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/DeleteMethod.java (87%) rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/GetMethod.java (87%) rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/HttpMethod.java (89%) rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/PostMethod.java (87%) rename src/com/owncloud/android/lib/common/http/{ => methods}/nonwebdav/PutMethod.java (87%) rename src/com/owncloud/android/lib/common/http/{ => methods}/webdav/DavMethod.java (96%) rename src/com/owncloud/android/lib/common/http/{ => methods}/webdav/PropfindMethod.java (94%) diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java index 3a6ca848..f99d139d 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudClient.java +++ b/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.interceptors.UserAgentInterceptor; +import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor; +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 { @@ -719,4 +718,4 @@ public class OwnCloudClient extends HttpClient { (mRedirectedLocation.toUpperCase().contains("SAML") || mRedirectedLocation.toLowerCase().contains("wayf"))); } -} +} \ No newline at end of file diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java index 6650219d..7a1fdb65 100644 --- a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java +++ b/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.interceptors.HttpInterceptor.RequestInterceptor; +import com.owncloud.android.lib.common.http.interceptors.BasicAuthInterceptor; +import com.owncloud.android.lib.common.http.interceptors.HttpInterceptor.RequestInterceptor; import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.auth.AuthPolicy; diff --git a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java b/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java index 78d92795..82f07431 100644 --- a/src/com/owncloud/android/lib/common/http/HttpBaseMethod.java +++ b/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(); } diff --git a/src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java similarity index 96% rename from src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java rename to src/com/owncloud/android/lib/common/http/interceptors/BasicAuthInterceptor.java index 152b7c20..171f6fab 100644 --- a/src/com/owncloud/android/lib/common/interceptors/BasicAuthInterceptor.java +++ b/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; diff --git a/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java similarity index 98% rename from src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java rename to src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java index 560fe86a..95d06506 100644 --- a/src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java +++ b/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; diff --git a/src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java b/src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java similarity index 96% rename from src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java rename to src/com/owncloud/android/lib/common/http/interceptors/UserAgentInterceptor.java index bd46fc0f..b57b4fed 100644 --- a/src/com/owncloud/android/lib/common/interceptors/UserAgentInterceptor.java +++ b/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; diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java similarity index 87% rename from src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java index cdbf4ef6..5d47758c 100644 --- a/src/com/owncloud/android/lib/common/http/nonwebdav/DeleteMethod.java +++ b/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 - .newBuilder() + mRequest.newBuilder() .delete() .build(); - mResponse = mOkHttpClient.newCall(request).execute(); - - return mResponse.code(); + return super.executeRequest(); } } \ No newline at end of file diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java similarity index 87% rename from src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java index f0246139..0f74252c 100644 --- a/src/com/owncloud/android/lib/common/http/nonwebdav/GetMethod.java +++ b/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 - .newBuilder() + mRequest.newBuilder() .get() .build(); - mResponse = mOkHttpClient.newCall(request).execute(); - - return mResponse.code(); + return super.executeRequest(); } } \ No newline at end of file diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java similarity index 89% rename from src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java index 73912194..5ed95ec7 100644 --- a/src/com/owncloud/android/lib/common/http/nonwebdav/HttpMethod.java +++ b/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(); + } } \ No newline at end of file diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java similarity index 87% rename from src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java index 8defb0e6..91939029 100644 --- a/src/com/owncloud/android/lib/common/http/nonwebdav/PostMethod.java +++ b/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 - .newBuilder() + mRequest.newBuilder() .post(mRequestBody) .build(); - mResponse = mOkHttpClient.newCall(request).execute(); - - return mResponse.code(); + return super.executeRequest(); } } \ No newline at end of file diff --git a/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java b/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java similarity index 87% rename from src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java rename to src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java index 854cb95d..f7270f35 100644 --- a/src/com/owncloud/android/lib/common/http/nonwebdav/PutMethod.java +++ b/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 - .newBuilder() + mRequest.newBuilder() .put(mRequestBody) .build(); - mResponse = mOkHttpClient.newCall(request).execute(); - - return mResponse.code(); + return super.executeRequest(); } } \ No newline at end of file diff --git a/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java similarity index 96% rename from src/com/owncloud/android/lib/common/http/webdav/DavMethod.java rename to src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java index cf10aabb..de75047a 100644 --- a/src/com/owncloud/android/lib/common/http/webdav/DavMethod.java +++ b/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; diff --git a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java b/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java similarity index 94% rename from src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java rename to src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java index d8737714..e8b85564 100644 --- a/src/com/owncloud/android/lib/common/http/webdav/PropfindMethod.java +++ b/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() { diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java index 13831be6..93b4ced4 100644 --- a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java index 8c699fb3..d8b9bcf4 100644 --- a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java index 12f5ed0e..669df7b8 100644 --- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java index 17e706be..c7c2df93 100644 --- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java index 8f045f14..ba49698a 100644 --- a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java index 244c3a56..95bc2019 100644 --- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java index 84e92cfa..436448db 100644 --- a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java index 403d2002..ca4f3cea 100644 --- a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java index 563e629d..9c04085d 100644 --- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java index 3b6f7c0d..849cdf21 100644 --- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java index e826ce71..0c54a162 100644 --- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java +++ b/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 diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java index 8619a73c..187d4ce2 100644 --- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java +++ b/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; diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java index e5bc60f6..be2d98d8 100644 --- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java +++ b/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;