X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fasynctasks%2FSaveWebpageImage.java;h=5a92123a043cd7b3f1a574c2774b5dc6ee69431b;hp=65463f35ed1b4521d67ff76d14ff13067a985a2b;hb=ff3641c1e0edbe729f4e09b804081d35185976e3;hpb=1003c7842a01f338c8aaf9d4f07216111f294202 diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java index 65463f35..5a92123a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java @@ -1,36 +1,32 @@ /* - * Copyright © 2019-2020 Soren Stoutner . + * Copyright0 2019-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.asynctasks; import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; +import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.Canvas; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; -import android.view.View; - -import androidx.core.content.FileProvider; +import android.provider.OpenableColumns; import com.google.android.material.snackbar.Snackbar; @@ -38,15 +34,13 @@ import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.views.NestedScrollWebView; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; +import java.io.OutputStream; import java.lang.ref.WeakReference; public class SaveWebpageImage extends AsyncTask { // Declare the weak references. - private WeakReference contextWeakReference; - private WeakReference activityWeakReference; - private WeakReference nestedScrollWebViewWeakReference; + private final WeakReference activityWeakReference; + private final WeakReference nestedScrollWebViewWeakReference; // Declare the class constants. private final String SUCCESS = "Success"; @@ -54,17 +48,35 @@ public class SaveWebpageImage extends AsyncTask { // Declare the class variables. private Snackbar savingImageSnackbar; private Bitmap webpageBitmap; - private String filePathString; + private final Uri fileUri; + private final String fileNameString; // The public constructor. - public SaveWebpageImage(Context context, Activity activity, String filePathString, NestedScrollWebView nestedScrollWebView) { + public SaveWebpageImage(Activity activity, Uri fileUri, NestedScrollWebView nestedScrollWebView) { // Populate the weak references. - contextWeakReference = new WeakReference<>(context); activityWeakReference = new WeakReference<>(activity); nestedScrollWebViewWeakReference = new WeakReference<>(nestedScrollWebView); // Populate the class variables. - this.filePathString = filePathString; + this.fileUri = fileUri; + + // 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. @@ -80,7 +92,7 @@ public class SaveWebpageImage extends AsyncTask { } // Create a saving image snackbar. - savingImageSnackbar = Snackbar.make(nestedScrollWebView, activity.getString(R.string.processing_image) + " " + filePathString, Snackbar.LENGTH_INDEFINITE); + savingImageSnackbar = Snackbar.make(nestedScrollWebView, activity.getString(R.string.processing_image) + " " + fileNameString, Snackbar.LENGTH_INDEFINITE); // Display the saving image snackbar. savingImageSnackbar.show(); @@ -111,33 +123,15 @@ public class SaveWebpageImage extends AsyncTask { // Convert the bitmap to a PNG. `0` is for lossless compression (the only option for a PNG). This compression takes a long time. Once the minimum API >= 30 this could be replaced with WEBP_LOSSLESS. webpageBitmap.compress(Bitmap.CompressFormat.PNG, 0, webpageByteArrayOutputStream); - // Get a file for the image. - File imageFile = new File(filePathString); - - // Delete the current file if it exists. - if (imageFile.exists()) { - //noinspection ResultOfMethodCallIgnored - imageFile.delete(); - } - // Create a file creation disposition string. String fileCreationDisposition = SUCCESS; try { // Create an image file output stream. - FileOutputStream imageFileOutputStream = new FileOutputStream(imageFile); + OutputStream imageFileOutputStream = activity.getContentResolver().openOutputStream(fileUri); // Write the webpage image to the image file. webpageByteArrayOutputStream.writeTo(imageFileOutputStream); - - // 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(imageFile)); - - // Make it so. - activity.sendBroadcast(mediaScannerIntent); } catch (Exception exception) { // Store the error in the file creation disposition string. fileCreationDisposition = exception.toString(); @@ -151,7 +145,6 @@ public class SaveWebpageImage extends AsyncTask { @Override protected void onPostExecute(String fileCreationDisposition) { // Get handles for the weak references. - Context context = contextWeakReference.get(); Activity activity = activityWeakReference.get(); NestedScrollWebView nestedScrollWebView = nestedScrollWebViewWeakReference.get(); @@ -165,45 +158,11 @@ public class SaveWebpageImage extends AsyncTask { // Display a file creation disposition snackbar. if (fileCreationDisposition.equals(SUCCESS)) { - // Create a file saved snackbar. - Snackbar imageSavedSnackbar = Snackbar.make(nestedScrollWebView, activity.getString(R.string.file_saved) + " " + filePathString, Snackbar.LENGTH_SHORT); - - // Add an open action. - imageSavedSnackbar.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); - - // 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); - - // Show the chooser. - activity.startActivity(Intent.createChooser(openIntent, context.getString(R.string.open))); - }); - - // Show the image saved snackbar. - imageSavedSnackbar.show(); + // Display the image saved snackbar. + Snackbar.make(nestedScrollWebView, activity.getString(R.string.saved, fileNameString), Snackbar.LENGTH_SHORT).show(); } else { // Display the file saving error. - Snackbar.make(nestedScrollWebView, activity.getString(R.string.error_saving_file) + " " + fileCreationDisposition, Snackbar.LENGTH_INDEFINITE).show(); + Snackbar.make(nestedScrollWebView, activity.getString(R.string.error_saving_file, fileNameString, fileCreationDisposition), Snackbar.LENGTH_INDEFINITE).show(); } } -} \ No newline at end of file +}