X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fcoroutines%2FSaveUrlCoroutine.kt;h=7ce88146a7ef60501c914829058b2c4ce3dfd73a;hb=6696d6946875515ae71c46a62dede4df44ad4351;hp=d2765814b7b210291addee03dd37a5ba5fbce54e;hpb=5dd60cebd26469bcc597e1ccede8706fb403dfc1;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveUrlCoroutine.kt b/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveUrlCoroutine.kt index d2765814..7ce88146 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveUrlCoroutine.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveUrlCoroutine.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 Soren Stoutner . + * Copyright 2020-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -44,9 +44,13 @@ import java.io.InputStream import java.net.HttpURLConnection import java.net.URL import java.text.NumberFormat +import java.util.Date class SaveUrlCoroutine { fun save(context: Context, activity: Activity, urlString: String, fileUri: Uri, userAgent: String, cookiesEnabled: Boolean) { + // Create a canceled boolean. + var canceled = false + // Use a coroutine to save the URL. CoroutineScope(Dispatchers.Main).launch { // Create a file name string. @@ -75,6 +79,7 @@ class SaveUrlCoroutine { // Create a saving file snackbar. val savingFileSnackbar = Snackbar.make(webViewViewPager2, activity.getString(R.string.saving_file, 0, fileNameString), Snackbar.LENGTH_INDEFINITE) + .setAction(R.string.cancel) { canceled = true } // Display the saving file snackbar. savingFileSnackbar.show() @@ -150,40 +155,52 @@ class SaveUrlCoroutine { val inputStream: InputStream = BufferedInputStream(httpUrlConnection.inputStream) // Initialize the conversion buffer byte array. - // This is set to a megabyte so that frequent updating of the snackbar doesn't freeze the interface on download. - val conversionBufferByteArray = ByteArray(1048576) + // This is set to a 100,000 bytes so that frequent updating of the snackbar doesn't freeze the interface on download, although `inputStream.read` currently used 8,000 as an upper limit. + // + val conversionBufferByteArray = ByteArray(100_000) - // Initialize the downloaded kilobytes counter. - var downloadedKilobytesCounter: Long = 0 + // Initialize the longs. + var downloadedBytesCounterLong: Long = 0 + var lastSnackbarUpdateLong: Long = 0 // Define the buffer length variable. var bufferLength: Int // Attempt to read data from the input stream and store it in the output stream. Also store the amount of data read in the buffer length variable. - while (inputStream.read(conversionBufferByteArray).also { bufferLength = it } > 0) { // Proceed while the amount of data stored in the buffer in > 0. + while ((inputStream.read(conversionBufferByteArray).also { bufferLength = it } > 0) && !canceled) { // Proceed while the amount of data stored in the buffer in > 0. // Write the contents of the conversion buffer to the file output stream. outputStream.write(conversionBufferByteArray, 0, bufferLength) - // Update the downloaded kilobytes counter. - downloadedKilobytesCounter += bufferLength + // Update the downloaded bytes counter. + downloadedBytesCounterLong += bufferLength // Format the number of bytes downloaded. - val formattedNumberOfBytesDownloadedString = NumberFormat.getInstance().format(downloadedKilobytesCounter) - - // Update the UI. - withContext(Dispatchers.Main) { - // Check to see if the file size is known. - if (fileSize == -1L) { // The size of the download file is not known. - // Update the snackbar. - savingFileSnackbar.setText(activity.getString(R.string.saving_file_progress, formattedNumberOfBytesDownloadedString, fileNameString)) - } else { // The size of the download file is known. - // Calculate the download percentage. - val downloadPercentage = downloadedKilobytesCounter * 100 / fileSize - - // Update the snackbar. - savingFileSnackbar.setText(activity.getString(R.string.saving_file_percentage_progress, downloadPercentage, formattedNumberOfBytesDownloadedString, formattedFileSize, - fileNameString) - ) + val formattedNumberOfBytesDownloadedString = NumberFormat.getInstance().format(downloadedBytesCounterLong) + + // Get the current time. + val currentTimeLong = Date().time + + // Update the snackbar if more than 100 milliseconds have passed since the last update. + // Updating the snackbar is so resource intensive that it will throttle the download if it is done too frequently. + if (currentTimeLong - lastSnackbarUpdateLong > 100) { + // Store the update time. + lastSnackbarUpdateLong = currentTimeLong + + // Update the UI. + withContext(Dispatchers.Main) { + // Check to see if the file size is known. + if (fileSize == -1L) { // The size of the download file is not known. + // Update the snackbar. + savingFileSnackbar.setText(activity.getString(R.string.saving_file_progress, formattedNumberOfBytesDownloadedString, fileNameString)) + } else { // The size of the download file is known. + // Calculate the download percentage. + val downloadPercentage = downloadedBytesCounterLong * 100 / fileSize + + // Update the snackbar. + savingFileSnackbar.setText(activity.getString(R.string.saving_file_percentage_progress, downloadPercentage, formattedNumberOfBytesDownloadedString, formattedFileSize, + fileNameString) + ) + } } } } @@ -204,8 +221,13 @@ class SaveUrlCoroutine { // Dismiss the saving file snackbar. savingFileSnackbar.dismiss() - // Display the file saved snackbar. - Snackbar.make(webViewViewPager2, activity.getString(R.string.saved, fileNameString), Snackbar.LENGTH_LONG).show() + // Display a final disposition snackbar. + if (canceled) + // Display the download cancelled snackbar. + Snackbar.make(webViewViewPager2, activity.getString(R.string.download_cancelled), Snackbar.LENGTH_SHORT).show() + else + // Display the file saved snackbar. + Snackbar.make(webViewViewPager2, activity.getString(R.string.saved, fileNameString), Snackbar.LENGTH_LONG).show() } } catch (exception: Exception) { // Update the UI.