flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 02:17:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #284 from owncloud/ReduceLogging

Browse Source 
Reduce logging in ChunkFromFileRequestBody
This commit is contained in:
David González Verdugo 2019-12-18 08:52:51 +01:00 committed by GitHub
commit 66c8b906fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java
View File

@ -24,8 +24,6 @@
package com.owncloud.android.lib.common.network; package com.owncloud.android.lib.common.network;
import android.util.Log;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import okhttp3.MediaType; import okhttp3.MediaType;
import okio.BufferedSink; import okio.BufferedSink;
@ -43,9 +41,6 @@ import java.util.Iterator;
*/ */
public class ChunkFromFileRequestBody extends FileRequestBody { public class ChunkFromFileRequestBody extends FileRequestBody {
private static final String TAG = ChunkFromFileRequestBody.class.getSimpleName();
//private final File mFile;
private final FileChannel mChannel; private final FileChannel mChannel;
private final long mChunkSize; private final long mChunkSize;
private long mOffset; private long mOffset;
@ -89,17 +84,17 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
long maxCount = Math.min(mOffset + mChunkSize, mChannel.size()); long maxCount = Math.min(mOffset + mChunkSize, mChannel.size());
while (mChannel.position() < maxCount) { 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); 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.buffer().write(mBuffer.array(), 0, readCount);
sink.flush(); 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(); mBuffer.clear();
if (mTransferred < maxCount) { // condition to avoid accumulate progress for repeated chunks if (mTransferred < maxCount) { // condition to avoid accumulate progress for repeated chunks
@ -113,19 +108,10 @@ public class ChunkFromFileRequestBody extends FileRequestBody {
} }
} }
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) { } catch (Exception exception) {
Log_OC.e(exception.getMessage());
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;
// }
} }
} }

2
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java
View File

@ -49,7 +49,7 @@ public class FileRequestBody extends RequestBody implements ProgressiveDataTrans
protected File mFile; protected File mFile;
private MediaType mContentType; private MediaType mContentType;
Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>(); final Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
public FileRequestBody(File file, MediaType contentType) { public FileRequestBody(File file, MediaType contentType) {
mFile = file; mFile = file;