import android.app.Activity;
import android.content.Context;
+import android.database.Cursor;
import android.net.Uri;
import android.os.AsyncTask;
+import android.os.Build;
+import android.provider.OpenableColumns;
import android.util.Base64;
import android.webkit.CookieManager;
import java.text.NumberFormat;
public class SaveUrl extends AsyncTask<String, Long, String> {
- // Define a weak references.
+ // Declare the weak references.
private final WeakReference<Context> contextWeakReference;
private final WeakReference<Activity> activityWeakReference;
// Define a success string constant.
private final String SUCCESS = "Success";
- // Define the class variables.
- private final String filePathString;
+ // Declare the class variables.
+ private final Uri fileUri;
private final String userAgent;
private final boolean cookiesEnabled;
private Snackbar savingFileSnackbar;
+ private long fileSize;
+ private String formattedFileSize;
+ private final String fileNameString;
// The public constructor.
- public SaveUrl(Context context, Activity activity, String filePathString, String userAgent, boolean cookiesEnabled) {
+ public SaveUrl(Context context, Activity activity, Uri fileUri, String userAgent, boolean cookiesEnabled) {
// Populate weak references to the calling context and activity.
contextWeakReference = new WeakReference<>(context);
activityWeakReference = new WeakReference<>(activity);
// Store the class variables.
- this.filePathString = filePathString;
+ this.fileUri = fileUri;
this.userAgent = userAgent;
this.cookiesEnabled = cookiesEnabled;
+
+ // Query the exact file name if the API >= 26.
+ if (Build.VERSION.SDK_INT >= 26) {
+ // Get a cursor from the content resolver.
+ Cursor contentResolverCursor = activity.getContentResolver().query(fileUri, null, null, null);
+
+ // Move to the first row.
+ contentResolverCursor.moveToFirst();
+
+ // 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.getLastPathSegment();
+ }
}
// `onPreExecute()` operates on the UI thread.
NoSwipeViewPager noSwipeViewPager = activity.findViewById(R.id.webviewpager);
// Create a saving file snackbar.
- savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + " 0% - " + filePathString, Snackbar.LENGTH_INDEFINITE);
+ savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + " 0% - " + fileNameString, Snackbar.LENGTH_INDEFINITE);
// Display the saving file snackbar.
savingFileSnackbar.show();
// Define a save disposition string.
String saveDisposition = SUCCESS;
+ // Get the URL string.
+ String urlString = urlToSave[0];
+
try {
// Open an output stream.
- OutputStream outputStream = activity.getContentResolver().openOutputStream(Uri.parse(filePathString));
+ OutputStream outputStream = activity.getContentResolver().openOutputStream(fileUri);
// Save the URL.
- if (urlToSave[0].startsWith("data:")) { // The URL contains the entire data of an image.
+ if (urlString.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);
+ String base64DataString = urlString.substring(urlString.indexOf(",") + 1);
// Decode the Base64 string to a byte array.
byte[] base64DecodedDataByteArray = Base64.decode(base64DataString, Base64.DEFAULT);
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(urlToSave[0]);
+ URL url = new URL(urlString);
// Instantiate the proxy helper.
ProxyHelper proxyHelper = new ProxyHelper();
// 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);
+
+ // 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;
InputStream inputStream = new BufferedInputStream(httpUrlConnection.getInputStream());
// Initialize the conversion buffer byte array.
- byte[] conversionBufferByteArray = new byte[1024];
+ // This is set to a megabyte so that frequent updating of the snackbar doesn't freeze the interface on download. <https://redmine.stoutner.com/issues/709>
+ byte[] conversionBufferByteArray = new byte[1048576];
// Initialize the downloaded kilobytes counter.
long downloadedKilobytesCounter = 0;
// Write the contents of the conversion buffer to the file 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 downloaded kilobytes counter.
+ downloadedKilobytesCounter = downloadedKilobytesCounter + bufferLength;
- // Update the download percentage.
- publishProgress(downloadPercentage);
- }
+ // Update the file download progress snackbar.
+ publishProgress(downloadedKilobytesCounter);
}
// Close the input stream.
}
}
- // Flush the output stream.
- outputStream.flush();
-
// Close the output stream.
outputStream.close();
} catch (Exception exception) {
// `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();
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 = - downloadPercentage[0];
-
- // 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) + " - " + fileNameString);
+ } 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) + " - " + fileNameString);
}
}
// Display a save disposition snackbar.
if (saveDisposition.equals(SUCCESS)) {
// Display the file saved snackbar.
- Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + " " + filePathString, Snackbar.LENGTH_LONG).show();
+ Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + " " + fileNameString, 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();
projects / PrivacyBrowserAndroid.git / blobdiff