Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 64a8504d authored by tobiasKaminsky's avatar tobiasKaminsky
Browse files

Move operation to library 



Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent bf635c84

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

0 → 100644
+114 −0
Original line number Diff line number Diff line 
/* ownCloud Android Library is available under MIT license

 *   Copyright (C) 2018 Nextcloud 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.resources.files;



import android.util.Log;



import com.google.gson.GsonBuilder;

import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.operations.RemoteOperation;

import com.owncloud.android.lib.common.operations.RemoteOperationResult;



import org.apache.commons.httpclient.HttpStatus;

import org.apache.commons.httpclient.methods.PostMethod;

import org.apache.commons.httpclient.methods.StringRequestEntity;



import java.io.IOException;

import java.util.HashMap;

import java.util.Map;



/**

 * Comment file

 */

public class CommentFileRemoteOperation extends RemoteOperation {



    private static final String TAG = CommentFileRemoteOperation.class.getSimpleName();

    private static final int POST_READ_TIMEOUT = 30000;

    private static final int POST_CONNECTION_TIMEOUT = 5000;



    private static final String ACTOR_ID = "actorId";

    private static final String ACTOR_TYPE = "actorType";

    private static final String ACTOR_TYPE_VALUE = "users";

    private static final String VERB = "verb";

    private static final String VERB_VALUE = "comment";

    private static final String MESSAGE = "message";



    private String message;

    private String fileId;

    private String userId;



    /**

     * Constructor

     *

     * @param message Comment to store

     * @param userId  userId to access correct dav endpoint

     */

    public CommentFileRemoteOperation(String message, String fileId, String userId) {

        this.message = message;

        this.fileId = fileId;

        this.userId = userId;

    }



    /**

     * Performs the operation.

     *

     * @param client Client object to communicate with the remote ownCloud server.

     */

    @Override

    protected RemoteOperationResult run(OwnCloudClient client) {



        RemoteOperationResult result;

        try {

            String url = client.getNewWebdavUri() + "/comments/files/" + fileId;

            PostMethod postMethod = new PostMethod(url);

            postMethod.addRequestHeader("Content-type", "application/json");



            Map<String, String> values = new HashMap<>();

            values.put(ACTOR_ID, userId);

            values.put(ACTOR_TYPE, ACTOR_TYPE_VALUE);

            values.put(VERB, VERB_VALUE);

            values.put(MESSAGE, message);



            String json = new GsonBuilder().create().toJson(values, Map.class);



            postMethod.setRequestEntity(new StringRequestEntity(json));



            int status = client.executeMethod(postMethod, POST_READ_TIMEOUT, POST_CONNECTION_TIMEOUT);



            result = new RemoteOperationResult(isSuccess(status), postMethod);



            client.exhaustResponse(postMethod.getResponseBodyAsStream());

        } catch (IOException e) {

            result = new RemoteOperationResult(e);

            Log.e(TAG, "Post comment to file with id " + fileId + " failed: " + result.getLogMessage(), e);

        }



        return result;

    }



    private boolean isSuccess(int status) {

        return status == HttpStatus.SC_CREATED;

    }

}

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

0 → 100644
+83 −0
Original line number Diff line number Diff line 
/*

 * Nextcloud Android client application

 *

 * @author Tobias Kaminsky

 * Copyright (C) 2018 Tobias Kaminsky

 * Copyright (C) 2018 Nextcloud GmbH.

 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation, either version 3 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program. If not, see <https://www.gnu.org/licenses/>.

 */



package com.owncloud.android.lib.resources.files;



import android.util.Log;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.operations.RemoteOperation;

import com.owncloud.android.lib.common.operations.RemoteOperationResult;



import org.apache.commons.httpclient.HttpStatus;

import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;



import java.io.IOException;





/**

 * Empty trashbin.

 */

public class EmptyTrashbinRemoteOperation extends RemoteOperation {



    private static final String TAG = EmptyTrashbinRemoteOperation.class.getSimpleName();

    private static final int RESTORE_READ_TIMEOUT = 30000;

    private static final int RESTORE_CONNECTION_TIMEOUT = 5000;



    private String userId;



    /**

     * Constructor

     *

     * @param userId to access correct trashbin

     */

    public EmptyTrashbinRemoteOperation(String userId) {

        this.userId = userId;

    }



    /**

     * Performs the operation.

     *

     * @param client Client object to communicate with the remote Nextcloud server.

     */

    @Override

    protected RemoteOperationResult run(OwnCloudClient client) {



        RemoteOperationResult result;

        try {

            DeleteMethod delete = new DeleteMethod(client.getNewWebdavUri() + "/trashbin/" + userId + "/trash");

            int status = client.executeMethod(delete, RESTORE_READ_TIMEOUT, RESTORE_CONNECTION_TIMEOUT);



            result = new RemoteOperationResult(isSuccess(status), delete);



            client.exhaustResponse(delete.getResponseBodyAsStream());

        } catch (IOException e) {

            result = new RemoteOperationResult(e);

            Log.e(TAG, "Empty trashbin failed: " + result.getLogMessage(), e);

        }



        return result;

    }



    private boolean isSuccess(int status) {

        return status == HttpStatus.SC_NO_CONTENT;

    }

}

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

+4 −28
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult; 
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;

import com.owncloud.android.lib.common.utils.Log_OC;



import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;

import org.apache.jackrabbit.webdav.client.methods.MoveMethod;



import java.io.File;
@@ -87,7 +87,7 @@ public class RenameRemoteFileOperation extends RemoteOperation { 
    protected RemoteOperationResult run(OwnCloudClient client) {

        RemoteOperationResult result = null;



        LocalMoveMethod move = null;

        MoveMethod move = null;

        try {

            if (mNewName.equals(mOldName)) {

                return new RemoteOperationResult(ResultCode.OK);
@@ -98,9 +98,8 @@ public class RenameRemoteFileOperation extends RemoteOperation { 
                return new RemoteOperationResult(ResultCode.INVALID_OVERWRITE);

            }



            move = new LocalMoveMethod(client.getWebdavUri() +

                    WebdavUtils.encodePath(mOldRemotePath),

                    client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath));

            move = new MoveMethod(client.getWebdavUri() + WebdavUtils.encodePath(mOldRemotePath),

                    client.getWebdavUri() + WebdavUtils.encodePath(mNewRemotePath), true);

            client.executeMethod(move, RENAME_READ_TIMEOUT, RENAME_CONNECTION_TIMEOUT);

            result = new RemoteOperationResult(move.succeeded(), move);

            Log_OC.i(TAG, "Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " +
@@ -121,27 +120,4 @@ public class RenameRemoteFileOperation extends RemoteOperation { 


        return result;

    }



    /**

     * Move operation

     */

    private class LocalMoveMethod extends DavMethodBase {



        public LocalMoveMethod(String uri, String dest) {

            super(uri);

            addRequestHeader(new org.apache.commons.httpclient.Header("Destination", dest));

        }



        @Override

        public String getName() {

            return "MOVE";

        }



        @Override

        protected boolean isSuccess(int status) {

            return status == 201 || status == 204;

        }



    }



}

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

0 → 100644
+92 −0
Original line number Diff line number Diff line 
/*

 * Nextcloud Android client application

 *

 * @author Tobias Kaminsky

 * Copyright (C) 2018 Tobias Kaminsky

 * Copyright (C) 2018 Nextcloud GmbH.

 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation, either version 3 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program. If not, see <https://www.gnu.org/licenses/>.

 */



package com.owncloud.android.lib.resources.files;



import android.util.Log;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.operations.RemoteOperation;

import com.owncloud.android.lib.common.operations.RemoteOperationResult;



import org.apache.commons.httpclient.HttpStatus;

import org.apache.jackrabbit.webdav.client.methods.MoveMethod;



import java.io.IOException;





/**

 * Restore a {@link com.owncloud.android.lib.resources.files.FileVersion}.

 */

public class RestoreFileVersionRemoteOperation extends RemoteOperation {



    private static final String TAG = RestoreFileVersionRemoteOperation.class.getSimpleName();

    private static final int RESTORE_READ_TIMEOUT = 30000;

    private static final int RESTORE_CONNECTION_TIMEOUT = 5000;



    private String fileId;

    private String fileName;

    private String userId;



    /**

     * Constructor

     *

     * @param fileId   fileId

     * @param fileName version date in unixtime

     * @param userId   userId to access correct dav endpoint

     */

    public RestoreFileVersionRemoteOperation(String fileId, String fileName, String userId) {

        this.fileId = fileId;

        this.fileName = fileName;

        this.userId = userId;

    }



    /**

     * Performs the operation.

     *

     * @param client Client object to communicate with the remote ownCloud server.

     */

    @Override

    protected RemoteOperationResult run(OwnCloudClient client) {



        RemoteOperationResult result;

        try {

            String source = client.getNewWebdavUri() + "/versions/" + userId + "/versions/" + fileId + "/" + fileName;

            String target = client.getNewWebdavUri() + "/versions/" + userId + "/restore/" + fileId;



            MoveMethod move = new MoveMethod(source, target, true);

            int status = client.executeMethod(move, RESTORE_READ_TIMEOUT, RESTORE_CONNECTION_TIMEOUT);



            result = new RemoteOperationResult(isSuccess(status), move);



            client.exhaustResponse(move.getResponseBodyAsStream());

        } catch (IOException e) {

            result = new RemoteOperationResult(e);

            Log.e(TAG, "Restore file version with id " + fileId + " failed: " + result.getLogMessage(), e);

        }



        return result;

    }



    private boolean isSuccess(int status) {

        return status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT;

    }

}

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

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

 * Nextcloud Android client application

 *

 * @author Tobias Kaminsky

 * Copyright (C) 2018 Tobias Kaminsky

 * Copyright (C) 2018 Nextcloud GmbH.

 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation, either version 3 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program. If not, see <https://www.gnu.org/licenses/>.

 */



package com.owncloud.android.lib.resources.files;



import android.util.Log;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.network.WebdavUtils;

import com.owncloud.android.lib.common.operations.RemoteOperation;

import com.owncloud.android.lib.common.operations.RemoteOperationResult;



import org.apache.commons.httpclient.HttpStatus;

import org.apache.jackrabbit.webdav.client.methods.MoveMethod;



import java.io.IOException;





/**

 * Restore a {@link TrashbinFile}.

 */

public class RestoreTrashbinFileRemoteOperation extends RemoteOperation {



    private static final String TAG = RestoreTrashbinFileRemoteOperation.class.getSimpleName();

    private static final int RESTORE_READ_TIMEOUT = 30000;

    private static final int RESTORE_CONNECTION_TIMEOUT = 5000;



    private String sourcePath;

    private String fileName;

    private String userId;



    /**

     * Constructor

     *

     * @param sourcePath Remote path of the {@link TrashbinFile} to restore

     * @param fileName   original filename

     * @param userId     userId to access correct trashbin

     */

    public RestoreTrashbinFileRemoteOperation(String sourcePath, String fileName, String userId) {

        this.sourcePath = sourcePath;

        this.fileName = fileName;

        this.userId = userId;

    }



    /**

     * Performs the operation.

     *

     * @param client Client object to communicate with the remote ownCloud server.

     */

    @Override

    protected RemoteOperationResult run(OwnCloudClient client) {



        RemoteOperationResult result;

        try {

            String source = client.getNewWebdavUri() + WebdavUtils.encodePath(sourcePath);

            String target = client.getNewWebdavUri() + "/trashbin/" + userId + "/restore/" + fileName;



            MoveMethod move = new MoveMethod(source, target, true);

            int status = client.executeMethod(move, RESTORE_READ_TIMEOUT, RESTORE_CONNECTION_TIMEOUT);



            result = new RemoteOperationResult(isSuccess(status), move);



            client.exhaustResponse(move.getResponseBodyAsStream());

        } catch (IOException e) {

            result = new RemoteOperationResult(e);

            Log.e(TAG, "Restore trashbin file " + sourcePath + " failed: " + result.getLogMessage(), e);

        }



        return result;

    }



    private boolean isSuccess(int status) {

        return status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT;

    }

}