X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fasynctasks%2FSaveUrl.java;h=ad200216751887d0004e67dcab866f6505804918;hp=3d63545983e7c9b4b679ba61599e880810ce90af;hb=1003c7842a01f338c8aaf9d4f07216111f294202;hpb=ad779ddf7db19cfb9de2f727d1a772850e161acb

diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java
index 3d635459..ad200216 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java
@@ -20,7 +20,7 @@
 package com.stoutner.privacybrowser.asynctasks;
 
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -28,6 +28,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.view.View;
 import android.webkit.CookieManager;
+import android.webkit.MimeTypeMap;
 
 import androidx.core.content.FileProvider;
 
@@ -39,7 +40,6 @@ import com.stoutner.privacybrowser.views.NoSwipeViewPager;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.ref.WeakReference;
@@ -49,7 +49,7 @@ import java.net.URL;
 import java.text.NumberFormat;
 
 public class SaveUrl extends AsyncTask<String, Long, String> {
-    // Define a weak references for the calling context and activity.
+    // Define a weak references.
     private WeakReference<Context> contextWeakReference;
     private WeakReference<Activity> activityWeakReference;
 
@@ -188,18 +188,18 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
                     // Write the contents of the conversion buffer to the output stream.
                     outputStream.write(conversionBufferByteArray, 0, bufferLength);
 
-                    // Increment the downloaded kilobytes counter.
-                    downloadedKilobytesCounter++;
-
                     // Update the file download progress snackbar.
                     if (fileSize == -1) {  // The file size is unknown.
-                        // Convert the downloaded kilobytes counter to a negative number
-                        long downloadedKilobytes = 0 - downloadedKilobytesCounter;
+                        // Negatively update the downloaded kilobytes counter.
+                        downloadedKilobytesCounter = downloadedKilobytesCounter - bufferLength;
 
-                        publishProgress(downloadedKilobytes);
+                        publishProgress(downloadedKilobytesCounter);
                     } else {  // The file size is known.
+                        // Update the downloaded kilobytes counter.
+                        downloadedKilobytesCounter = downloadedKilobytesCounter + bufferLength;
+
                         // Calculate the download percentage.
-                        long downloadPercentage = (downloadedKilobytesCounter * 1024 * 100) / fileSize;
+                        long downloadPercentage = (downloadedKilobytesCounter * 100) / fileSize;
 
                         // Update the download percentage.
                         publishProgress(downloadPercentage);
@@ -212,7 +212,7 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
                 // Close the output stream.
                 outputStream.close();
 
-                // Define a media scanner intent, which adds items like pictures to Android's recent file list.
+                // 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.
@@ -224,7 +224,7 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
                 // Disconnect the HTTP URL connection.
                 httpUrlConnection.disconnect();
             }
-        } catch (IOException exception) {
+        } catch (Exception exception) {
             // Store the error in the save disposition string.
             saveDisposition = exception.toString();
         }
@@ -246,8 +246,8 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
 
         // Check to see if a download percentage has been calculated.
         if (downloadPercentage[0] < 0) {  // There is no download percentage.  The negative number represents the raw downloaded kilobytes.
-            // Calculate the number of bytes downloaded.
-            long numberOfBytesDownloaded = (0 - downloadPercentage[0]) * 1024;
+            // Calculate the number of bytes downloaded.  When the `downloadPercentage` is negative, it is actually the raw number of kilobytes downloaded.
+            long numberOfBytesDownloaded = - downloadPercentage[0];
 
             // Format the number of bytes downloaded.
             String formattedNumberOfBytesDownloaded = NumberFormat.getInstance().format(numberOfBytesDownloaded);
@@ -285,27 +285,38 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
 
             // Add an open action if the file is not an APK on API >= 26 (that scenario requires the REQUEST_INSTALL_PACKAGES permission).
             if (!(Build.VERSION.SDK_INT >= 26 && filePathString.endsWith(".apk"))) {
-                fileSavedSnackbar.setAction(R.string.open, (View v) -> {
+                fileSavedSnackbar.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);
 
-                    // Set the URI but not the MIME type.  This should open all available apps.
-                    openIntent.setData(FileProvider.getUriForFile(context, activity.getString(R.string.file_provider), file));
+                    // Set the URI and the MIME type.
+                    if (filePathString.endsWith("apk") || filePathString.endsWith("APK")) {  // Force detection of APKs.
+                        openIntent.setDataAndType(fileUri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"));
+                    } else {  // 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);
 
-                    // Try the intent.
-                    try {
-                        // Show the chooser.
-                        activity.startActivity(openIntent);
-                    } catch (ActivityNotFoundException exception) {  // There are no apps available to open the URL.
-                        // Show a snackbar with the error.
-                        Snackbar.make(noSwipeViewPager, activity.getString(R.string.error) + "  " + exception, Snackbar.LENGTH_INDEFINITE).show();
-                    }
+                    // Show the chooser.
+                    activity.startActivity(Intent.createChooser(openIntent, context.getString(R.string.open)));
                 });
             }