reorder paramter, bump min version Android to 11 (honeycomb), fix test (07b65fa8) · Commits · e / os / nextcloud-android-lib

AndroidManifest.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="utf-8"?>		<?xml version="1.0" encoding="utf-8"?>
	<!-- ownCloud Android Library is available under MIT license		<!-- Nextcloud Android Library is available under MIT license
	Copyright (C) 2015 ownCloud Inc.		Copyright (C) 2015 ownCloud Inc.

	Permission is hereby granted, free of charge, to any person obtaining a copy		Permission is hereby granted, free of charge, to any person obtaining a copy
	@@ -29,7 +29,7 @@
	android:versionName="1.0" >		android:versionName="1.0" >

	<uses-sdk		<uses-sdk
	android:minSdkVersion="8"		android:minSdkVersion="11"
	android:targetSdkVersion="23" />		android:targetSdkVersion="23" />

	</manifest>		</manifest>

README.md

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,6 +65,6 @@ Licensed under Apache License, Version 2.0.

	## Compatibility		## Compatibility

	Nextcloud Android library is valid for Android version 2.2 and up (android:minSdkVersion="8" android:targetSdkVersion="23").		Nextcloud Android library is valid for Android version 3.0 and up (android:minSdkVersion="11" android:targetSdkVersion="23").

	Nextcloud Android library supports Nextcloud server from version 9.		Nextcloud Android library supports Nextcloud server from version 9.

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

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,16 @@ package com.owncloud.android.lib.resources.files;

	import android.content.Context;		import android.content.Context;
	import android.content.SharedPreferences;		import android.content.SharedPreferences;

			import com.owncloud.android.lib.common.OwnCloudClient;
			import com.owncloud.android.lib.common.network.ChunkFromFileChannelRequestEntity;
			import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
			import com.owncloud.android.lib.common.network.WebdavUtils;
			import com.owncloud.android.lib.common.operations.InvalidCharacterExceptionParser;
			import com.owncloud.android.lib.common.utils.Log_OC;

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

	import java.io.ByteArrayInputStream;		import java.io.ByteArrayInputStream;
	import java.io.File;		import java.io.File;
	import java.io.IOException;		import java.io.IOException;
	@@ -35,15 +45,6 @@ import java.nio.channels.FileChannel;
	import java.util.LinkedHashSet;		import java.util.LinkedHashSet;
	import java.util.Set;		import java.util.Set;

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

	import com.owncloud.android.lib.common.OwnCloudClient;
	import com.owncloud.android.lib.common.network.ChunkFromFileChannelRequestEntity;
	import com.owncloud.android.lib.common.network.ProgressiveDataTransferer;
	import com.owncloud.android.lib.common.network.WebdavUtils;
	import com.owncloud.android.lib.common.operations.InvalidCharacterExceptionParser;
	import com.owncloud.android.lib.common.utils.Log_OC;


	public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {		public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {

	@@ -54,8 +55,7 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
	private Context mContext;		private Context mContext;

	public ChunkedUploadRemoteFileOperation(		public ChunkedUploadRemoteFileOperation(
	String storagePath, String remotePath, String mimeType, String requiredEtag, Context context		Context context, String storagePath, String remotePath, String mimeType, String requiredEtag) {
	){
	super(storagePath, remotePath, mimeType, requiredEtag);		super(storagePath, remotePath, mimeType, requiredEtag);
	mContext = context;		mContext = context;
	}		}

test_client/src/com/owncloud/android/lib/test_project/TestActivity.java

+26 −21

Original line number	Original line	Diff line number	Diff line
	@@ -24,15 +24,6 @@

	package com.owncloud.android.lib.test_project;		package com.owncloud.android.lib.test_project;

	import java.io.File;
	import java.io.FileOutputStream;
	import java.io.IOException;
	import java.io.InputStream;
	import java.security.GeneralSecurityException;

	import org.apache.commons.httpclient.protocol.Protocol;
	import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;

	import android.app.Activity;		import android.app.Activity;
	import android.content.Context;		import android.content.Context;
	import android.net.Uri;		import android.net.Uri;
	@@ -58,6 +49,15 @@ import com.owncloud.android.lib.resources.shares.GetRemoteSharesOperation;
	import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;		import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;
	import com.owncloud.android.lib.resources.shares.ShareType;		import com.owncloud.android.lib.resources.shares.ShareType;

			import org.apache.commons.httpclient.protocol.Protocol;
			import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;

			import java.io.File;
			import java.io.FileOutputStream;
			import java.io.IOException;
			import java.io.InputStream;
			import java.security.GeneralSecurityException;

	/**		/**
	* Activity to test OC framework		* Activity to test OC framework
	* @author masensio		* @author masensio
	@@ -219,7 +219,8 @@ public class TestActivity extends Activity {

	/**		/**
	* Access to the library method to Download a File		* Access to the library method to Download a File
	* @param remotePath		* @param remoteFile
			* @param temporalFolder
	*		*
	* @return		* @return
	*/		*/
	@@ -240,17 +241,20 @@ public class TestActivity extends Activity {
	* @param storagePath		* @param storagePath
	* @param remotePath		* @param remotePath
	* @param mimeType		* @param mimeType
			* @param requiredEtag
	*		*
	* @return		* @return
	*/		*/
	public RemoteOperationResult uploadFile(		public RemoteOperationResult uploadFile(
	String storagePath, String remotePath, String mimeType		String storagePath, String remotePath, String mimeType, String requiredEtag
	) {		) {
	return TestActivity.uploadFile(storagePath, remotePath, mimeType, mClient);		return TestActivity.uploadFile(this, storagePath, remotePath, mimeType, mClient, requiredEtag);
	}		}


	/** Access to the library method to Upload a File		/** Access to the library method to Upload a File
			*
			* @param context
	* @param storagePath		* @param storagePath
	* @param remotePath		* @param remotePath
	* @param mimeType		* @param mimeType
	@@ -259,12 +263,13 @@ public class TestActivity extends Activity {
	* @return		* @return
	*/		*/
	public static RemoteOperationResult uploadFile(		public static RemoteOperationResult uploadFile(
	String storagePath, String remotePath, String mimeType, OwnCloudClient client		Context context, String storagePath, String remotePath, String mimeType, OwnCloudClient client,
			String requiredEtag
	) {		) {
	UploadRemoteFileOperation uploadOperation;		UploadRemoteFileOperation uploadOperation;
	if ((new File(storagePath)).length() > ChunkedUploadRemoteFileOperation.CHUNK_SIZE) {		if ((new File(storagePath)).length() > ChunkedUploadRemoteFileOperation.CHUNK_SIZE) {
	uploadOperation = new ChunkedUploadRemoteFileOperation(		uploadOperation = new ChunkedUploadRemoteFileOperation(
	storagePath, remotePath, mimeType		context, storagePath, remotePath, mimeType, requiredEtag
	);		);
	} else {		} else {
	uploadOperation = new UploadRemoteFileOperation(		uploadOperation = new UploadRemoteFileOperation(