X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fcoroutines%2FSaveUrlCoroutine.kt;h=f8adc5b0f187862fbd611cab2d373becaad2645e;hb=e065315a36c804626a7dba38d3edad05e9fdb473;hp=f6b7a83235d8f181f9f3c0ec18848d553e957c4f;hpb=2f0d40bbfc1aca5d88e711422cec58d912b66884;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 f6b7a832..f8adc5b0 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 . * @@ -22,7 +22,6 @@ package com.stoutner.privacybrowser.coroutines import android.app.Activity import android.content.Context import android.net.Uri -import android.os.Build import android.provider.OpenableColumns import android.util.Base64 import android.webkit.CookieManager @@ -44,6 +43,7 @@ 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) { @@ -52,26 +52,17 @@ class SaveUrlCoroutine { // Use a coroutine to save the URL. CoroutineScope(Dispatchers.Main).launch { - // Create a file name string. - val fileNameString: String + // Get a cursor from the content resolver. + val contentResolverCursor = activity.contentResolver.query(fileUri, null, null, null)!! - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - // Get a cursor from the content resolver. - val contentResolverCursor = activity.contentResolver.query(fileUri, null, null, null)!! + // Move to the first row. + contentResolverCursor.moveToFirst() - // Move to the first row. - contentResolverCursor.moveToFirst() + // Get the file name from the cursor. + val fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - - // Close the cursor. - contentResolverCursor.close() - } else { - // Use the file URI last path segment as the file name string. - fileNameString = fileUri.lastPathSegment!! - } + // Close the cursor. + contentResolverCursor.close() // Get a handle for the no swipe view pager. val webViewViewPager2 = activity.findViewById(R.id.webview_viewpager2) @@ -154,11 +145,13 @@ 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 50,000 bytes so that frequent updating of the snackbar doesn't freeze the interface on download, although `inputStream.read` currently uses 8,000 as an upper limit. + // + val conversionBufferByteArray = ByteArray(50_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 @@ -168,26 +161,36 @@ class SaveUrlCoroutine { // 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) + ) + } } } } @@ -229,4 +232,4 @@ class SaveUrlCoroutine { } } } -} \ No newline at end of file +}