PawletOS/lineageos_updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some useless method arguments

Browse Source
This commit is contained in:
Gabriele M
2017-07-08 21:39:10 +02:00
parent e413510093
commit b4b8409766
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/org/lineageos/updater/download/OkHttpDownloadClient.java
View File

@@ -89,7 +89,7 @@ class OkHttpDownloadClient implements DownloadClient {
} }
mCancelled = false; mCancelled = false;
mDownloading = true; mDownloading = true;
downloadFileInternal(mCallback, mProgressListener); downloadFileInternal();
} }
@Override @Override
@@ -100,7 +100,7 @@ class OkHttpDownloadClient implements DownloadClient {
} }
mCancelled = false; mCancelled = false;
mDownloading = true; mDownloading = true;
downloadFileResumeInternal(mCallback, mProgressListener); downloadFileResumeInternal();
} }
public void cancel() { public void cancel() {
@@ -118,17 +118,15 @@ class OkHttpDownloadClient implements DownloadClient {
}).start(); }).start();
} }
private void downloadFileInternal(final DownloadClient.DownloadCallback callback, private void downloadFileInternal() {
final DownloadClient.ProgressListener progressListener) {
final Request request = new Request.Builder() final Request request = new Request.Builder()
.url(mUrl) .url(mUrl)
.tag(DOWNLOAD_TAG) .tag(DOWNLOAD_TAG)
.build(); .build();
downloadFileInternalCommon(request, callback, progressListener, false); downloadFileInternalCommon(request, false);
} }
private void downloadFileResumeInternal(final DownloadClient.DownloadCallback callback, private void downloadFileResumeInternal() {
final DownloadClient.ProgressListener progressListener) {
final Request.Builder requestBuilder = new Request.Builder() final Request.Builder requestBuilder = new Request.Builder()
.url(mUrl) .url(mUrl)
.tag(DOWNLOAD_TAG); .tag(DOWNLOAD_TAG);
@@ -139,7 +137,7 @@ class OkHttpDownloadClient implements DownloadClient {
long offset = mDestination.length(); long offset = mDestination.length();
requestBuilder.addHeader("Range", "bytes=" + offset + "-"); requestBuilder.addHeader("Range", "bytes=" + offset + "-");
final Request request = requestBuilder.build(); final Request request = requestBuilder.build();
downloadFileInternalCommon(request, callback, progressListener, true); downloadFileInternalCommon(request, true);
} }
private static boolean isSuccessCode(int statusCode) { private static boolean isSuccessCode(int statusCode) {
@@ -150,17 +148,14 @@ class OkHttpDownloadClient implements DownloadClient {
return statusCode == 206; return statusCode == 206;
} }
private void downloadFileInternalCommon(final Request request, private void downloadFileInternalCommon(final Request request, final boolean resume) {
final DownloadClient.DownloadCallback callback,
final DownloadClient.ProgressListener progressListener,
final boolean resume) {
mClient.networkInterceptors().add(new Interceptor() { mClient.networkInterceptors().add(new Interceptor() {
@Override @Override
public Response intercept(Chain chain) throws IOException { public Response intercept(Chain chain) throws IOException {
Response originalResponse = chain.proceed(chain.request()); Response originalResponse = chain.proceed(chain.request());
ProgressResponseBody progressResponseBody = ProgressResponseBody progressResponseBody =
new ProgressResponseBody(originalResponse.body(), progressListener); new ProgressResponseBody(originalResponse.body(), mProgressListener);
return originalResponse.newBuilder() return originalResponse.newBuilder()
.body(progressResponseBody) .body(progressResponseBody)
.build(); .build();
@@ -172,7 +167,7 @@ class OkHttpDownloadClient implements DownloadClient {
@Override @Override
public void onFailure(Request request, IOException e) { public void onFailure(Request request, IOException e) {
Log.d(TAG, "Download failed", e); Log.d(TAG, "Download failed", e);
callback.onFailure(mCancelled); mCallback.onFailure(mCancelled);
} }
@Override @Override
@@ -185,7 +180,7 @@ class OkHttpDownloadClient implements DownloadClient {
Log.d(TAG, "The server fulfilled the partial content request"); Log.d(TAG, "The server fulfilled the partial content request");
} else if (resume || !isSuccessCode(response.code())) { } else if (resume || !isSuccessCode(response.code())) {
Log.e(TAG, "The server replied with code " + response.code()); Log.e(TAG, "The server replied with code " + response.code());
callback.onFailure(mCancelled); mCallback.onFailure(mCancelled);
try { try {
body.close(); body.close();
} catch (IOException e) { } catch (IOException e) {
@@ -194,14 +189,14 @@ class OkHttpDownloadClient implements DownloadClient {
return; return;
} }
callback.onResponse(response.code(), response.request().urlString(), mCallback.onResponse(response.code(), response.request().urlString(),
new Headers(response.headers())); new Headers(response.headers()));
try (BufferedSink sink = Okio.buffer(resume ? try (BufferedSink sink = Okio.buffer(resume ?
Okio.appendingSink(mDestination) : Okio.sink(mDestination))) { Okio.appendingSink(mDestination) : Okio.sink(mDestination))) {
sink.writeAll(body.source()); sink.writeAll(body.source());
Log.d(TAG, "Download complete"); Log.d(TAG, "Download complete");
sink.flush(); sink.flush();
callback.onSuccess(null); mCallback.onSuccess(null);
} catch (IOException e) { } catch (IOException e) {
onFailure(request, e); onFailure(request, e);
} finally { } finally {