From e34334a1d78e9931e9c602f2af9494af0661810c Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Sun, 9 Jul 2017 20:57:37 +0200 Subject: [PATCH] Pass the destination File to the callback The current argument is unused and it should have been removed with commit 81229329f1228bbf10ca65b2478d22341c3a19c5 ("Generate download clients using a builder class"). Instead of removing it completely, use it to pass the File of the download. --- src/org/lineageos/updater/UpdatesActivity.java | 2 +- src/org/lineageos/updater/UpdatesCheckReceiver.java | 2 +- src/org/lineageos/updater/controller/UpdaterController.java | 2 +- src/org/lineageos/updater/download/DownloadClient.java | 2 +- src/org/lineageos/updater/download/OkHttpDownloadClient.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index 1dea9f2..283aaae 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -241,7 +241,7 @@ public class UpdatesActivity extends AppCompatActivity { } @Override - public void onSuccess(String response) { + public void onSuccess(File destination) { runOnUiThread(new Runnable() { @Override public void run() { diff --git a/src/org/lineageos/updater/UpdatesCheckReceiver.java b/src/org/lineageos/updater/UpdatesCheckReceiver.java index 632fcf5..e97e3b2 100644 --- a/src/org/lineageos/updater/UpdatesCheckReceiver.java +++ b/src/org/lineageos/updater/UpdatesCheckReceiver.java @@ -78,7 +78,7 @@ public class UpdatesCheckReceiver extends BroadcastReceiver { } @Override - public void onSuccess(String response) { + public void onSuccess(File destination) { try { if (json.exists() && Utils.checkForNewUpdates(json, jsonNew)) { showNotification(context); diff --git a/src/org/lineageos/updater/controller/UpdaterController.java b/src/org/lineageos/updater/controller/UpdaterController.java index 3e51565..058df10 100644 --- a/src/org/lineageos/updater/controller/UpdaterController.java +++ b/src/org/lineageos/updater/controller/UpdaterController.java @@ -176,7 +176,7 @@ public class UpdaterController implements UpdaterControllerInt { } @Override - public void onSuccess(String body) { + public void onSuccess(File destination) { Log.d(TAG, "Download complete"); UpdateDownload update = mDownloads.get(downloadId).mUpdate; update.setStatus(UpdateStatus.VERIFYING); diff --git a/src/org/lineageos/updater/download/DownloadClient.java b/src/org/lineageos/updater/download/DownloadClient.java index 9bc875f..817c59d 100644 --- a/src/org/lineageos/updater/download/DownloadClient.java +++ b/src/org/lineageos/updater/download/DownloadClient.java @@ -24,7 +24,7 @@ public interface DownloadClient { interface DownloadCallback { void onResponse(int statusCode, String url, Headers headers); - void onSuccess(String body); + void onSuccess(File destination); void onFailure(boolean cancelled); } diff --git a/src/org/lineageos/updater/download/OkHttpDownloadClient.java b/src/org/lineageos/updater/download/OkHttpDownloadClient.java index 3ba3547..987bb51 100644 --- a/src/org/lineageos/updater/download/OkHttpDownloadClient.java +++ b/src/org/lineageos/updater/download/OkHttpDownloadClient.java @@ -196,7 +196,7 @@ class OkHttpDownloadClient implements DownloadClient { sink.writeAll(body.source()); Log.d(TAG, "Download complete"); sink.flush(); - mCallback.onSuccess(null); + mCallback.onSuccess(mDestination); } catch (IOException e) { onFailure(request, e); } finally {