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=27acbc5c6bcf015ebc447d6393d967c2cb7ba7e0;hp=aeb92988e93f52aedfe2b573cc15d77c3922ace6;hb=d4f39c36beb5e6c3568a1e075274ad66defd8e8e;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..27acbc5c 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2019-2021 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -22,42 +22,45 @@ package com.stoutner.privacybrowser.asynctasks;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.net.Uri;
 import android.os.AsyncTask;
 
 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<String, Void, String> {
-    // Define the weak references.
-    private WeakReference<Activity> activityWeakReference;
-    private WeakReference<NestedScrollWebView> nestedScrollWebViewWeakReference;
+public class SaveWebpageImage extends AsyncTask<Void, Void, String> {
+    // Declare the weak references.
+    private final WeakReference<Activity> activityWeakReference;
+    private final WeakReference<NestedScrollWebView> 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 String filePathString;
 
     // The public constructor.
-    public SaveWebpageImage(Activity activity, NestedScrollWebView nestedScrollWebView) {
+    public SaveWebpageImage(Activity activity, String filePathString, NestedScrollWebView nestedScrollWebView) {
         // Populate the weak references.
         activityWeakReference = new WeakReference<>(activity);
         nestedScrollWebViewWeakReference = new WeakReference<>(nestedScrollWebView);
+
+        // Populate the class variables.
+        this.filePathString = filePathString;
     }
 
     // `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 +70,7 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
         }
 
         // 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) + "  " + filePathString, Snackbar.LENGTH_INDEFINITE);
 
         // Display the saving image snackbar.
         savingImageSnackbar.show();
@@ -83,7 +86,7 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
     }
 
     @Override
-    protected String doInBackground(String... fileName) {
+    protected String doInBackground(Void... Void) {
         // Get a handle for the activity.
         Activity activity = activityWeakReference.get();
 
@@ -95,24 +98,15 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
         // 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(Uri.parse(filePathString));
 
             // Write the webpage image to the image file.
             webpageByteArrayOutputStream.writeTo(imageFileOutputStream);
@@ -128,25 +122,25 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
     // `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 file saved snackbar.
+            Snackbar.make(nestedScrollWebView, activity.getString(R.string.file_saved) + "  " + filePathString, 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) + "  " + fileCreationDisposition, Snackbar.LENGTH_INDEFINITE).show();
         }
     }
 }
\ No newline at end of file