Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Reduce logging in ChunkFromFileRequestBody #284

Merged
davigonz merged 1 commit into from
Dec 18, 2019
Merged

Reduce logging in ChunkFromFileRequestBody #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions ...brary/src/main/java/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

package com.owncloud.android.lib.common.network;

import android.util.Log;

import com.owncloud.android.lib.common.utils.Log_OC;
import okhttp3.MediaType;
import okio.BufferedSink;
Expand All @@ -43,9 +41,6 @@
*/
public class ChunkFromFileRequestBody extends FileRequestBody {

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

//private final File mFile;
private final FileChannel mChannel;
private final long mChunkSize;
private long mOffset;
Expand Down Expand Up @@ -89,17 +84,17 @@ public void writeTo(BufferedSink sink) {
long maxCount = Math.min(mOffset + mChunkSize, mChannel.size());
while (mChannel.position() < maxCount) {

Log_OC.d(TAG, "Sink buffer size: " + sink.buffer().size());
Log_OC.v("Sink buffer size: " + sink.buffer().size());

readCount = mChannel.read(mBuffer);

Log_OC.d(TAG, "Read " + readCount + " bytes from file channel to " + mBuffer.toString());
Log_OC.v("Read " + readCount + " bytes from file channel to " + mBuffer.toString());

sink.buffer().write(mBuffer.array(), 0, readCount);

sink.flush();

Log_OC.d(TAG, "Write " + readCount + " bytes to sink buffer with size " + sink.buffer().size());
Log_OC.v("Write " + readCount + " bytes to sink buffer with size " + sink.buffer().size());

mBuffer.clear();
if (mTransferred < maxCount) { // condition to avoid accumulate progress for repeated chunks
Expand All @@ -113,19 +108,10 @@ public void writeTo(BufferedSink sink) {
}
}

Log.d(TAG, "Chunk with size " + mChunkSize + " written in request body");
Log_OC.v("Chunk with size " + mChunkSize + " written in request body");

} catch (Exception exception) {

Log.e(TAG, exception.toString());
// // any read problem will be handled as if the file is not there
// if (io instanceof FileNotFoundException) {
// throw io;
// } else {
// FileNotFoundException fnf = new FileNotFoundException("Exception reading source file");
// fnf.initCause(io);
// throw fnf;
// }
Log_OC.e(exception.getMessage());
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...loudComLibrary/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans

protected File mFile;
private MediaType mContentType;
Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
final Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();

public FileRequestBody(File file, MediaType contentType) {
mFile = file;
Expand Down