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=aeb92988e93f52aedfe2b573cc15d77c3922ace6;hb=ff3641c1e0edbe729f4e09b804081d35185976e3;hpb=c1c9a0bf83ecef671356d554bb6e4927392b1cc8 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 aeb92988..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,63 +1,88 @@ /* - * Copyright © 2019 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.database.Cursor; import android.graphics.Bitmap; import android.graphics.Canvas; +import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; +import android.provider.OpenableColumns; import com.google.android.material.snackbar.Snackbar; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.views.NestedScrollWebView; -import com.stoutner.privacybrowser.views.NoSwipeViewPager; 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 { - // Define the weak references. - private WeakReference activityWeakReference; - private WeakReference nestedScrollWebViewWeakReference; +public class SaveWebpageImage extends AsyncTask { + // Declare the weak references. + private final WeakReference activityWeakReference; + private final WeakReference nestedScrollWebViewWeakReference; - // Define a success string constant. + // Declare the class constants. private final String SUCCESS = "Success"; - // Define the saving image snackbar and the webpage bitmap. + // Declare the class variables. private Snackbar savingImageSnackbar; private Bitmap webpageBitmap; + private final Uri fileUri; + private final String fileNameString; // The public constructor. - public SaveWebpageImage(Activity activity, NestedScrollWebView nestedScrollWebView) { + public SaveWebpageImage(Activity activity, Uri fileUri, NestedScrollWebView nestedScrollWebView) { // Populate the weak references. activityWeakReference = new WeakReference<>(activity); nestedScrollWebViewWeakReference = new WeakReference<>(nestedScrollWebView); + + // Populate the class variables. + 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. @Override protected void onPreExecute() { - // Get a handle for the activity and the nested scroll WebView. + // Get handles for the activity and the nested scroll WebView. Activity activity = activityWeakReference.get(); NestedScrollWebView nestedScrollWebView = nestedScrollWebViewWeakReference.get(); @@ -67,7 +92,7 @@ public class SaveWebpageImage extends AsyncTask { } // Create a saving image snackbar. - savingImageSnackbar = Snackbar.make(nestedScrollWebView, R.string.saving_image, Snackbar.LENGTH_INDEFINITE); + savingImageSnackbar = Snackbar.make(nestedScrollWebView, activity.getString(R.string.processing_image) + " " + fileNameString, Snackbar.LENGTH_INDEFINITE); // Display the saving image snackbar. savingImageSnackbar.show(); @@ -83,7 +108,7 @@ public class SaveWebpageImage extends AsyncTask { } @Override - protected String doInBackground(String... fileName) { + protected String doInBackground(Void... Void) { // Get a handle for the activity. Activity activity = activityWeakReference.get(); @@ -95,24 +120,15 @@ public class SaveWebpageImage extends AsyncTask { // Create a webpage PNG byte array output stream. ByteArrayOutputStream webpageByteArrayOutputStream = new ByteArrayOutputStream(); - // Convert the bitmap to a PNG. `0` is for lossless compression (the only option for a PNG). This compression takes a long time. + // 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(fileName[0]); - - // 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); @@ -128,25 +144,25 @@ public class SaveWebpageImage extends AsyncTask { // `onPostExecute()` operates on the UI thread. @Override protected void onPostExecute(String fileCreationDisposition) { - // Get a handle for the activity. + // Get handles for the weak references. Activity activity = activityWeakReference.get(); + NestedScrollWebView nestedScrollWebView = nestedScrollWebViewWeakReference.get(); // Abort if the activity is gone. if ((activity == null) || activity.isFinishing()) { return; } - // Get a handle for the no swipe view pager. - NoSwipeViewPager noSwipeViewPager = activity.findViewById(R.id.webviewpager); - // Dismiss the saving image snackbar. savingImageSnackbar.dismiss(); // Display a file creation disposition snackbar. if (fileCreationDisposition.equals(SUCCESS)) { - Snackbar.make(noSwipeViewPager, R.string.image_saved, Snackbar.LENGTH_SHORT).show(); + // Display the image saved snackbar. + Snackbar.make(nestedScrollWebView, activity.getString(R.string.saved, fileNameString), Snackbar.LENGTH_SHORT).show(); } else { - Snackbar.make(noSwipeViewPager, activity.getString(R.string.error_saving_image) + " " + fileCreationDisposition, Snackbar.LENGTH_INDEFINITE).show(); + // Display the file saving error. + Snackbar.make(nestedScrollWebView, activity.getString(R.string.error_saving_file, fileNameString, fileCreationDisposition), Snackbar.LENGTH_INDEFINITE).show(); } } -} \ No newline at end of file +}