From d794c5a77c5c607c9562d4c3e0e941d6a7913450 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 28 Mar 2019 11:41:03 +0100 Subject: [PATCH] purge urlString from ProgressListener, it is unused and confusing --- .../java/org/fdroid/fdroid/net/HttpDownloaderTest.java | 4 ++-- app/src/main/java/org/fdroid/fdroid/IndexUpdater.java | 6 +++--- app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java | 2 +- .../java/org/fdroid/fdroid/ProgressBufferedInputStream.java | 6 ++---- app/src/main/java/org/fdroid/fdroid/ProgressListener.java | 2 +- app/src/main/java/org/fdroid/fdroid/net/Downloader.java | 2 +- .../main/java/org/fdroid/fdroid/net/DownloaderService.java | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java index 57238613d..4356f4564 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java @@ -70,7 +70,7 @@ public class HttpDownloaderTest { final HttpDownloader httpDownloader = new HttpDownloader(uri, destFile); httpDownloader.setListener(new ProgressListener() { @Override - public void onProgress(String urlString, long bytesRead, long totalBytes) { + public void onProgress(long bytesRead, long totalBytes) { receivedProgress = true; } }); @@ -132,7 +132,7 @@ public class HttpDownloaderTest { final HttpDownloader httpDownloader = new HttpDownloader(uri, destFile); httpDownloader.setListener(new ProgressListener() { @Override - public void onProgress(String urlString, long bytesRead, long totalBytes) { + public void onProgress(long bytesRead, long totalBytes) { receivedProgress = true; latch.countDown(); } diff --git a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java index d4ad76cc1..3a267144a 100644 --- a/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java +++ b/app/src/main/java/org/fdroid/fdroid/IndexUpdater.java @@ -216,7 +216,7 @@ public class IndexUpdater { JarFile jarFile = new JarFile(downloadedFile, true); JarEntry indexEntry = (JarEntry) jarFile.getEntry(IndexUpdater.DATA_FILE_NAME); indexInputStream = new ProgressBufferedInputStream(jarFile.getInputStream(indexEntry), - processIndexListener, repo.address, (int) indexEntry.getSize()); + processIndexListener, (int) indexEntry.getSize()); // Process the index... SAXParserFactory factory = SAXParserFactory.newInstance(); @@ -254,14 +254,14 @@ public class IndexUpdater { protected final ProgressListener downloadListener = new ProgressListener() { @Override - public void onProgress(String urlString, long bytesRead, long totalBytes) { + public void onProgress(long bytesRead, long totalBytes) { UpdateService.reportDownloadProgress(context, IndexUpdater.this, bytesRead, totalBytes); } }; protected final ProgressListener processIndexListener = new ProgressListener() { @Override - public void onProgress(String urlString, long bytesRead, long totalBytes) { + public void onProgress(long bytesRead, long totalBytes) { UpdateService.reportProcessIndexProgress(context, IndexUpdater.this, bytesRead, totalBytes); } }; diff --git a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java index 518b23016..44405fb43 100644 --- a/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java +++ b/app/src/main/java/org/fdroid/fdroid/IndexV1Updater.java @@ -198,7 +198,7 @@ public class IndexV1Updater extends IndexUpdater { JarFile jarFile = new JarFile(outputFile, true); JarEntry indexEntry = (JarEntry) jarFile.getEntry(DATA_FILE_NAME); InputStream indexInputStream = new ProgressBufferedInputStream(jarFile.getInputStream(indexEntry), - processIndexListener, repo.address, (int) indexEntry.getSize()); + processIndexListener, (int) indexEntry.getSize()); processIndexV1(indexInputStream, indexEntry, cacheTag); } diff --git a/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java b/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java index 1340877fd..25aad6dc9 100644 --- a/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java +++ b/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java @@ -9,7 +9,6 @@ import java.io.InputStream; class ProgressBufferedInputStream extends BufferedInputStream { private final ProgressListener progressListener; - private final String urlString; private final int totalBytes; private int currentBytes; @@ -18,10 +17,9 @@ class ProgressBufferedInputStream extends BufferedInputStream { * Reports progress to the specified {@link ProgressListener}, with the * progress based on the {@code totalBytes}. */ - ProgressBufferedInputStream(InputStream in, ProgressListener progressListener, String urlString, int totalBytes) { + ProgressBufferedInputStream(InputStream in, ProgressListener progressListener, int totalBytes) { super(in); this.progressListener = progressListener; - this.urlString = urlString; this.totalBytes = totalBytes; } @@ -33,7 +31,7 @@ class ProgressBufferedInputStream extends BufferedInputStream { * the digits changing because it looks pretty, < 9000 since the reads won't * line up exactly */ if (currentBytes % 333333 < 9000) { - progressListener.onProgress(urlString, currentBytes, totalBytes); + progressListener.onProgress(currentBytes, totalBytes); } } return super.read(buffer, byteOffset, byteCount); diff --git a/app/src/main/java/org/fdroid/fdroid/ProgressListener.java b/app/src/main/java/org/fdroid/fdroid/ProgressListener.java index dc9fbcbdb..e45cb7356 100644 --- a/app/src/main/java/org/fdroid/fdroid/ProgressListener.java +++ b/app/src/main/java/org/fdroid/fdroid/ProgressListener.java @@ -19,6 +19,6 @@ import java.net.URL; */ public interface ProgressListener { - void onProgress(String urlString, long bytesRead, long totalBytes); + void onProgress(long bytesRead, long totalBytes); } diff --git a/app/src/main/java/org/fdroid/fdroid/net/Downloader.java b/app/src/main/java/org/fdroid/fdroid/net/Downloader.java index 04b215543..9fe3ca529 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/Downloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/Downloader.java @@ -207,7 +207,7 @@ public abstract class Downloader { @Override public void run() { if (downloaderProgressListener != null) { - downloaderProgressListener.onProgress(urlString, bytesRead, totalBytes); + downloaderProgressListener.onProgress(bytesRead, totalBytes); } } }; diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java index efbd57a45..0bfd358ba 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java +++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java @@ -207,7 +207,7 @@ public class DownloaderService extends Service { downloader = DownloaderFactory.create(this, uri, localFile); downloader.setListener(new ProgressListener() { @Override - public void onProgress(String urlString, long bytesRead, long totalBytes) { + public void onProgress(long bytesRead, long totalBytes) { Intent intent = new Intent(Downloader.ACTION_PROGRESS); intent.setData(uri); intent.putExtra(Downloader.EXTRA_BYTES_READ, bytesRead);