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=7d981c0f324a554cded0809515aca0c578a8fdbd;hp=def7babd913b4032787ff5e1c9777d46bce7c329;hb=7e0198f9aef9900b2c400b278e08f3e8273f2593;hpb=8f7e9b7db429568e26f00bc2eef88402d722bec7 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 def7babd..7d981c0f 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Soren Stoutner . + * Copyright © 2020-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -21,9 +21,9 @@ package com.stoutner.privacybrowser.asynctasks; import android.app.Activity; import android.content.Context; -import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; +import android.util.Base64; import android.webkit.CookieManager; import com.google.android.material.snackbar.Snackbar; @@ -32,9 +32,6 @@ import com.stoutner.privacybrowser.helpers.ProxyHelper; import com.stoutner.privacybrowser.views.NoSwipeViewPager; import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.ref.WeakReference; @@ -44,18 +41,21 @@ import java.net.URL; import java.text.NumberFormat; public class SaveUrl extends AsyncTask { - // Define a weak references for the calling context and activity. - private WeakReference contextWeakReference; - private WeakReference activityWeakReference; + // Define a weak references. + private final WeakReference contextWeakReference; + private final WeakReference activityWeakReference; // Define a success string constant. private final String SUCCESS = "Success"; // Define the class variables. - private String filePathString; - private String userAgent; - private boolean cookiesEnabled; + private final String filePathString; + private final String userAgent; + private final boolean cookiesEnabled; private Snackbar savingFileSnackbar; + private long fileSize; + private String formattedFileSize; + private String urlString = ""; // The public constructor. public SaveUrl(Context context, Activity activity, String filePathString, String userAgent, boolean cookiesEnabled) { @@ -84,7 +84,7 @@ public class SaveUrl extends AsyncTask { NoSwipeViewPager noSwipeViewPager = activity.findViewById(R.id.webviewpager); // Create a saving file snackbar. - savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + ": " + filePathString, Snackbar.LENGTH_INDEFINITE); + savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + " 0% - " + urlString, Snackbar.LENGTH_INDEFINITE); // Display the saving file snackbar. savingFileSnackbar.show(); @@ -92,7 +92,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(); @@ -104,122 +104,106 @@ public class SaveUrl extends AsyncTask { // Define a save disposition string. String saveDisposition = SUCCESS; - // Because everything relating to requesting data from a webserver can throw errors, the entire section must catch `IOExceptions`. + // Get the URL string. + urlString = urlToSave[0]; + try { - // Get the URL from the calling activity. - URL url = new URL(urlToSave[0]); + // Open an output stream. + OutputStream outputStream = activity.getContentResolver().openOutputStream(Uri.parse(filePathString)); - // Instantiate the proxy helper. - ProxyHelper proxyHelper = new ProxyHelper(); + // Save the URL. + if (urlString.startsWith("data:")) { // The URL contains the entire data of an image. + // Get the Base64 data, which begins after a `,`. + String base64DataString = urlString.substring(urlString.indexOf(",") + 1); - // Get the current proxy. - Proxy proxy = proxyHelper.getCurrentProxy(context); + // Decode the Base64 string to a byte array. + byte[] base64DecodedDataByteArray = Base64.decode(base64DataString, Base64.DEFAULT); - // Open a connection to the URL. No data is actually sent at this point. - HttpURLConnection httpUrlConnection = (HttpURLConnection) url.openConnection(proxy); + // Write the Base64 byte array to the output stream. + outputStream.write(base64DecodedDataByteArray); + } else { // The URL points to the data location on the internet. + // Get the URL from the calling activity. + URL url = new URL(urlString); - // Add the user agent to the header property. - httpUrlConnection.setRequestProperty("User-Agent", userAgent); + // Instantiate the proxy helper. + ProxyHelper proxyHelper = new ProxyHelper(); - // Add the cookies if they are enabled. - if (cookiesEnabled) { - // Get the cookies for the current domain. - String cookiesString = CookieManager.getInstance().getCookie(url.toString()); + // Get the current proxy. + Proxy proxy = proxyHelper.getCurrentProxy(context); - // Only add the cookies if they are not null. - if (cookiesString != null) { - // Add the cookies to the header property. - httpUrlConnection.setRequestProperty("Cookie", cookiesString); - } - } - - // 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 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; - } + // Open a connection to the URL. No data is actually sent at this point. + HttpURLConnection httpUrlConnection = (HttpURLConnection) url.openConnection(proxy); - // Get the response body stream. - InputStream inputStream = new BufferedInputStream(httpUrlConnection.getInputStream()); + // Add the user agent to the header property. + httpUrlConnection.setRequestProperty("User-Agent", userAgent); - // Get the file. - File file = new File(filePathString); + // Add the cookies if they are enabled. + if (cookiesEnabled) { + // Get the cookies for the current domain. + String cookiesString = CookieManager.getInstance().getCookie(url.toString()); - // Delete the file if it exists. - if (file.exists()) { - //noinspection ResultOfMethodCallIgnored - file.delete(); + // Only add the cookies if they are not null. + if (cookiesString != null) { + // Add the cookies to the header property. + httpUrlConnection.setRequestProperty("Cookie", cookiesString); + } } - // Create a new file. - //noinspection ResultOfMethodCallIgnored - file.createNewFile(); - - // Create an output file stream. - OutputStream outputStream = new FileOutputStream(file); - - // Initialize the conversion buffer byte array. - byte[] conversionBufferByteArray = new byte[1024]; + // 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 content length header, which causes the connection to the server to be made. + String contentLengthString = httpUrlConnection.getHeaderField("Content-Length"); + + // 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); + + // Format the file size for display. + formattedFileSize = NumberFormat.getInstance().format(fileSize); + } else { // The content length is null. + // Set the file size to be `-1`. + fileSize = -1; + } - // Initialize the downloaded kilobytes counter. - long downloadedKilobytesCounter = 0; + // Get the response body stream. + InputStream inputStream = new BufferedInputStream(httpUrlConnection.getInputStream()); - // Define the buffer length variable. - int bufferLength; + // Initialize the conversion buffer byte array. + byte[] conversionBufferByteArray = new byte[1024]; - // 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 ((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); + // Initialize the downloaded kilobytes counter. + long downloadedKilobytesCounter = 0; - // Increment the downloaded kilobytes counter. - downloadedKilobytesCounter++; + // Define the buffer length variable. + int bufferLength; - // Update the file download progress snackbar. - if (fileSize == -1) { // The file size is unknown. - // Convert the downloaded kilobytes counter to a negative number - long downloadedKilobytes = 0 - downloadedKilobytesCounter; + // 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 ((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 file output stream. + outputStream.write(conversionBufferByteArray, 0, bufferLength); - publishProgress(downloadedKilobytes); - } else { // The file size is known. - // Calculate the download percentage. - long downloadPercentage = (downloadedKilobytesCounter * 1024 * 100) / fileSize; + // Update the downloaded kilobytes counter. + downloadedKilobytesCounter = downloadedKilobytesCounter + bufferLength; - // Update the download percentage. - publishProgress(downloadPercentage); + // Update the file download progress snackbar. + publishProgress(downloadedKilobytesCounter); } - } - - // Close the input stream. - inputStream.close(); - - // 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); + // Close the input stream. + inputStream.close(); + } finally { + // Disconnect the HTTP URL connection. + httpUrlConnection.disconnect(); + } + } - // Add the URI to the media scanner intent. - mediaScannerIntent.setData(Uri.fromFile(file)); + // Flush the output stream. + outputStream.flush(); - // Make it so. - activity.sendBroadcast(mediaScannerIntent); - } finally { - // Disconnect the HTTP URL connection. - httpUrlConnection.disconnect(); - } - } catch (IOException exception) { + // Close the output stream. + outputStream.close(); + } catch (Exception exception) { // Store the error in the save disposition string. saveDisposition = exception.toString(); } @@ -230,7 +214,7 @@ public class SaveUrl extends AsyncTask { // `onProgressUpdate()` operates on the UI thread. @Override - protected void onProgressUpdate(Long... downloadPercentage) { + protected void onProgressUpdate(Long... numberOfBytesDownloaded) { // Get a handle for the activity. Activity activity = activityWeakReference.get(); @@ -239,26 +223,27 @@ public class SaveUrl extends AsyncTask { 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. - long numberOfBytesDownloaded = (0 - downloadPercentage[0]) * 1024; - - // Format the number of bytes downloaded. - String formattedNumberOfBytesDownloaded = NumberFormat.getInstance().format(numberOfBytesDownloaded); + // Format the number of bytes downloaded. + String formattedNumberOfBytesDownloaded = NumberFormat.getInstance().format(numberOfBytesDownloaded[0]); + // Check to see if the file size is known. + if (fileSize == -1) { // The size of the download file is not known. // Update the snackbar. - savingFileSnackbar.setText(activity.getString(R.string.saving_file) + ": " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " - " + filePathString); - } else { // There is a download percentage. + savingFileSnackbar.setText(activity.getString(R.string.saving_file) + " " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " - " + urlString); + } else { // The size of the download file is known. + // Calculate the download percentage. + long downloadPercentage = (numberOfBytesDownloaded[0] * 100) / fileSize; + // Update the snackbar. - savingFileSnackbar.setText(activity.getString(R.string.saving_file) + ": " + downloadPercentage[0] + "% - " + filePathString); + savingFileSnackbar.setText(activity.getString(R.string.saving_file) + " " + downloadPercentage + "% - " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " / " + formattedFileSize + " " + + activity.getString(R.string.bytes) + " - " + urlString); } } // `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. Activity activity = activityWeakReference.get(); // Abort if the activity is gone. @@ -274,8 +259,10 @@ 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(); + // Display the file saved snackbar. + Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + " " + urlString, Snackbar.LENGTH_LONG).show(); } else { + // Display the file saving error. Snackbar.make(noSwipeViewPager, activity.getString(R.string.error_saving_file) + " " + saveDisposition, Snackbar.LENGTH_INDEFINITE).show(); } }