Add share, copy, and save options to About > Version. 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 aeb92988e93f52aedfe2b573cc15d77c3922ace6..65463f35ed1b4521d67ff76d14ff13067a985a2b 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 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2019-2020 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,44 +20,57 @@
 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.graphics.Bitmap;
 import android.graphics.Canvas;

+import android.net.Uri;

 import android.os.AsyncTask;
 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.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.views.NestedScrollWebView;
 
 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.lang.ref.WeakReference;
 
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.lang.ref.WeakReference;
 

-public class SaveWebpageImage extends AsyncTask<String, Void, String> {
-    // Define the weak references.
+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 WeakReference<Activity> activityWeakReference;
     private WeakReference<NestedScrollWebView> nestedScrollWebViewWeakReference;
 

-    // Define a success string constant.
+    // Declare the class constants.

     private final String SUCCESS = "Success";
 
     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 Snackbar savingImageSnackbar;
     private Bitmap webpageBitmap;

+    private String filePathString;

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

-    public SaveWebpageImage(Activity activity, NestedScrollWebView nestedScrollWebView) {
+    public SaveWebpageImage(Context context, 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);

+
+        // Populate the class variables.
+        this.filePathString = filePathString;

     }
 
     // `onPreExecute()` operates on the UI thread.
     @Override
     protected void onPreExecute() {
     }
 
     // `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();
 
         Activity activity = activityWeakReference.get();
         NestedScrollWebView nestedScrollWebView = nestedScrollWebViewWeakReference.get();
 


@@ -67,7 +80,7 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
         }
 
         // Create a saving image snackbar.
         }
 
         // 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();
 
         // Display the saving image snackbar.
         savingImageSnackbar.show();


@@ -83,7 +96,7 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
     }
 
     @Override
     }
 
     @Override

-    protected String doInBackground(String... fileName) {
+    protected String doInBackground(Void... Void) {

         // Get a handle for the activity.
         Activity activity = activityWeakReference.get();
 
         // Get a handle for the activity.
         Activity activity = activityWeakReference.get();
 


@@ -95,11 +108,11 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
         // Create a webpage PNG byte array output stream.
         ByteArrayOutputStream webpageByteArrayOutputStream = new ByteArrayOutputStream();
 
         // 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.
         webpageBitmap.compress(Bitmap.CompressFormat.PNG, 0, webpageByteArrayOutputStream);
 
         // Get a file for the image.

-        File imageFile = new File(fileName[0]);
+        File imageFile = new File(filePathString);

 
         // Delete the current file if it exists.
         if (imageFile.exists()) {
 
         // Delete the current file if it exists.
         if (imageFile.exists()) {


@@ -116,6 +129,15 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
 
             // 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();


@@ -128,25 +150,60 @@ public class SaveWebpageImage extends AsyncTask<String, Void, String> {
     // `onPostExecute()` operates on the UI thread.
     @Override
     protected void onPostExecute(String fileCreationDisposition) {
     // `onPostExecute()` operates on the UI thread.
     @Override
     protected void onPostExecute(String fileCreationDisposition) {

-        // Get a handle for the activity.
+        // Get handles for the weak references.
+        Context context = contextWeakReference.get();

         Activity activity = activityWeakReference.get();
         Activity activity = activityWeakReference.get();

+        NestedScrollWebView nestedScrollWebView = nestedScrollWebViewWeakReference.get();

 
         // Abort if the activity is gone.
         if ((activity == null) || activity.isFinishing()) {
             return;
         }
 
 
         // 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)) {
         // 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();
+            // 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();

         } else {
         } 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
         }
     }
 }
\ No newline at end of file