X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fasynctasks%2FPrepareSaveDialog.java;h=b869099d4d65b5cce1f5079c0fb5d6347e2048ed;hp=28c3e65606f366cb5d8121785100ceef4333469d;hb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;hpb=6ea3e4ebd779594b45ad8f51cc40761bb6d89030 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 28c3e656..b869099d 100644 --- 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 . + * Copyright © 2020-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.asynctasks; @@ -32,7 +32,7 @@ import androidx.fragment.app.FragmentManager; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.dataclasses.PendingDialog; -import com.stoutner.privacybrowser.dialogs.SaveWebpageDialog; +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 { private final WeakReference 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,7 +88,7 @@ public class PrepareSaveDialog extends AsyncTask { // 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 `,`. @@ -201,7 +199,7 @@ public class PrepareSaveDialog extends AsyncTask { } // 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 {