]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java
Fix download percentage calculations. https://redmine.stoutner.com/issues/539
[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / asynctasks / SaveUrl.java
index def7babd913b4032787ff5e1c9777d46bce7c329..e6b811500726162066086320c13053c9869950b5 100644 (file)
 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;
 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;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.stoutner.privacybrowser.R;
@@ -84,7 +91,7 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
         NoSwipeViewPager noSwipeViewPager = activity.findViewById(R.id.webviewpager);
 
         // Create a saving file snackbar.
-        savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + " " + filePathString, Snackbar.LENGTH_INDEFINITE);
+        savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + "  0% - " + filePathString, Snackbar.LENGTH_INDEFINITE);
 
         // Display the saving file snackbar.
         savingFileSnackbar.show();
@@ -92,7 +99,7 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
 
     @Override
     protected String doInBackground(String... urlToSave) {
-        // Get a handle for the context and activity.
+        // Get handles for the context and activity.
         Context context = contextWeakReference.get();
         Activity activity = activityWeakReference.get();
 
@@ -183,18 +190,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);
@@ -241,24 +248,25 @@ 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 = 0 - downloadPercentage[0];
 
             // Format the number of bytes downloaded.
             String formattedNumberOfBytesDownloaded = NumberFormat.getInstance().format(numberOfBytesDownloaded);
 
             // Update the snackbar.
-            savingFileSnackbar.setText(activity.getString(R.string.saving_file) + ":  " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " - " + filePathString);
+            savingFileSnackbar.setText(activity.getString(R.string.saving_file) + "  " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " - " + filePathString);
         } else {  // There is a download percentage.
             // Update the snackbar.
-            savingFileSnackbar.setText(activity.getString(R.string.saving_file) + ":  " + downloadPercentage[0] + "% - " + filePathString);
+            savingFileSnackbar.setText(activity.getString(R.string.saving_file) + "  " + downloadPercentage[0] + "% - " + filePathString);
         }
     }
 
     // `onPostExecute()` operates on the UI thread.
     @Override
     protected void onPostExecute(String saveDisposition) {
-        // Get a handle for the activity.
+        // Get handles for the context and activity.
+        Context context = contextWeakReference.get();
         Activity activity = activityWeakReference.get();
 
         // Abort if the activity is gone.
@@ -274,8 +282,56 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
 
         // Display a save disposition snackbar.
         if (saveDisposition.equals(SUCCESS)) {
-            Snackbar.make(noSwipeViewPager, R.string.file_saved, Snackbar.LENGTH_SHORT).show();
+            // Create a file saved snackbar.
+            Snackbar fileSavedSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + "  " + filePathString, Snackbar.LENGTH_LONG);
+
+            // 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) -> {
+                    // Get a file for the file path string.
+                    File file = new File(filePathString);
+
+                    // Define 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 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 file saved snackbar.
+            fileSavedSnackbar.show();
         } else {
+            // Display the file saving error.
             Snackbar.make(noSwipeViewPager, activity.getString(R.string.error_saving_file) + "  " + saveDisposition, Snackbar.LENGTH_INDEFINITE).show();
         }
     }