X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveDialog.kt;h=2f7868e93817fad2e92c15f8114ac2584b007307;hb=96fd2b4338ea6dd9520605b2ef290e38ef044f1f;hp=f681e8df1b66e401b4faccaeb12554464d6b5b54;hpb=e9c77e79c3c6f7612f051b7c111e029ad125817b;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt index f681e8df..2f7868e9 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt @@ -1,20 +1,20 @@ /* - * Copyright © 2019-2021 Soren Stoutner . + * Copyright 2019-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.dialogs @@ -22,7 +22,6 @@ package com.stoutner.privacybrowser.dialogs import android.app.Dialog import android.content.Context import android.content.DialogInterface -import android.os.AsyncTask import android.os.Bundle import android.text.Editable import android.text.InputType @@ -36,7 +35,12 @@ import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R -import com.stoutner.privacybrowser.asynctasks.GetUrlSize +import com.stoutner.privacybrowser.helpers.UrlHelper + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext // Define the class constants. private const val URL_STRING = "url_string" @@ -49,9 +53,6 @@ class SaveDialog : DialogFragment() { // Declare the class variables. private lateinit var saveListener: SaveListener - // Define the class variables. - private var getUrlSize: AsyncTask<*, *, *>? = null - // The public interface is used to send information back to the parent activity. interface SaveListener { fun onSaveUrl(originalUrlString: String, fileNameString: String, dialogFragment: DialogFragment) @@ -68,14 +69,14 @@ class SaveDialog : DialogFragment() { companion object { // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. @JvmStatic - fun saveUrl(urlString: String, fileSizeString: String, fileNameString: String, userAgentString: String, cookiesEnabled: Boolean): SaveDialog { + fun saveUrl(urlString: String, fileNameString: String, fileSizeString: String, userAgentString: String, cookiesEnabled: Boolean): SaveDialog { // Create an arguments bundle. val argumentsBundle = Bundle() // Store the arguments in the bundle. argumentsBundle.putString(URL_STRING, urlString) - argumentsBundle.putString(FILE_SIZE_STRING, fileSizeString) argumentsBundle.putString(FILE_NAME_STRING, fileNameString) + argumentsBundle.putString(FILE_SIZE_STRING, fileSizeString) argumentsBundle.putString(USER_AGENT_STRING, userAgentString) argumentsBundle.putBoolean(COOKIES_ENABLED, cookiesEnabled) @@ -93,8 +94,8 @@ class SaveDialog : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments from the bundle. val originalUrlString = requireArguments().getString(URL_STRING)!! + var fileNameString = requireArguments().getString(FILE_NAME_STRING)!! val fileSizeString = requireArguments().getString(FILE_SIZE_STRING)!! - val fileNameString = requireArguments().getString(FILE_NAME_STRING)!! val userAgentString = requireArguments().getString(USER_AGENT_STRING)!! val cookiesEnabled = requireArguments().getBoolean(COOKIES_ENABLED) @@ -104,8 +105,8 @@ class SaveDialog : DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.save_url) - // Set the icon according to the theme. - dialogBuilder.setIconAttribute(R.attr.copyBlueIcon) + // Set the icon. + dialogBuilder.setIcon(R.drawable.download) // Set the view. dialogBuilder.setView(R.layout.save_dialog) @@ -123,7 +124,7 @@ class SaveDialog : DialogFragment() { val alertDialog = dialogBuilder.create() // Get a handle for the shared preferences. - val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) // Get the screenshot preference. val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) @@ -170,26 +171,32 @@ class SaveDialog : DialogFragment() { } override fun afterTextChanged(editable: Editable) { - // Cancel the get URL size AsyncTask if it is running. - if (getUrlSize != null) { - getUrlSize!!.cancel(true) - } - // Get the current URL to save. val urlToSave = urlEditText.text.toString() - // Wipe the file size text view. - fileSizeTextView.text = "" - - // Get the file size for the current URL. - getUrlSize = GetUrlSize(context, alertDialog, userAgentString, cookiesEnabled).execute(urlToSave) - // Enable the save button if the URL is populated. saveButton.isEnabled = urlToSave.isNotEmpty() + + CoroutineScope(Dispatchers.Main).launch { + // Create a URL size string. + var fileNameAndSize: Pair + + // Get the URL size on the IO thread. + withContext(Dispatchers.IO) { + // Get the updated file name and size. + fileNameAndSize = UrlHelper.getNameAndSize(requireContext(), urlToSave, userAgentString, cookiesEnabled) + + // Save the updated file name. + fileNameString = fileNameAndSize.first + } + + // Display the updated URL. + fileSizeTextView.text = fileNameAndSize.second + } } }) // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}