Update the URL in the copyright header. https://redmine.stoutner.com/issues/796

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PrepareSaveDialog.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PrepareSaveDialog.java
index 93bd110e7d5ad5edb4d8a1a23f9adf9f0b58cef1..b869099d4d65b5cce1f5079c0fb5d6347e2048ed 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PrepareSaveDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PrepareSaveDialog.java
@@ -1,20 +1,20 @@
 /*
- * Copyright © 2020-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2020-2022 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 Android <https://www.stoutner.com/privacy-browser-android>.
  *
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.stoutner.privacybrowser.asynctasks;
@@ -31,8 +31,8 @@ import androidx.fragment.app.FragmentManager;
 
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.activities.MainWebViewActivity;
-import com.stoutner.privacybrowser.definitions.PendingDialog;
-import com.stoutner.privacybrowser.dialogs.SaveWebpageDialog;
+import com.stoutner.privacybrowser.dataclasses.PendingDialog;
+import com.stoutner.privacybrowser.dialogs.SaveDialog;
 import com.stoutner.privacybrowser.helpers.ProxyHelper;
 
 import java.lang.ref.WeakReference;
@@ -48,20 +48,18 @@ public class PrepareSaveDialog extends AsyncTask<String, Void, String[]> {
     private final WeakReference<FragmentManager> fragmentManagerWeakReference;
 
     // Define the class variables.
-    private final int saveType;
     private final String userAgent;
     private final boolean cookiesEnabled;
     private String urlString;
 
     // The public constructor.
-    public PrepareSaveDialog(Activity activity, Context context, FragmentManager fragmentManager, int saveType, String userAgent, boolean cookiesEnabled) {
+    public PrepareSaveDialog(Activity activity, Context context, FragmentManager fragmentManager, String userAgent, boolean cookiesEnabled) {
         // Populate the weak references.
         activityWeakReference = new WeakReference<>(activity);
         contextWeakReference = new WeakReference<>(context);
         fragmentManagerWeakReference = new WeakReference<>(fragmentManager);
 
         // Store the class variables.
-        this.saveType = saveType;
         this.userAgent = userAgent;
         this.cookiesEnabled = cookiesEnabled;
     }
@@ -90,14 +88,14 @@ public class PrepareSaveDialog extends AsyncTask<String, Void, String[]> {
             // Remove `data:` from the beginning of the URL.
             String urlWithoutData = urlString.substring(5);
 
-            // Get the URL MIME type, which end with a `;`.
+            // Get the URL MIME type, which ends with a `;`.
             String urlMimeType = urlWithoutData.substring(0, urlWithoutData.indexOf(";"));
 
             // Get the Base64 data, which begins after a `,`.
             String base64DataString = urlWithoutData.substring(urlWithoutData.indexOf(",") + 1);
 
             // Calculate the file size of the data URL.  Each Base64 character represents 6 bits.
-            formattedFileSize = NumberFormat.getInstance().format(base64DataString.length() * 3 / 4) + " " + context.getString(R.string.bytes);
+            formattedFileSize = NumberFormat.getInstance().format(base64DataString.length() * 3L / 4) + " " + context.getString(R.string.bytes);
 
             // Set the file name according to the MIME type.
             fileNameString = context.getString(R.string.file) + "." + MimeTypeMap.getSingleton().getExtensionFromMimeType(urlMimeType);
@@ -201,7 +199,7 @@ public class PrepareSaveDialog extends AsyncTask<String, Void, String[]> {
         }
 
         // Instantiate the save dialog.
-        DialogFragment saveDialogFragment = SaveWebpageDialog.saveWebpage(saveType, urlString, fileStringArray[0], fileStringArray[1], userAgent, cookiesEnabled);
+        DialogFragment saveDialogFragment = SaveDialog.saveUrl(urlString, fileStringArray[0], fileStringArray[1], userAgent, cookiesEnabled);
 
         // Try to show the dialog.  Sometimes the window is not active.
         try {