X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fasynctasks%2FSaveUrl.java;h=2096e13907350100b73661efbb4ac4d16efd5ccb;hb=39380e8e8bdb3b9e29569a263277c9c3112b44ac;hp=3d63545983e7c9b4b679ba61599e880810ce90af;hpb=ad779ddf7db19cfb9de2f727d1a772850e161acb;p=PrivacyBrowserAndroid.git 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 3d635459..2096e139 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java @@ -20,14 +20,16 @@ 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.util.Base64; import android.view.View; import android.webkit.CookieManager; +import android.webkit.MimeTypeMap; import androidx.core.content.FileProvider; @@ -39,7 +41,6 @@ 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; @@ -49,17 +50,17 @@ 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; // The public constructor. @@ -109,122 +110,136 @@ 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`. try { - // Get the URL from the calling activity. - URL url = new URL(urlToSave[0]); + // Get the file. + File file = new File(filePathString); - // Instantiate the proxy helper. - ProxyHelper proxyHelper = new ProxyHelper(); + // Delete the file if it exists. + if (file.exists()) { + //noinspection ResultOfMethodCallIgnored + file.delete(); + } - // Get the current proxy. - Proxy proxy = proxyHelper.getCurrentProxy(context); + // Create a new file. + //noinspection ResultOfMethodCallIgnored + file.createNewFile(); - // Open a connection to the URL. No data is actually sent at this point. - HttpURLConnection httpUrlConnection = (HttpURLConnection) url.openConnection(proxy); + // Create an output file stream. + OutputStream fileOutputStream = new FileOutputStream(file); - // Add the user agent to the header property. - httpUrlConnection.setRequestProperty("User-Agent", userAgent); + // Save the URL. + if (urlToSave[0].startsWith("data:")) { // The URL contains the entire data of an image. + // Get the Base64 data, which begins after a `,`. + String base64DataString = urlToSave[0].substring(urlToSave[0].indexOf(",") + 1); - // Add the cookies if they are enabled. - if (cookiesEnabled) { - // Get the cookies for the current domain. - String cookiesString = CookieManager.getInstance().getCookie(url.toString()); + // Decode the Base64 string to a byte array. + byte[] base64DecodedDataByteArray = Base64.decode(base64DataString, Base64.DEFAULT); - // Only add the cookies if they are not null. - if (cookiesString != null) { - // Add the cookies to the header property. - httpUrlConnection.setRequestProperty("Cookie", cookiesString); - } - } + // Write the Base64 byte array to the file output stream. + fileOutputStream.write(base64DecodedDataByteArray); - // 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; - } + // Close the file output stream. + fileOutputStream.close(); + } else { // The URL points to the data location on the internet. + // Get the URL from the calling activity. + URL url = new URL(urlToSave[0]); + + // Instantiate the proxy helper. + ProxyHelper proxyHelper = new ProxyHelper(); - // Get the response body stream. - InputStream inputStream = new BufferedInputStream(httpUrlConnection.getInputStream()); + // Get the current proxy. + Proxy proxy = proxyHelper.getCurrentProxy(context); - // Get the file. - File file = new File(filePathString); + // Open a connection to the URL. No data is actually sent at this point. + HttpURLConnection httpUrlConnection = (HttpURLConnection) url.openConnection(proxy); - // Delete the file if it exists. - if (file.exists()) { - //noinspection ResultOfMethodCallIgnored - file.delete(); + // Add the user agent to the header property. + httpUrlConnection.setRequestProperty("User-Agent", userAgent); + + // Add the cookies if they are enabled. + if (cookiesEnabled) { + // Get the cookies for the current domain. + String cookiesString = CookieManager.getInstance().getCookie(url.toString()); + + // 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(); + // 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; + } - // Create an output file stream. - OutputStream outputStream = new FileOutputStream(file); + // Get the response body stream. + InputStream inputStream = new BufferedInputStream(httpUrlConnection.getInputStream()); - // Initialize the conversion buffer byte array. - byte[] conversionBufferByteArray = new byte[1024]; + // Initialize the conversion buffer byte array. + byte[] conversionBufferByteArray = new byte[1024]; - // Initialize the downloaded kilobytes counter. - long downloadedKilobytesCounter = 0; + // Initialize the downloaded kilobytes counter. + long downloadedKilobytesCounter = 0; - // Define the buffer length variable. - int bufferLength; + // Define the buffer length variable. + int bufferLength; - // 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); + // 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. + fileOutputStream.write(conversionBufferByteArray, 0, bufferLength); - // Increment the downloaded kilobytes counter. - downloadedKilobytesCounter++; + // Update the file download progress snackbar. + if (fileSize == -1) { // The file size is unknown. + // Negatively update the downloaded kilobytes counter. + downloadedKilobytesCounter = downloadedKilobytesCounter - 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; + publishProgress(downloadedKilobytesCounter); + } else { // The file size is known. + // Update the downloaded kilobytes counter. + downloadedKilobytesCounter = downloadedKilobytesCounter + bufferLength; - publishProgress(downloadedKilobytes); - } else { // The file size is known. - // Calculate the download percentage. - long downloadPercentage = (downloadedKilobytesCounter * 1024 * 100) / fileSize; + // Calculate the download percentage. + long downloadPercentage = (downloadedKilobytesCounter * 100) / fileSize; - // Update the download percentage. - publishProgress(downloadPercentage); + // Update the download percentage. + publishProgress(downloadPercentage); + } } - } - // Close the input stream. - inputStream.close(); + // Close the input stream. + inputStream.close(); - // Close the output stream. - outputStream.close(); + // Close the file output stream. + fileOutputStream.close(); + } finally { + // Disconnect the HTTP URL connection. + httpUrlConnection.disconnect(); + } + } - // 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); + // Create 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)); + // 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(); - } - } catch (IOException exception) { + // Make it so. + activity.sendBroadcast(mediaScannerIntent); + } catch (Exception exception) { // Store the error in the save disposition string. saveDisposition = exception.toString(); } @@ -246,8 +261,8 @@ public class SaveUrl extends AsyncTask { // 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; + // Calculate the number of bytes downloaded. When the `downloadPercentage` is negative, it is actually the raw number of kilobytes downloaded. + long numberOfBytesDownloaded = - downloadPercentage[0]; // Format the number of bytes downloaded. String formattedNumberOfBytesDownloaded = NumberFormat.getInstance().format(numberOfBytesDownloaded); @@ -285,27 +300,38 @@ public class SaveUrl extends AsyncTask { // 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) -> { + fileSavedSnackbar.setAction(R.string.open, (View view) -> { // Get a file for the file path string. File file = new File(filePathString); + // Declare 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 but not the MIME type. This should open all available apps. - openIntent.setData(FileProvider.getUriForFile(context, activity.getString(R.string.file_provider), file)); + // 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 chooser. + activity.startActivity(Intent.createChooser(openIntent, context.getString(R.string.open))); }); }