X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fasynctasks%2FSaveUrl.java;h=e6b811500726162066086320c13053c9869950b5;hp=1eb50323f096afdcfb70fabc64e4564636e89588;hb=d665a89a28f33c9feaaf217f7cabc0c809cb7107;hpb=4d51aa9acb8daaec1326f14e5025fde6d1f0dcd8 diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java index 1eb50323..e6b81150 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java @@ -20,9 +20,18 @@ package com.stoutner.privacybrowser.asynctasks; import android.app.Activity; +import android.content.ActivityNotFoundException; +import android.content.ContentResolver; import android.content.Context; +import android.content.Intent; +import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; +import android.view.View; import android.webkit.CookieManager; +import android.webkit.MimeTypeMap; + +import androidx.core.content.FileProvider; import com.google.android.material.snackbar.Snackbar; import com.stoutner.privacybrowser.R; @@ -39,9 +48,10 @@ import java.lang.ref.WeakReference; import java.net.HttpURLConnection; import java.net.Proxy; import java.net.URL; +import java.text.NumberFormat; -public class SaveUrl extends AsyncTask { - // Define a weak references for the calling context and activities. +public class SaveUrl extends AsyncTask { + // Define a weak references for the calling context and activity. private WeakReference contextWeakReference; private WeakReference activityWeakReference; @@ -81,7 +91,7 @@ public class SaveUrl extends AsyncTask { NoSwipeViewPager noSwipeViewPager = activity.findViewById(R.id.webviewpager); // Create a saving file snackbar. - savingFileSnackbar = Snackbar.make(noSwipeViewPager, R.string.saving_file, Snackbar.LENGTH_INDEFINITE); + savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + " 0% - " + filePathString, Snackbar.LENGTH_INDEFINITE); // Display the saving file snackbar. savingFileSnackbar.show(); @@ -89,7 +99,7 @@ public class SaveUrl extends AsyncTask { @Override protected String doInBackground(String... urlToSave) { - // Get a handle for the context and activity. + // Get handles for the context and activity. Context context = contextWeakReference.get(); Activity activity = activityWeakReference.get(); @@ -103,7 +113,7 @@ public class SaveUrl extends AsyncTask { // Because everything relating to requesting data from a webserver can throw errors, the entire section must catch `IOExceptions`. try { - // Get the URL from the main activity. + // Get the URL from the calling activity. URL url = new URL(urlToSave[0]); // Instantiate the proxy helper. @@ -132,8 +142,20 @@ public class SaveUrl extends AsyncTask { // The actual network request is in a `try` bracket so that `disconnect()` is run in the `finally` section even if an error is encountered in the main block. try { - // Get the response code, which causes the connection to the server to be made. - httpUrlConnection.getResponseCode(); + // Get the content length header, which causes the connection to the server to be made. + String contentLengthString = httpUrlConnection.getHeaderField("Content-Length"); + + // Define the file size long. + long fileSize; + + // Make sure the content length isn't null. + if (contentLengthString != null) { // The content length isn't null. + // Convert the content length to an long. + fileSize = Long.parseLong(contentLengthString); + } else { // The content length is null. + // Set the file size to be `-1`. + fileSize = -1; + } // Get the response body stream. InputStream inputStream = new BufferedInputStream(httpUrlConnection.getInputStream()); @@ -157,6 +179,9 @@ public class SaveUrl extends AsyncTask { // Initialize the conversion buffer byte array. byte[] conversionBufferByteArray = new byte[1024]; + // Initialize the downloaded kilobytes counter. + long downloadedKilobytesCounter = 0; + // Define the buffer length variable. int bufferLength; @@ -164,6 +189,23 @@ public class SaveUrl extends AsyncTask { while ((bufferLength = inputStream.read(conversionBufferByteArray)) > 0) { // Proceed while the amount of data stored in the buffer in > 0. // Write the contents of the conversion buffer to the output stream. outputStream.write(conversionBufferByteArray, 0, bufferLength); + + // Update the file download progress snackbar. + if (fileSize == -1) { // The file size is unknown. + // Negatively update the downloaded kilobytes counter. + downloadedKilobytesCounter = downloadedKilobytesCounter - bufferLength; + + publishProgress(downloadedKilobytesCounter); + } else { // The file size is known. + // Update the downloaded kilobytes counter. + downloadedKilobytesCounter = downloadedKilobytesCounter + bufferLength; + + // Calculate the download percentage. + long downloadPercentage = (downloadedKilobytesCounter * 100) / fileSize; + + // Update the download percentage. + publishProgress(downloadPercentage); + } } // Close the input stream. @@ -171,6 +213,15 @@ public class SaveUrl extends AsyncTask { // Close the output stream. outputStream.close(); + + // Define a media scanner intent, which adds items like pictures to Android's recent file list. + Intent mediaScannerIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE); + + // Add the URI to the media scanner intent. + mediaScannerIntent.setData(Uri.fromFile(file)); + + // Make it so. + activity.sendBroadcast(mediaScannerIntent); } finally { // Disconnect the HTTP URL connection. httpUrlConnection.disconnect(); @@ -184,10 +235,38 @@ public class SaveUrl extends AsyncTask { return saveDisposition; } + // `onProgressUpdate()` operates on the UI thread. + @Override + protected void onProgressUpdate(Long... downloadPercentage) { + // Get a handle for the activity. + Activity activity = activityWeakReference.get(); + + // Abort if the activity is gone. + if ((activity == null) || activity.isFinishing()) { + return; + } + + // Check to see if a download percentage has been calculated. + if (downloadPercentage[0] < 0) { // There is no download percentage. The negative number represents the raw downloaded kilobytes. + // Calculate the number of bytes downloaded. When the `downloadPercentage` is negative, it is actually the raw number of kilobytes downloaded. + long numberOfBytesDownloaded = 0 - downloadPercentage[0]; + + // Format the number of bytes downloaded. + String formattedNumberOfBytesDownloaded = NumberFormat.getInstance().format(numberOfBytesDownloaded); + + // Update the snackbar. + savingFileSnackbar.setText(activity.getString(R.string.saving_file) + " " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " - " + filePathString); + } else { // There is a download percentage. + // Update the snackbar. + savingFileSnackbar.setText(activity.getString(R.string.saving_file) + " " + downloadPercentage[0] + "% - " + filePathString); + } + } + // `onPostExecute()` operates on the UI thread. @Override protected void onPostExecute(String saveDisposition) { - // Get a handle for the activity. + // Get handles for the context and activity. + Context context = contextWeakReference.get(); Activity activity = activityWeakReference.get(); // Abort if the activity is gone. @@ -203,8 +282,56 @@ public class SaveUrl extends AsyncTask { // Display a save disposition snackbar. if (saveDisposition.equals(SUCCESS)) { - Snackbar.make(noSwipeViewPager, R.string.file_saved, Snackbar.LENGTH_SHORT).show(); + // Create a file saved snackbar. + Snackbar fileSavedSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + " " + filePathString, Snackbar.LENGTH_LONG); + + // Add an open action if the file is not an APK on API >= 26 (that scenario requires the REQUEST_INSTALL_PACKAGES permission). + if (!(Build.VERSION.SDK_INT >= 26 && filePathString.endsWith(".apk"))) { + fileSavedSnackbar.setAction(R.string.open, (View v) -> { + // Get a file for the file path string. + File file = new File(filePathString); + + // Define a file URI variable + Uri fileUri; + + // Get the URI for the file according to the Android version. + if (Build.VERSION.SDK_INT >= 24) { // Use a file provider. + fileUri = FileProvider.getUriForFile(context, activity.getString(R.string.file_provider), file); + } else { // Get the raw file path URI. + fileUri = Uri.fromFile(file); + } + + // Get a handle for the content resolver. + ContentResolver contentResolver = context.getContentResolver(); + + // Create an open intent with `ACTION_VIEW`. + Intent openIntent = new Intent(Intent.ACTION_VIEW); + + // Set the URI and the MIME type. + if (filePathString.endsWith("apk") || filePathString.endsWith("APK")) { // Force detection of APKs. + openIntent.setDataAndType(fileUri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk")); + } else { // Autodetect the MIME type. + openIntent.setDataAndType(fileUri, contentResolver.getType(fileUri)); + } + + // Allow the app to read the file URI. + openIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + + // Try the intent. + try { + // Show the chooser. + activity.startActivity(openIntent); + } catch (ActivityNotFoundException exception) { // There are no apps available to open the URL. + // Show a snackbar with the error. + Snackbar.make(noSwipeViewPager, activity.getString(R.string.error) + " " + exception, Snackbar.LENGTH_INDEFINITE).show(); + } + }); + } + + // Show the file saved snackbar. + fileSavedSnackbar.show(); } else { + // Display the file saving error. Snackbar.make(noSwipeViewPager, activity.getString(R.string.error_saving_file) + " " + saveDisposition, Snackbar.LENGTH_INDEFINITE).show(); } }