Redesign file access to work with the scoped storage. https://redmine.stoutner.com...

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / asynctasks / SaveWebpageImage.java

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 65463f35ed1b4521d67ff76d14ff13067a985a2b..27acbc5c6bcf015ebc447d6393d967c2cb7ba7e0 100644 (file)
--- 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-2020 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>.
  *
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *


@@ -20,17 +20,10 @@
 package com.stoutner.privacybrowser.asynctasks;
 
 import android.app.Activity;
 package com.stoutner.privacybrowser.asynctasks;
 
 import android.app.Activity;

-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;

 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.net.Uri;
 import android.os.AsyncTask;
 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 com.google.android.material.snackbar.Snackbar;
 
 
 import com.google.android.material.snackbar.Snackbar;
 


@@ -38,15 +31,13 @@ import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.views.NestedScrollWebView;
 
 import java.io.ByteArrayOutputStream;
 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<Void, Void, String> {
     // Declare the weak references.
 import java.lang.ref.WeakReference;
 
 public class SaveWebpageImage extends AsyncTask<Void, Void, String> {
     // Declare the weak references.

-    private WeakReference<Context> contextWeakReference;
-    private WeakReference<Activity> activityWeakReference;
-    private WeakReference<NestedScrollWebView> nestedScrollWebViewWeakReference;
+    private final WeakReference<Activity> activityWeakReference;
+    private final WeakReference<NestedScrollWebView> nestedScrollWebViewWeakReference;

 
     // Declare the class constants.
     private final String SUCCESS = "Success";
 
     // Declare the class constants.
     private final String SUCCESS = "Success";


@@ -54,12 +45,11 @@ public class SaveWebpageImage extends AsyncTask<Void, Void, String> {
     // Declare the class variables.
     private Snackbar savingImageSnackbar;
     private Bitmap webpageBitmap;
     // Declare the class variables.
     private Snackbar savingImageSnackbar;
     private Bitmap webpageBitmap;

-    private String filePathString;
+    private final String filePathString;

 
     // The public constructor.
 
     // The public constructor.

-    public SaveWebpageImage(Context context, Activity activity, String filePathString, NestedScrollWebView nestedScrollWebView) {
+    public SaveWebpageImage(Activity activity, String filePathString, NestedScrollWebView nestedScrollWebView) {

         // Populate the weak references.
         // Populate the weak references.

-        contextWeakReference = new WeakReference<>(context);

         activityWeakReference = new WeakReference<>(activity);
         nestedScrollWebViewWeakReference = new WeakReference<>(nestedScrollWebView);
 
         activityWeakReference = new WeakReference<>(activity);
         nestedScrollWebViewWeakReference = new WeakReference<>(nestedScrollWebView);
 


@@ -111,33 +101,15 @@ public class SaveWebpageImage extends AsyncTask<Void, Void, String> {
         // 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);
 
         // 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.
         // 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);
 
             // 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();
         } catch (Exception exception) {
             // Store the error in the file creation disposition string.
             fileCreationDisposition = exception.toString();


@@ -151,7 +123,6 @@ public class SaveWebpageImage extends AsyncTask<Void, Void, String> {
     @Override
     protected void onPostExecute(String fileCreationDisposition) {
         // Get handles for the weak references.
     @Override
     protected void onPostExecute(String fileCreationDisposition) {
         // Get handles for the weak references.

-        Context context = contextWeakReference.get();

         Activity activity = activityWeakReference.get();
         NestedScrollWebView nestedScrollWebView = nestedScrollWebViewWeakReference.get();
 
         Activity activity = activityWeakReference.get();
         NestedScrollWebView nestedScrollWebView = nestedScrollWebViewWeakReference.get();
 


@@ -165,42 +136,8 @@ public class SaveWebpageImage extends AsyncTask<Void, Void, String> {
 
         // Display a file creation disposition snackbar.
         if (fileCreationDisposition.equals(SUCCESS)) {
 
         // 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 file saved snackbar.
+            Snackbar.make(nestedScrollWebView, activity.getString(R.string.file_saved) + "  " + filePathString, 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();
         } else {
             // Display the file saving error.
             Snackbar.make(nestedScrollWebView, activity.getString(R.string.error_saving_file) + "  " + fileCreationDisposition, Snackbar.LENGTH_INDEFINITE).show();