/*
- * Copyright © 2020-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2020-2022 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
*
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android. If not, see <http://www.gnu.org/licenses/>.
*/
package com.stoutner.privacybrowser.asynctasks;
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 String urlString = "";
+ 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% - " + urlString, 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();
String saveDisposition = SUCCESS;
// Get the URL string.
- urlString = urlToSave[0];
+ 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 (urlString.startsWith("data:")) { // The URL contains the entire data of an image.
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;
// 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) + " - " + urlString);
+ 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 + "% - " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " / " + formattedFileSize + " " +
- activity.getString(R.string.bytes) + " - " + urlString);
+ 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) + " " + urlString, Snackbar.LENGTH_LONG).show();
+ Snackbar.make(noSwipeViewPager, activity.getString(R.string.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();
+ Snackbar.make(noSwipeViewPager, activity.getString(R.string.error_saving_file, fileNameString, saveDisposition), Snackbar.LENGTH_INDEFINITE).show();
}
}
-}
\ No newline at end of file
+}
projects / PrivacyBrowserAndroid.git / blobdiff