Merge branch 'develop' into refactor_remote_operation_to_upload_file

Conflicts:
	src/com/owncloud/android/files/services/FileUploader.java

diff --cc oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ChunkedUploadRemoteFileOperation.java
index bacbcc3,0000000..4df5fea
mode 100644,000000..100644
--- 1/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ChunkedUploadRemoteFileOperation.java
--- /dev/null
+++ b/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/ChunkedUploadRemoteFileOperation.java
@@@ -1,94 -1,0 +1,94 @@@
-     private static final long CHUNK_SIZE = 1024000;
 +/* ownCloud Android client application
 + *   Copyright (C) 2012 Bartek Przybylski
 + *   Copyright (C) 2012-2013 ownCloud Inc.
 + *
 + *   This program is free software: you can redistribute it and/or modify
 + *   it under the terms of the GNU General Public License version 2,
 + *   as published by the Free Software Foundation.
 + *
 + *   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 <http://www.gnu.org/licenses/>.
 + *
 + */
 +
 +package com.owncloud.android.oc_framework.operations.remote;
 +
 +import java.io.File;
 +import java.io.IOException;
 +import java.io.RandomAccessFile;
 +import java.nio.channels.FileChannel;
 +import java.util.Random;
 +
 +import org.apache.commons.httpclient.HttpException;
 +import org.apache.commons.httpclient.methods.PutMethod;
 +
 +import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer;
 +import com.owncloud.android.oc_framework.network.webdav.ChunkFromFileChannelRequestEntity;
 +import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
 +import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
 +
 +
 +import android.util.Log;
 +
 +
 +public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {
 +    
++    public static final long CHUNK_SIZE = 1024000;
 +    private static final String OC_CHUNKED_HEADER = "OC-Chunked";
 +    private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName();
 +
 +    public ChunkedUploadRemoteFileOperation(String storagePath, String remotePath, String mimeType) {
 +               super(storagePath, remotePath, mimeType);      
 +      }
 +    
 +    @Override
 +    protected int uploadFile(WebdavClient client) throws HttpException, IOException {
 +        int status = -1;
 +
 +        FileChannel channel = null;
 +        RandomAccessFile raf = null;
 +        try {
 +            File file = new File(mStoragePath);
 +            raf = new RandomAccessFile(file, "r");
 +            channel = raf.getChannel();
 +            mEntity = new ChunkFromFileChannelRequestEntity(channel, mMimeType, CHUNK_SIZE, file);
 +            //((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(getDataTransferListeners());
 +            synchronized (mDataTransferListeners) {
 +                              ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(mDataTransferListeners);
 +                      }
 +            
 +            long offset = 0;
 +            String uriPrefix = client.getBaseUri() + WebdavUtils.encodePath(mRemotePath) + "-chunking-" + Math.abs((new Random()).nextInt(9000)+1000) + "-" ;
 +            long chunkCount = (long) Math.ceil((double)file.length() / CHUNK_SIZE);
 +            for (int chunkIndex = 0; chunkIndex < chunkCount ; chunkIndex++, offset += CHUNK_SIZE) {
 +                if (mPutMethod != null) {
 +                    mPutMethod.releaseConnection();    // let the connection available for other methods
 +                }
 +                mPutMethod = new PutMethod(uriPrefix + chunkCount + "-" + chunkIndex);
 +                mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER);
 +                ((ChunkFromFileChannelRequestEntity)mEntity).setOffset(offset);
 +                mPutMethod.setRequestEntity(mEntity);
 +                status = client.executeMethod(mPutMethod);
 +                client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
 +                Log.d(TAG, "Upload of " + mStoragePath + " to " + mRemotePath + ", chunk index " + chunkIndex + ", count " + chunkCount + ", HTTP result status " + status);
 +                if (!isSuccess(status))
 +                    break;
 +            }
 +            
 +        } finally {
 +            if (channel != null)
 +                channel.close();
 +            if (raf != null)
 +                raf.close();
 +            if (mPutMethod != null)
 +                mPutMethod.releaseConnection();    // let the connection available for other methods
 +        }
 +        return status;
 +    }
 +
 +}

diff --cc src/com/owncloud/android/files/services/FileUploader.java
Simple merge