Implement remove share using the new wrapper methods

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

@@ -0,0 +1,50 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http.nonwebdav;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * OkHttp delete calls wrapper
+ * @author David González Verdugo
+ */
+public class DeleteMethod extends HttpMethod{
+
+    public DeleteMethod(OkHttpClient okHttpClient, Request baseRequest) {
+        super(okHttpClient, baseRequest);
+    }
+
+    @Override
+    public Response execute() throws Exception {
+        mRequest = mBaseRequest
+                .newBuilder()
+                .delete()
+                .build();
+
+        return mOkHttpClient.newCall(mRequest).execute();
+    }
+}

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

@@ -0,0 +1,50 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2018 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common.http.nonwebdav;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+public class PutMethod extends HttpMethod{
+
+    private RequestBody mRequestBody;
+
+    public PutMethod(OkHttpClient okHttpClient, Request baseRequest, RequestBody requestBody){
+        super(okHttpClient, baseRequest);
+        mRequestBody = requestBody;
+    }
+
+    @Override
+    public Response execute() throws Exception {
+        mRequest = mBaseRequest
+                .newBuilder()
+                .put(mRequestBody)
+                .build();
+
+        return mOkHttpClient.newCall(mRequest).execute();
+    }
+}

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

@@ -204,10 +204,10 @@ public class CreateRemoteShareOperation extends RemoteOperation {
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
 
-            final Request request = new Request.Builder()
+            Request request = new Request.Builder()
                     .url(uriBuilder.build().toString())
-                    .header("Content-Type", "application/x-www-form-urlencoded; " +
+                    .header("Content-Type", 
-                            "charset=utf-8")
+                            "application/x-www-form-urlencoded; charset=utf-8")
                     .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
                     .build();
 

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

@@ -77,7 +77,7 @@ public class GetRemoteShareOperation extends RemoteOperation {
             if (isSuccess(response.code())) {
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
-                    new ShareXMLParser()
+                        new ShareXMLParser()
                 );
                 parser.setOneOrMoreSharesRequired(true);
                 parser.setOwnCloudVersion(client.getOwnCloudVersion());

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

@@ -30,15 +30,21 @@ package com.owncloud.android.lib.resources.shares;
 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.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.HttpStatus;
+import okhttp3.Request;
-import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
+import okhttp3.Response;
 
 /**
  * Remove a share
+ *
+ * @author masensio
+ * @author David A. Velasco
+ * @author David González Verdugo
  */
 
 public class RemoveRemoteShareOperation extends RemoteOperation {
@@ -55,55 +61,52 @@ public class RemoveRemoteShareOperation extends RemoteOperation {
 
     public RemoveRemoteShareOperation(int remoteShareId) {
         mRemoteShareId = remoteShareId;
-
     }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         RemoteOperationResult result;
-        int status;
-
-        DeleteMethod delete = null;
 
         try {
+            String id = "/" + String.valueOf(mRemoteShareId);
+
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
             uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
-            uriBuilder.appendEncodedPath(String.valueOf(mRemoteShareId));
+            uriBuilder.appendEncodedPath(String.valueOf(id));
 
-            delete = new DeleteMethod(uriBuilder.build().toString());
+            Request request = new Request.Builder()
+                    .url(uriBuilder.build().toString())
+                    .addHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+                    .build();
 
-            delete.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+            DeleteMethod deleteMethod = new DeleteMethod(client.getOkHttpClient(), request);
 
-            status = client.executeMethod(delete);
+            Response response = client.executeHttpMethod(deleteMethod);
 
-            if (isSuccess(status)) {
+            if (isSuccess(response.code())) {
-                String response = delete.getResponseBodyAsString();
 
                 // Parse xml response and obtain the list of shares
                 ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
-                    new ShareXMLParser()
+                        new ShareXMLParser()
                 );
-                result = parser.parse(response);
+                result = parser.parse(response.body().string());
 
                 Log_OC.d(TAG, "Unshare " + mRemoteShareId + ": " + result.getLogMessage());
 
             } else {
-                result = new RemoteOperationResult(false, delete);
+                result = new RemoteOperationResult(false, deleteMethod.getRequest(), response);
             }
+
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             Log_OC.e(TAG, "Unshare Link Exception " + result.getLogMessage(), e);
-
-        } finally {
-            if (delete != null)
-                delete.releaseConnection();
         }
+
         return result;
     }
 
-
     private boolean isSuccess(int status) {
-        return (status == HttpStatus.SC_OK);
+        return (status == HttpConstants.HTTP_OK);
     }
 }