Merge pull request #83 from owncloud/sync_full_folder (f02dffb1) · Commits · e / os / nextcloud-android-lib

src/com/owncloud/android/lib/common/network/WebdavEntry.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class WebdavEntry {
		prop = propSet.get(DavPropertyName.GETETAG);
		if (prop != null) {
		mEtag = (String) prop.getValue();
		mEtag = mEtag.substring(1, mEtag.length()-1);
		mEtag = WebdavUtils.parseEtag(mEtag);
		}

		// {DAV:}quota-used-bytes

src/com/owncloud/android/lib/common/network/WebdavUtils.java

+45 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ import java.util.Locale;

		import android.net.Uri;

		import org.apache.commons.httpclient.Header;
		import org.apache.commons.httpclient.HttpMethod;
		import org.apache.jackrabbit.webdav.property.DavPropertyName;
		import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
		import org.apache.jackrabbit.webdav.xml.Namespace;
		@@ -131,4 +133,47 @@ public class WebdavUtils {

		return propSet;
		}

		/**
		*
		* @param rawEtag
		* @return
		*/
		public static String parseEtag(String rawEtag) {
		if (rawEtag == null \|\| rawEtag.length() == 0) {
		return "";
		}
		if (rawEtag.endsWith("-gzip")) {
		rawEtag = rawEtag.substring(0, rawEtag.length() - 5);
		}
		if (rawEtag.length() >= 2 && rawEtag.startsWith("\"") && rawEtag.endsWith("\"")) {
		rawEtag = rawEtag.substring(1, rawEtag.length() - 1);
		}
		return rawEtag;
		}


		/**
		*
		* @param method
		* @return
		*/
		public static String getEtagFromResponse(HttpMethod method) {
		Header eTag = method.getResponseHeader("OC-ETag");
		if (eTag == null) {
		eTag = method.getResponseHeader("oc-etag");
		}
		if (eTag == null) {
		eTag = method.getResponseHeader("ETag");
		}
		if (eTag == null) {
		eTag = method.getResponseHeader("etag");
		}
		String result = "";
		if (eTag != null) {
		result = parseEtag(eTag.getValue());
		}
		return result;
		}

		}

src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -390,10 +390,15 @@ public class RemoteOperationResult implements Serializable {

		} else if (mCode == ResultCode.ACCOUNT_NOT_THE_SAME) {
		return "Authenticated with a different account than the one updating";

		} else if (mCode == ResultCode.INVALID_CHARACTER_IN_NAME) {
		return "The file name contains an forbidden character";

		} else if (mCode == ResultCode.FILE_NOT_FOUND) {
		return "Local file does not exist";

		} else if (mCode == ResultCode.SYNC_CONFLICT) {
		return "Synchronization conflict";
		}

		return "Operation finished with HTTP status code " + mHttpCode + " (" +

src/com/owncloud/android/lib/common/utils/Log_OC.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,7 @@ public class Log_OC {
		}

		public static void i(String TAG, String message){

		// Write the log message to the file
		Log.i(TAG, message);
		appendLog(TAG+" : "+ message);
		}

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

+25 −7

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ 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.lib.common.OwnCloudClient;
		@@ -47,14 +46,21 @@ 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 OC_CHUNK_SIZE_HEADER = "OC-Chunk-Size";
		private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName();

		public ChunkedUploadRemoteFileOperation(String storagePath, String remotePath, String mimeType){
		super(storagePath, remotePath, mimeType);
		}

		public ChunkedUploadRemoteFileOperation(
		String storagePath, String remotePath, String mimeType, String requiredEtag
		){
		super(storagePath, remotePath, mimeType, requiredEtag);
		}

		@Override
		protected int uploadFile(OwnCloudClient client) throws HttpException, IOException {
		protected int uploadFile(OwnCloudClient client) throws IOException {
		int status = -1;

		FileChannel channel = null;
		@@ -64,8 +70,6 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
		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);
		@@ -74,17 +78,31 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
		long offset = 0;
		String uriPrefix = client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath) +
		"-chunking-" + Math.abs((new Random()).nextInt(9000)+1000) + "-" ;
		long chunkCount = (long) Math.ceil((double)file.length() / CHUNK_SIZE);
		long totalLength = file.length();
		long chunkCount = (long) Math.ceil((double)totalLength / CHUNK_SIZE);
		String chunkSizeStr = String.valueOf(CHUNK_SIZE);
		String totalLengthStr = String.valueOf(file.length());
		for (int chunkIndex = 0; chunkIndex < chunkCount ; chunkIndex++, offset += CHUNK_SIZE) {
		if (chunkIndex == chunkCount - 1) {
		chunkSizeStr = String.valueOf(CHUNK_SIZE * chunkCount - totalLength);
		}
		if (mPutMethod != null) {
		mPutMethod.releaseConnection(); // let the connection available
		// for other methods
		}
		mPutMethod = new PutMethod(uriPrefix + chunkCount + "-" + chunkIndex);
		if (mRequiredEtag != null && mRequiredEtag.length() > 0) {
		mPutMethod.addRequestHeader(IF_MATCH_HEADER, "\"" + mRequiredEtag + "\"");
		}
		mPutMethod.addRequestHeader(OC_CHUNKED_HEADER, OC_CHUNKED_HEADER);
		mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, String.valueOf(file.length()));
		mPutMethod.addRequestHeader(OC_CHUNK_SIZE_HEADER, chunkSizeStr);
		mPutMethod.addRequestHeader(OC_TOTAL_LENGTH_HEADER, totalLengthStr);
		((ChunkFromFileChannelRequestEntity) mEntity).setOffset(offset);
		mPutMethod.setRequestEntity(mEntity);
		if (mCancellationRequested.get()) {
		mPutMethod.abort();
		// next method will throw an exception
		}
		status = client.executeMethod(mPutMethod);

		if (status == 400) {