-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Added progress updater in UploadService to show upload progress in no… #3156
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
misaochan
merged 2 commits into
commons-app:backend-overhaul
from
ashishkumar468:feature/notification-progress
Sep 30, 2019
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
86 changes: 86 additions & 0 deletions
86
app/src/main/java/fr/free/nrw/commons/upload/CountingRequestBody.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
package fr.free.nrw.commons.upload; | ||
|
||
|
||
import java.io.IOException; | ||
import okhttp3.MediaType; | ||
import okhttp3.RequestBody; | ||
import okio.Buffer; | ||
import okio.BufferedSink; | ||
import okio.ForwardingSink; | ||
import okio.Okio; | ||
import okio.Sink; | ||
|
||
/** | ||
* Decorates an OkHttp request body to count the number of bytes written when writing it. Can | ||
* decorate any request body, but is most useful for tracking the upload progress of large multipart | ||
* requests. | ||
* | ||
* @author Ashish Kumar | ||
*/ | ||
public class CountingRequestBody extends RequestBody { | ||
|
||
protected RequestBody delegate; | ||
protected Listener listener; | ||
|
||
protected CountingSink countingSink; | ||
|
||
public CountingRequestBody(RequestBody delegate, Listener listener) { | ||
this.delegate = delegate; | ||
this.listener = listener; | ||
} | ||
|
||
@Override | ||
public MediaType contentType() { | ||
return delegate.contentType(); | ||
} | ||
|
||
@Override | ||
public long contentLength() { | ||
try { | ||
return delegate.contentLength(); | ||
} catch (IOException e) { | ||
e.printStackTrace(); | ||
} | ||
return -1; | ||
} | ||
|
||
@Override | ||
public void writeTo(BufferedSink sink) throws IOException { | ||
|
||
countingSink = new CountingSink(sink); | ||
BufferedSink bufferedSink = Okio.buffer(countingSink); | ||
|
||
delegate.writeTo(bufferedSink); | ||
|
||
bufferedSink.flush(); | ||
} | ||
|
||
protected final class CountingSink extends ForwardingSink { | ||
|
||
private long bytesWritten = 0; | ||
|
||
public CountingSink(Sink delegate) { | ||
super(delegate); | ||
} | ||
|
||
@Override | ||
public void write(Buffer source, long byteCount) throws IOException { | ||
super.write(source, byteCount); | ||
|
||
bytesWritten += byteCount; | ||
listener.onRequestProgress(bytesWritten, contentLength()); | ||
} | ||
|
||
} | ||
|
||
public interface Listener { | ||
|
||
/** | ||
* Will be triggered when write progresses | ||
* @param bytesWritten | ||
* @param contentLength | ||
*/ | ||
void onRequestProgress(long bytesWritten, long contentLength); | ||
} | ||
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add java docs for methods added in this class. :)