remove DataTransfererProgressListener & co and add debug into RemoteOperation... (643d25be) · Commits · e / os / nextcloud-android-lib

sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java

+1 −24

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.widget.Toast;
		import com.owncloud.android.lib.common.OwnCloudClient;
		import com.owncloud.android.lib.common.OwnCloudClientFactory;
		import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
		import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
		import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
		import com.owncloud.android.lib.common.operations.RemoteOperation;
		import com.owncloud.android.lib.common.operations.RemoteOperationResult;
		@@ -58,7 +57,7 @@ import java.util.ArrayList;
		import java.util.Iterator;
		import java.util.List;

		public class MainActivity extends Activity implements OnRemoteOperationListener, OnDatatransferProgressListener {
		public class MainActivity extends Activity implements OnRemoteOperationListener{

		private static String LOG_TAG = MainActivity.class.getCanonicalName();

		@@ -164,7 +163,6 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,

		UploadFileRemoteOperation uploadOperation =
		new UploadFileRemoteOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
		uploadOperation.addDatatransferProgressListener(this);
		uploadOperation.execute(mClient, this, mHandler);
		}

		@@ -183,7 +181,6 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
		File fileToUpload = upFolder.listFiles()[0];
		String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
		DownloadFileRemoteOperation downloadOperation = new DownloadFileRemoteOperation(remotePath, downFolder.getAbsolutePath());
		downloadOperation.addDatatransferProgressListener(this);
		downloadOperation.execute(mClient, this, mHandler);
		}

		@@ -258,25 +255,5 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
		mFrame.setBackgroundDrawable(bDraw);
		}

		@Override
		public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileName) {
		final long percentage = (totalToTransfer > 0 ? totalTransferredSoFar * 100 / totalToTransfer : 0);
		final boolean upload = fileName.contains(getString(R.string.upload_folder_path));
		Log.d(LOG_TAG, "progressRate " + percentage);
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		TextView progressView = null;
		if (upload) {
		progressView = findViewById(R.id.upload_progress);
		} else {
		progressView = findViewById(R.id.download_progress);
		}
		if (progressView != null) {
		progressView.setText(Long.toString(percentage) + "%");
		}
		}
		});
		}

		}

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

+2 −29

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
		*
		* @author David A. Velasco
		*/
		public class ChunkFromFileChannelRequestEntity implements RequestEntity, ProgressiveDataTransferer {
		public class ChunkFromFileChannelRequestEntity implements RequestEntity{

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

		@@ -56,7 +56,6 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
		private final File mFile;
		private long mOffset;
		private long mTransferred;
		Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
		private ByteBuffer mBuffer = ByteBuffer.allocate(4096);

		public ChunkFromFileChannelRequestEntity(
		@@ -97,26 +96,7 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
		return true;
		}

		@Override
		public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
		synchronized (mDataTransferListeners) {
		mDataTransferListeners.add(listener);
		}
		}

		@Override
		public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
		synchronized (mDataTransferListeners) {
		mDataTransferListeners.addAll(listeners);
		}
		}

		@Override
		public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
		synchronized (mDataTransferListeners) {
		mDataTransferListeners.remove(listener);
		}
		}


		public void setmTransferred(long value) {
		@@ -125,7 +105,6 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres

		public void writeRequest(final OutputStream out) throws IOException {
		int readCount = 0;
		Iterator<OnDatatransferProgressListener> it = null;

		try {
		mChannel.position(mOffset);
		@@ -144,12 +123,6 @@ public class ChunkFromFileChannelRequestEntity implements RequestEntity, Progres
		if (mTransferred < maxCount) { // condition to avoid accumulate progress for repeated chunks
		mTransferred += readCount;
		}
		synchronized (mDataTransferListeners) {
		it = mDataTransferListeners.iterator();
		while (it.hasNext()) {
		it.next().onTransferProgress(readCount, mTransferred, size, mFile.getAbsolutePath());
		}
		}
		}

		} catch (IOException io) {

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

+2 −30

Original line number	Diff line number	Diff line
		@@ -47,11 +47,10 @@ import com.owncloud.android.lib.common.utils.Log_OC;
		* A RequestEntity that represents a File.
		*
		*/
		public class FileRequestEntity implements RequestEntity, ProgressiveDataTransferer {
		public class FileRequestEntity implements RequestEntity {

		final File mFile;
		final String mContentType;
		Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();

		public FileRequestEntity(final File file, final String contentType) {
		super();
		@@ -77,26 +76,6 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
		return true;
		}

		@Override
		public void addDatatransferProgressListener(OnDatatransferProgressListener listener) {
		synchronized (mDataTransferListeners) {
		mDataTransferListeners.add(listener);
		}
		}

		@Override
		public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners) {
		synchronized (mDataTransferListeners) {
		mDataTransferListeners.addAll(listeners);
		}
		}

		@Override
		public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) {
		synchronized (mDataTransferListeners) {
		mDataTransferListeners.remove(listener);
		}
		}


		@Override
		@@ -106,7 +85,6 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer

		RandomAccessFile raf = new RandomAccessFile(mFile, "r");
		FileChannel channel = raf.getChannel();
		Iterator<OnDatatransferProgressListener> it = null;
		long transferred = 0;
		long size = mFile.length();
		if (size == 0) size = -1;
		@@ -120,12 +98,6 @@ public class FileRequestEntity implements RequestEntity, ProgressiveDataTransfer
		}
		tmp.clear();
		transferred += readResult;
		synchronized (mDataTransferListeners) {
		it = mDataTransferListeners.iterator();
		while (it.hasNext()) {
		it.next().onTransferProgress(readResult, transferred, size, mFile.getAbsolutePath());
		}
		}
		}

		} catch (IOException io) {

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

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		/* ownCloud Android Library is available under MIT license
		* Copyright (C) 2015 ownCloud Inc.
		* Copyright (C) 2012 Bartek Przybylski
		*
		* 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.network;

		public interface OnDatatransferProgressListener {
		public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer, String fileAbsoluteName);
		}

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

deleted100644 → 0

+0 −39

Original line number	Diff line number	Diff line
		/* ownCloud Android Library is available under MIT license
		* Copyright (C) 2015 ownCloud Inc.
		*
		* 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.network;

		import java.util.Collection;



		public interface ProgressiveDataTransferer {

		public void addDatatransferProgressListener (OnDatatransferProgressListener listener);

		public void addDatatransferProgressListeners(Collection<OnDatatransferProgressListener> listeners);

		public void removeDatatransferProgressListener(OnDatatransferProgressListener listener);

		}