Update the download snackbars to be more descriptive. https://redmine.stoutner.com...
authorSoren Stoutner <soren@stoutner.com>
Sat, 27 Mar 2021 00:43:04 +0000 (17:43 -0700)
committerSoren Stoutner <soren@stoutner.com>
Sat, 27 Mar 2021 00:43:04 +0000 (17:43 -0700)
app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java
app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java
app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java
app/src/main/res/values-de/strings.xml
app/src/main/res/values-es/strings.xml
app/src/main/res/values-fr/strings.xml
app/src/main/res/values-it/strings.xml
app/src/main/res/values-pt-rBR/strings.xml
app/src/main/res/values-ru/strings.xml
app/src/main/res/values/strings.xml

index de4ec4779fb45350bbb5a971260a376fa07acdb8..1d000e381e36697ff3778a8d77371e1e93f55d98 100644 (file)
@@ -47,11 +47,11 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.FileProvider;
 import androidx.appcompat.widget.Toolbar;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.FileProvider;
-import androidx.multidex.BuildConfig;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.textfield.TextInputLayout;
 
 
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.textfield.TextInputLayout;
 
+import com.stoutner.privacybrowser.BuildConfig;
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.helpers.ImportExportDatabaseHelper;
 
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.helpers.ImportExportDatabaseHelper;
 
index 8956296d12bee513b6e4ef534216eaad04121694..7d981c0f324a554cded0809515aca0c578a8fdbd 100644 (file)
@@ -53,6 +53,9 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
     private final String userAgent;
     private final boolean cookiesEnabled;
     private Snackbar savingFileSnackbar;
     private final String userAgent;
     private final boolean cookiesEnabled;
     private Snackbar savingFileSnackbar;
+    private long fileSize;
+    private String formattedFileSize;
+    private String urlString = "";
 
     // The public constructor.
     public SaveUrl(Context context, Activity activity, String filePathString, String userAgent, boolean cookiesEnabled) {
 
     // The public constructor.
     public SaveUrl(Context context, Activity activity, String filePathString, String userAgent, boolean cookiesEnabled) {
@@ -81,7 +84,7 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
         NoSwipeViewPager noSwipeViewPager = activity.findViewById(R.id.webviewpager);
 
         // Create a saving file snackbar.
         NoSwipeViewPager noSwipeViewPager = activity.findViewById(R.id.webviewpager);
 
         // Create a saving file snackbar.
-        savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + "  0% - " + filePathString, Snackbar.LENGTH_INDEFINITE);
+        savingFileSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.saving_file) + "  0%  -  " + urlString, Snackbar.LENGTH_INDEFINITE);
 
         // Display the saving file snackbar.
         savingFileSnackbar.show();
 
         // Display the saving file snackbar.
         savingFileSnackbar.show();
@@ -101,14 +104,17 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
         // Define a save disposition string.
         String saveDisposition = SUCCESS;
 
         // Define a save disposition string.
         String saveDisposition = SUCCESS;
 
+        // Get the URL string.
+        urlString = urlToSave[0];
+
         try {
             // Open an output stream.
             OutputStream outputStream = activity.getContentResolver().openOutputStream(Uri.parse(filePathString));
 
             // Save the URL.
         try {
             // Open an output stream.
             OutputStream outputStream = activity.getContentResolver().openOutputStream(Uri.parse(filePathString));
 
             // Save the URL.
-            if (urlToSave[0].startsWith("data:")) {  // The URL contains the entire data of an image.
+            if (urlString.startsWith("data:")) {  // The URL contains the entire data of an image.
                 // Get the Base64 data, which begins after a `,`.
                 // Get the Base64 data, which begins after a `,`.
-                String base64DataString = urlToSave[0].substring(urlToSave[0].indexOf(",") + 1);
+                String base64DataString = urlString.substring(urlString.indexOf(",") + 1);
 
                 // Decode the Base64 string to a byte array.
                 byte[] base64DecodedDataByteArray = Base64.decode(base64DataString, Base64.DEFAULT);
 
                 // Decode the Base64 string to a byte array.
                 byte[] base64DecodedDataByteArray = Base64.decode(base64DataString, Base64.DEFAULT);
@@ -117,7 +123,7 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
                 outputStream.write(base64DecodedDataByteArray);
             } else {  // The URL points to the data location on the internet.
                 // Get the URL from the calling activity.
                 outputStream.write(base64DecodedDataByteArray);
             } else {  // The URL points to the data location on the internet.
                 // Get the URL from the calling activity.
-                URL url = new URL(urlToSave[0]);
+                URL url = new URL(urlString);
 
                 // Instantiate the proxy helper.
                 ProxyHelper proxyHelper = new ProxyHelper();
 
                 // Instantiate the proxy helper.
                 ProxyHelper proxyHelper = new ProxyHelper();
@@ -148,13 +154,13 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
                     // Get the content length header, which causes the connection to the server to be made.
                     String contentLengthString = httpUrlConnection.getHeaderField("Content-Length");
 
                     // Get the content length header, which causes the connection to the server to be made.
                     String contentLengthString = httpUrlConnection.getHeaderField("Content-Length");
 
-                    // Define the file size long.
-                    long fileSize;
-
                     // Make sure the content length isn't null.
                     if (contentLengthString != null) {  // The content length isn't null.
                         // Convert the content length to an long.
                         fileSize = Long.parseLong(contentLengthString);
                     // Make sure the content length isn't null.
                     if (contentLengthString != null) {  // The content length isn't null.
                         // Convert the content length to an long.
                         fileSize = Long.parseLong(contentLengthString);
+
+                        // Format the file size for display.
+                        formattedFileSize = NumberFormat.getInstance().format(fileSize);
                     } else {  // The content length is null.
                         // Set the file size to be `-1`.
                         fileSize = -1;
                     } else {  // The content length is null.
                         // Set the file size to be `-1`.
                         fileSize = -1;
@@ -177,22 +183,11 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
                         // Write the contents of the conversion buffer to the file output stream.
                         outputStream.write(conversionBufferByteArray, 0, bufferLength);
 
                         // Write the contents of the conversion buffer to the file output stream.
                         outputStream.write(conversionBufferByteArray, 0, bufferLength);
 
-                        // Update the file download progress snackbar.
-                        if (fileSize == -1) {  // The file size is unknown.
-                            // Negatively update the downloaded kilobytes counter.
-                            downloadedKilobytesCounter = downloadedKilobytesCounter - bufferLength;
-
-                            publishProgress(downloadedKilobytesCounter);
-                        } else {  // The file size is known.
-                            // Update the downloaded kilobytes counter.
-                            downloadedKilobytesCounter = downloadedKilobytesCounter + bufferLength;
+                        // Update the downloaded kilobytes counter.
+                        downloadedKilobytesCounter = downloadedKilobytesCounter + bufferLength;
 
 
-                            // Calculate the download percentage.
-                            long downloadPercentage = (downloadedKilobytesCounter * 100) / fileSize;
-
-                            // Update the download percentage.
-                            publishProgress(downloadPercentage);
-                        }
+                        // Update the file download progress snackbar.
+                        publishProgress(downloadedKilobytesCounter);
                     }
 
                     // Close the input stream.
                     }
 
                     // Close the input stream.
@@ -219,7 +214,7 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
 
     // `onProgressUpdate()` operates on the UI thread.
     @Override
 
     // `onProgressUpdate()` operates on the UI thread.
     @Override
-    protected void onProgressUpdate(Long... downloadPercentage) {
+    protected void onProgressUpdate(Long... numberOfBytesDownloaded) {
         // Get a handle for the activity.
         Activity activity = activityWeakReference.get();
 
         // Get a handle for the activity.
         Activity activity = activityWeakReference.get();
 
@@ -228,19 +223,20 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
             return;
         }
 
             return;
         }
 
-        // 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.  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);
+        // Format the number of bytes downloaded.
+        String formattedNumberOfBytesDownloaded = NumberFormat.getInstance().format(numberOfBytesDownloaded[0]);
 
 
+        // Check to see if the file size is known.
+        if (fileSize == -1) {  // The size of the download file is not known.
             // Update the snackbar.
             // Update the snackbar.
-            savingFileSnackbar.setText(activity.getString(R.string.saving_file) + "  " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " - " + filePathString);
-        } else {  // There is a download percentage.
+            savingFileSnackbar.setText(activity.getString(R.string.saving_file) + "  " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + "  -  " + urlString);
+        } else {  // The size of the download file is known.
+            // Calculate the download percentage.
+            long downloadPercentage = (numberOfBytesDownloaded[0] * 100) / fileSize;
+
             // Update the snackbar.
             // Update the snackbar.
-            savingFileSnackbar.setText(activity.getString(R.string.saving_file) + "  " + downloadPercentage[0] + "% - " + filePathString);
+            savingFileSnackbar.setText(activity.getString(R.string.saving_file) + "  " + downloadPercentage + "%  -  " + formattedNumberOfBytesDownloaded + " " + activity.getString(R.string.bytes) + " / " + formattedFileSize + " " +
+                    activity.getString(R.string.bytes) + "  -  " + urlString);
         }
     }
 
         }
     }
 
@@ -264,7 +260,7 @@ public class SaveUrl extends AsyncTask<String, Long, String> {
         // Display a save disposition snackbar.
         if (saveDisposition.equals(SUCCESS)) {
             // Display the file saved snackbar.
         // Display a save disposition snackbar.
         if (saveDisposition.equals(SUCCESS)) {
             // Display the file saved snackbar.
-            Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + "  " + filePathString, Snackbar.LENGTH_LONG).show();
+            Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + "  " + urlString, Snackbar.LENGTH_LONG).show();
         } else {
             // Display the file saving error.
             Snackbar.make(noSwipeViewPager, activity.getString(R.string.error_saving_file) + "  " + saveDisposition, Snackbar.LENGTH_INDEFINITE).show();
         } else {
             // Display the file saving error.
             Snackbar.make(noSwipeViewPager, activity.getString(R.string.error_saving_file) + "  " + saveDisposition, Snackbar.LENGTH_INDEFINITE).show();
index 27acbc5c6bcf015ebc447d6393d967c2cb7ba7e0..e44f5e6d028535425223f28bb632b01bff0e4ed4 100644 (file)
@@ -70,7 +70,7 @@ public class SaveWebpageImage extends AsyncTask<Void, Void, String> {
         }
 
         // Create a saving image snackbar.
         }
 
         // Create a saving image snackbar.
-        savingImageSnackbar = Snackbar.make(nestedScrollWebView, activity.getString(R.string.processing_image) + "  " + filePathString, Snackbar.LENGTH_INDEFINITE);
+        savingImageSnackbar = Snackbar.make(nestedScrollWebView, activity.getString(R.string.processing_image) + "  " + nestedScrollWebView.getCurrentUrl(), Snackbar.LENGTH_INDEFINITE);
 
         // Display the saving image snackbar.
         savingImageSnackbar.show();
 
         // Display the saving image snackbar.
         savingImageSnackbar.show();
@@ -136,8 +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)) {
-            // Display the file saved snackbar.
-            Snackbar.make(nestedScrollWebView, activity.getString(R.string.file_saved) + "  " + filePathString, Snackbar.LENGTH_SHORT).show();
+            // Display the image saved snackbar.
+            Snackbar.make(nestedScrollWebView, activity.getString(R.string.image_saved) + "  " + nestedScrollWebView.getCurrentUrl(), 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();
index 1d46306e60d719da9f738b0a896c1c6c68cb331b..e55fb9f1bf451cc54abae18d4774e67815ae8368 100644 (file)
     <string name="unknown_size">Unbekannte Größe</string>
     <string name="invalid_url">Ungültige URL</string>
     <string name="saving_file">Speichere Datei:</string>
     <string name="unknown_size">Unbekannte Größe</string>
     <string name="invalid_url">Ungültige URL</string>
     <string name="saving_file">Speichere Datei:</string>
-    <string name="processing_image">Bild wird bearbeitet… :</string>
     <string name="file_saved">Datei gespeichert:</string>
     <string name="file_saved">Datei gespeichert:</string>
+    <string name="processing_image">Bild wird bearbeitet… :</string>
     <string name="error_saving_file">Fehler beim Speichern der Datei:</string>
 
     <!-- View Source. -->
     <string name="error_saving_file">Fehler beim Speichern der Datei:</string>
 
     <!-- View Source. -->
index f7d81ad646a4d651a1bd361d68ea58771fef51b1..eb52a899912f2a4caf86087ec4fa9dcb8cf58203 100644 (file)
     <string name="unknown_size">Tamaño desconocido</string>
     <string name="invalid_url">URL inválida</string>
     <string name="saving_file">Guardando archivo:</string>
     <string name="unknown_size">Tamaño desconocido</string>
     <string name="invalid_url">URL inválida</string>
     <string name="saving_file">Guardando archivo:</string>
-    <string name="processing_image">Procesando imagen… :</string>
     <string name="file_saved">Archivo guardado:</string>
     <string name="file_saved">Archivo guardado:</string>
+    <string name="processing_image">Procesando imagen… :</string>
     <string name="error_saving_file">Error guardando archivo:</string>
 
     <!-- View Source. -->
     <string name="error_saving_file">Error guardando archivo:</string>
 
     <!-- View Source. -->
index 00fe33f6c385b810c831dd1c42c543ed22509615..662b2f7d1f9b48a57b9775c68430cf3b6890f2f0 100644 (file)
     <string name="unknown_size">taille inconnue</string>
     <string name="invalid_url">URL invalide</string>
     <string name="saving_file">Enregistrement du fichier:</string>
     <string name="unknown_size">taille inconnue</string>
     <string name="invalid_url">URL invalide</string>
     <string name="saving_file">Enregistrement du fichier:</string>
-    <string name="processing_image">Traitement de l\'image… :</string>
     <string name="file_saved">Fichier enregistré:</string>
     <string name="file_saved">Fichier enregistré:</string>
+    <string name="processing_image">Traitement de l\'image… :</string>
     <string name="error_saving_file">Erreur lors de l\'enregistrement du fichier:</string>
 
     <!-- View Source. -->
     <string name="error_saving_file">Erreur lors de l\'enregistrement du fichier:</string>
 
     <!-- View Source. -->
index 9e8a8cf07e397c96892acdf42e49f6f047132661..72be41e97dd9e47e7bbdd218331c984d2556b28d 100644 (file)
     <string name="unknown_size">Dimensione sconosciuta</string>
     <string name="invalid_url">URL non valida</string>
     <string name="saving_file">Salvataggio file:</string>
     <string name="unknown_size">Dimensione sconosciuta</string>
     <string name="invalid_url">URL non valida</string>
     <string name="saving_file">Salvataggio file:</string>
-    <string name="processing_image">Creazione immagine… :</string>
     <string name="file_saved">File salvato:</string>
     <string name="file_saved">File salvato:</string>
+    <string name="processing_image">Creazione immagine… :</string>
     <string name="error_saving_file">Errore salvataggio file:</string>
 
     <!-- View Source. -->
     <string name="error_saving_file">Errore salvataggio file:</string>
 
     <!-- View Source. -->
index 6660cdd99ada983089f01719cdbeb25f634cc4ee..378d0857018971948cdca4fb36d84a179301e7c1 100644 (file)
     <string name="unknown_size">tamanho desconhecido</string>
     <string name="invalid_url">URL inválida</string>
     <string name="saving_file">Salvando file:</string>
     <string name="unknown_size">tamanho desconhecido</string>
     <string name="invalid_url">URL inválida</string>
     <string name="saving_file">Salvando file:</string>
-    <string name="processing_image">Processando imagem… :</string>
     <string name="file_saved">Arquivo Salvo:</string>
     <string name="file_saved">Arquivo Salvo:</string>
+    <string name="processing_image">Processando imagem… :</string>
     <string name="error_saving_file">Erro ao salvar o arquivo:</string>
 
     <!-- View Source. -->
     <string name="error_saving_file">Erro ao salvar o arquivo:</string>
 
     <!-- View Source. -->
index 2c993d3027c267224a262bf3eb9d9a6a85b3dfba..dbf51be9da0deed40d3b8183fcf56ac16c9921dd 100644 (file)
     <string name="unknown_size">неизвестный размер</string>
     <string name="invalid_url">неправильный URL</string>
     <string name="saving_file">Сохранение файла:</string>
     <string name="unknown_size">неизвестный размер</string>
     <string name="invalid_url">неправильный URL</string>
     <string name="saving_file">Сохранение файла:</string>
-    <string name="processing_image">Обработка изображения… :</string>
     <string name="file_saved">Файл сохранен:</string>
     <string name="file_saved">Файл сохранен:</string>
+    <string name="processing_image">Обработка изображения… :</string>
     <string name="error_saving_file">Ошибка сохранения файла:</string>
 
     <!-- View Source. -->
     <string name="error_saving_file">Ошибка сохранения файла:</string>
 
     <!-- View Source. -->
index c92e65f45c7fbccd66305e4e4f79d2b0f7fcd7aa..4ff162895e4a02341ccc098f61e4f1e57438177f 100644 (file)
     <string name="unknown_size">unknown size</string>
     <string name="invalid_url">invalid URL</string>
     <string name="saving_file">Saving file:</string>
     <string name="unknown_size">unknown size</string>
     <string name="invalid_url">invalid URL</string>
     <string name="saving_file">Saving file:</string>
-    <string name="processing_image">Processing image… :</string>
     <string name="file_saved">File saved:</string>
     <string name="file_saved">File saved:</string>
+    <string name="processing_image">Processing image… :</string>
+    <string name="image_saved">Image saved:</string>
     <string name="error_saving_file">Error saving file:</string>
 
     <!-- View Source. -->
     <string name="error_saving_file">Error saving file:</string>
 
     <!-- View Source. -->