From 66e909d606cb69245c05013d0cf3973afb24edf8 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 29 Mar 2019 16:37:18 +0100
Subject: [PATCH] standardize all Downloaders on 8k block sizes

This is needed since this affects the onProgress broadcasts, and sending
too many can peg the device's CPU.  1k was just too small.  ANd 8k works
fine for Bluetooth.

fdroid/fdroidclient#1590
---
 .../main/java/org/fdroid/fdroid/net/BluetoothDownloader.java  | 2 +-
 app/src/main/java/org/fdroid/fdroid/net/Downloader.java       | 4 ++--
 app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java   | 2 +-
 .../main/java/org/fdroid/fdroid/net/LocalFileDownloader.java  | 2 +-
 .../main/java/org/fdroid/fdroid/net/TreeUriDownloader.java    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
index 225be7434..46912bcee 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
@@ -92,7 +92,7 @@ public class BluetoothDownloader extends Downloader {
 
     @Override
     public void download() throws IOException, InterruptedException {
-        downloadFromStream(1024, false);
+        downloadFromStream(false);
         connection.closeQuietly();
     }
 
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 7acde08c6..ee806b4fe 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/Downloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/Downloader.java
@@ -116,7 +116,7 @@ public abstract class Downloader {
         return notFound;
     }
 
-    void downloadFromStream(int bufferSize, boolean resumable) throws IOException, InterruptedException {
+    void downloadFromStream(boolean resumable) throws IOException, InterruptedException {
         Utils.debugLog(TAG, "Downloading from stream");
         InputStream input = null;
         OutputStream outputStream = new FileOutputStream(outputFile, resumable);
@@ -127,7 +127,7 @@ public abstract class Downloader {
             // we were interrupted before proceeding to the download.
             throwExceptionIfInterrupted();
 
-            copyInputToOutputStream(input, bufferSize, outputStream);
+            copyInputToOutputStream(input, 8192, outputStream);
         } finally {
             Utils.closeQuietly(outputStream);
             Utils.closeQuietly(input);
diff --git a/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
index ef86f696a..231484639 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java
@@ -175,7 +175,7 @@ public class HttpDownloader extends Downloader {
         }
         setupConnection(resumable);
         Utils.debugLog(TAG, "downloading " + urlString + " (is resumable: " + resumable + ")");
-        downloadFromStream(8192, resumable);
+        downloadFromStream(resumable);
         cacheTag = connection.getHeaderField(HEADER_FIELD_ETAG);
     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
index 9701eae39..0cd4d943a 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
@@ -81,6 +81,6 @@ public class LocalFileDownloader extends Downloader {
         } else if (fileLength > 0) {
             resumable = true;
         }
-        downloadFromStream(8192, resumable);
+        downloadFromStream(resumable);
     }
 }
diff --git a/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
index 93ab66f6c..0c27ad261 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
@@ -96,7 +96,7 @@ public class TreeUriDownloader extends Downloader {
 
     @Override
     public void download() throws IOException, InterruptedException {
-        downloadFromStream(8192, false);
+        downloadFromStream(false);
     }
 
     @Override